Solve code issues that block running clang-format on our code.

There are some aspects of our code that confuse clang-format, or produce bad output. In nearly all cases, this is a sign of bad code.