clang-format bits of code to make a followup patch easy to read.