Moved the braces around a little bit so they only appear within clang guards.