         ]
     pclass-ctor_))
 
-(defmethod name-with-argvals :htn-task
-  [object]
-  (let [{:keys [name arguments ancestry-path]} object
-        arguments (or arguments [])
-        unresolved (count (filter variable? arguments))
-        argvals (if (pos? unresolved)
-                  (resolve-arguments arguments ancestry-path)
-                  arguments)]
-    (apply str name (conj (vec (conj (interpose ", " argvals) "(")) ")"))))
-
-(defmethod name-with-argvals :htn-method
-  [object]
-  (let [{:keys [name nonprimitive-task]} object
-        method-name (str name)
-        {:keys [name arguments]} nonprimitive-task]
-    (str
-      method-name
-      (str name (or (seq arguments) '())))))
-
-(defmethod name-with-argvals :htn-expanded-method
-  [object]
-  (let [{:keys [expansion-method argument-mappings]} object
-        {:keys [name nonprimitive-task]} expansion-method
-        method-name (str name)
-        {:keys [name arguments]} nonprimitive-task
-        argvals (apply str (interpose " " (map #(get argument-mappings %) arguments)))]
-    (str method-name "(" argvals ")")))
+;; name-with-argvals multi-methods --------------------------------------
+
+;; (defn name-with-argvals-dispatch [object]
+;;   (:type object))
+
+;; (defmulti name-with-argvals
+;;   "Dispatch based on object type"
+;;   #'name-with-argvals-dispatch
+;;   :default :htn-object
+;;   :hierarchy #'htn-hierarchy)
+
+;; (defmethod name-with-argvals :htn-object
+;;   [object]
+;;   (str (:uid object)))
+
+
+;; ;;Commented out since we've change the signature for resolve-arguments
+;; ;; (defmethod name-with-argvals :htn-task
+;; ;;   [object]
+;; ;;   (let [{:keys [name arguments ancestry-path]} object
+;; ;;         arguments (or arguments [])
+;; ;;         unresolved (count (filter variable? arguments))
+;; ;;         argvals (if (pos? unresolved)
+;; ;;                   (resolve-arguments arguments ancestry-path)
+;; ;;                   arguments)]
+;; ;;     (apply str name (conj (vec (conj (interpose ", " argvals) "(")) ")"))))
+
+;; (defmethod name-with-argvals :htn-method
+;;   [object]
+;;   (let [{:keys [name nonprimitive-task]} object
+;;         method-name (str name)
+;;         {:keys [name arguments]} nonprimitive-task]
+;;     (str
+;;       method-name
+;;       (str name (or (seq arguments) '())))))
+
+;; (defmethod name-with-argvals :htn-expanded-method
+;;   [object]
+;;   (let [{:keys [expansion-method argument-mappings]} object
+;;         {:keys [name nonprimitive-task]} expansion-method
+;;         method-name (str name)
+;;         {:keys [name arguments]} nonprimitive-task
+;;         argvals (apply str (interpose " " (map #(get argument-mappings %) arguments)))]
+;;     (str method-name "(" argvals ")")))
+
 
 ;; print-object multi-methods --------------------------------------
 

        (if name-with-args-include-args? ")"))
      (or max-line-length name-with-args-max-line-length))))

;; name-with-argvals multi-methods --------------------------------------

(defn name-with-argvals-dispatch [object]
  (:type object))

(defmulti name-with-argvals
  "Dispatch based on object type"
  #'name-with-argvals-dispatch
  :default :htn-object
  :hierarchy #'htn-hierarchy)

(defmethod name-with-argvals :htn-object
  [object]
  (str (:uid object)))

(defn resolve-arguments [arguments ancestry-path]
  (let [hem (get-htn-object (first ancestry-path))
        {:keys [argument-mappings]} hem
        resolve-arg (fn [arg]
                      (if (variable? arg)
                        (get argument-mappings arg)
                        arg))
        arguments (map resolve-arg arguments)
        unresolved (count (filter variable? arguments))
        get-dyn-arg (fn [dyn-arg]
                      (if (map? dyn-arg)
                        (:param dyn-arg)
                        dyn-arg))
        argvals (if (pos? unresolved)
                  (resolve-arguments arguments (nthrest ancestry-path 2))
                  (mapv get-dyn-arg arguments))]
    argvals))

;; returns pclass_ctor_ map
;; (defn resolve-plant-class [ir hem-pclass pargs pclass method

           flow-characteristics mission-task-weight
           label display-name incidence-set edges irks]
    :as options}]
  ;;We should never see nil arguments
  (assert (not (some #(nil? %) arguments)) "htn-primitive-task: Found nil arguments")
  (update-htn-object!
   (assoc-if (htn-task (assoc options :prefix (or prefix "hpt-")))
             :type :htn-primitive-task
