I don't need to label something as surveillance to be for it or against it. The mere label carries no Constitutional valence. When the cops tail me, or stake out my haunts, that's surveillance. When they come to my door with a search warrant or invite me to the station for interrogation, that's something else.
A guy who insisted all year long that the world would end on December 31 didn't become wrong on January 1. He was wrong all along.