switching to convenience macros for enum declarations