Fixed some clang-format weirdness.