>  (require 'cl-lib)
> +(require 'cl)

These  two libraries  are pretty  much identical,  except that  they use
different names,  so there's no  point requiring  both (`cl' is  the old
deprecated one, and `cl-lib' is the new shiny one).

Do you want me to update the code to use `cl-lib' exclusively?

        Stefan