Fix GCC -Wparentheses warning (& reformat now that the precedence is fixed)

Benign warning (clang deliberately suppresses this case) but does
regularly produce bad formatting, so it's nice to fix/reformat.

llvm-svn: 232508