More refactoring of constants.