Cleanup: #define -> enums.
Merge branch 'master' into metalab