clang-format: Refactoring.

Re-apply r222638 and r222641 without variadic templates.