Improved on Enum parsing.