Code cleanup to constants.R.