More formatting cleanup brought to you by clang-format.