Switched elisp common-lisp usage to use cl-lib bindings with cl- prefix.