Cleaup up (require 'cl) forms and function names so that emacs will warn about cl less and the real warnings/errors will be easier to spot. This probably breaks compatability with emacs 24.1