CRM-13179 minor style fixes