various cleanup

If this uses cl-lib, make sure it declares in the metadata that it depends on Emacs 24.3 (or the cl-lib package).