REL-1436: Quick code cleanup.