Use cl-lib functions instead of cl.el functions

Both cl-lib functions and cl.el functions are used in original
code, but we should use just one.