More switches code moved to switches.cpp
All references to "custom switches" renamed to "logical switches"
Reenabled missing #if