Get rid of bundled cl-lib