Run clang-format on the C++ code.

I fixed it up in a way that seems to resist further runs of clang-format.