CRM-14995 tidyups