Add couple missing braces around single-line statements
The clang-format-15 has new option InsertBraces that could add missing branches around single line statements. Use that to our advantage without switching to not-yet-released LLVM version to add missing braces in couple of places.