clang-format: Fix bug introduced by r208392.

Also run clang-format over clang-format's files.