Fix some failing tests
Cleanup a bit
preserveLocInfo support for SwitchStatement