REL-1301: Minor code cleanup.