More CL cleanups and reduction of use of cl.el.