Merge "Switching back to #define instead of static const int."