defun-make-query becomes just make-query