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.
Merge branch 'tarsius/cl-lib' into next