Move constants inline with where they are used and deprecate previous ones.