clang-format a bit of code to make the next patch easier to read.