Fix MISRA rule 8.4 in common code