mali_cm: Some refactorings for consistency