Got rid of the craziness of passing the singleton Switch object around.

This is just a cleanup before I do the 410s, it touches lots of files so I am doing it separately.