New re-run of clang-tidy found few more places with missing braces around single line statements.
Closes #2933 (closed)