replace remaining usages of cl by cl-lib