wrap a few *_FOREACH macros in curly braces

      cppcheck would give up with "syntax error" without them. This led
to reports of syntax errors in unrelated locations and potentially
hid other errors