Fix warnings on develop about missing braces. This is related to a bug in clang: https://bugs.llvm.org/show_bug.cgi?id=21629