Be slightly more permissive when checking for type-erased blocks.

This is a patch from Doug that was inadvertently omitted from r241543.

llvm-svn: 249116