Swapped switch case for array

Also cleaned up a few autogenerated things