Continued refactoring constants.