Refactors constants that were caught in the earlier refactor.