Require cl-lib and use cl-gensym instead of gensym.