Enumerations are now correctly handled