Added encapsulating parentheses on macros
+ tried then disabled MISRA checks