Cleanup clang-format settings.

This doesn't change the settings, just fixing some issues that weren't
noticed before.