Rework switch statements.