Fix switch non-uniform syntax