improved MELT handling of enums