Cleanup: #define -> enums.