Run clang-format on the code so far.

I'm not sure I agree with all of these changes, but CONSISTENCY!!!