This wasn't caught due to missing C++ static asserts for this enum. This
commit adds them and fixes the enum.