Clang-format-based formatting fixups