Fix up switchS and switchC.