Clean up the use of switch cases.
4 files changed