Fixing parse issues with enumerations