Merging niksaak's Clang/blocks patch.