Use cl-lib instead of cl.
Merge remote-tracking branch 'refs/remotes/origin/pr/339'