Cleanup use of some global constants.