Make some macros correct when used within IF clauses without brackets