Fix switch statments not evaluating conditions correctly in some cases

• 68009c7: Fix switch statements not evaluating conditions correctly when they need to evaluate an expression for the condition, reported by @ChrisFeline