clang-format: Fix various problems in formatting ObjC blocks.

Among other things, this fixes llvm.org/PR15269.