use xref approach for CLS. (need to do so for lisp-matrix as well.