I was on a year-long internship in Switzerland when I also came home for Christmas and filled out the resident section. The agent, after asking where I was coming from and what I was doing there, also crossed out my resident section and just wrote in Switzerland in the visitor section, so I guess that's normal.

My agent was fully polite though. Now that I study in the US, I fill in visitor when I come home.