clang-format functional again, manually upgraded to 3.6