Clean up for Emacs 24.  (use cl-lib instead of cl, etc.)