Replaced use of make-instance with cl-gensym.