move more macros into enums