Deal with boolean in more switch statements