make sure switch case expressions are blockified as well (see #3317)