CRM-13025 : minor cleanup