More constants refactoring.