Replace a couple homemade enums with calls to ordinal(). Remove a couple
todos