Improved switch statement checking
13 files changed