* lisp/emacs-lisp/cl-macs.el: Improve type->predicate mapping.