clang-format parts of the file.

I am about to send a patch for review touching these and clang-formating first
makes the patch much easier to read.