Moved a few more things to constants.