use cl-find-if instead of depending on implicit block

On Emacs-24.2.93 that block does not exist for some reason, causing an error.

You only merged the first commit from #568. Why? The second commit was pushed later, maybe you had already fetched the branch and missed that I added a second commit.

Here is a new pull request with just that commit.