New: only one type of switch, and no separate definitions any more