Use braces for macros which require them.

This fixes *all* invocations of bitflags, for all targets.