Minor clarity fix
Refine parse and improve readability
Fix ENUM_GENERATE_HELPERS