Merge "Using anonymous enum instead of macros."