convert some define lists into enums