Update to cl-lib functions.