Run clang-format on the C++ code.

I did something nice enough that is stable with regard to re-running clang-format.