Work-around clang-format-9 issue

I do not know what causes this, but clang-format-9 formats these bits
incorrectly. clang-format-11 formats them correctly, so eventually
this can go away.