   `session` using `request-factory` and `query`. Modify it
   with (possibly empty) `options` and `variables` maps. Applies type
   conversion to response according to defaults and
-  `xcc-type->conv-fn`. Variables may be passed as a map of Strings or
-  with String names corresponding to maps describing the variable
+  `xml-type-str->conv-fn`. Variables may be passed as a map of Strings
+  or with String names corresponding to maps describing the variable
   using mandatory key `:value` and optional keys `:namespace` and
   `:type`.`"
   [request-factory session query options variables types shape]

                                      (variable-types type)
                                      (if as-is?
                                        value
                                        (wrap-val value type)))
                     (.setNewVariable acc (name vname)
                                      (variable-types type)
                                      (if as-is?
                                        value
                                        (wrap-val value type))))))
               acc)
             (doto request-factory (.setOptions (make-request-options options)))
             variables))

  MarkLogic query result sequence. Default type mappings can be
  overridden (in part or in whole) with the optional parameter
  `type-mapping`, which should contain a transformation function keyed
  by an XCC type string. See `xml-type-str->conv-fn` above."
  [result-sequence & [type-mapping]]
  ;; TODO throw informative exception if type not found in types
  (map (fn [item] (((merge xml-type-str->conv-fn
                          (when (map? type-mapping)
                            type-mapping))
                   (.toString (.getValueType item))) item))
