Move to actual constants instead of preprocessor macros.