Added the last bit of the enum, and alpha-sorted the switch.