REL-1301: Minor cleanup to changes.