Fixup some enum nonsense.