Improved switch statement checking
16 files changed