Changed to use cl-lib features.

Added cl-lib as an dependency and use the cl-lib versions of the
functions.

Bug report by esquellington.