Fix issue #246. Hopefully this works everywhere. In Emacs < 23 it seems
you have to download cl-lib separately though.