This not only fixes bugs like auto-conversion of std::map[enum, enum] but also
fixes a bug where the compiler-chosen type of int for the enum may not have been
long.