Resolve emacs 24.3 cl-lib madness.