Obey some more matches that we should be obeying.
Clang-format