Rework r345423

r345423 didn't work because some of the calls used the << operator to
redirect input to the GTEST_* macros.

Wrap the conditionals in {} so the blocks of code are clear to the compiler,
and to actually fix the -Wdangling-else issues.