Sprinkle some parentheses into this macro, to make it clearer (especially
for static analysis tools like Coverity).
Merge branch 'master' into coverity-defects
Fix build breakage.