Suppress -Wdangling-else warnings

[jslee02]

GCC 7.2.0 prints warnings of -Wdangling-else. It seems this is because if-statements with a single line macro is prone to dangling else. This PR suppresses these warnings by adding explicit braces around the single line of the macro.

---

Before creating a pull request

• Document new methods and classes (N/A)

Before merging a pull request

• Set version target by selecting a milestone on the right side
• Summarize this change in CHANGELOG.md
• Add unit test(s) for this change (N/A)

[jslee02]

Thanks for the review @mxgrey!