Cleaning up some constants.