clang-format does all this already.