   [step table field & extrafields]
   (defer
     (let [fields (->> (concat [field] extrafields)
-                      (map (comp field* -unwrap))
+                      (map (comp -field -unwrap))
                       (into-array org.jooq.Field))]
       (.on (-unwrap step) (-table table) fields))))
 

  [step name & [type]]
  (defer
    (let [step (-> (-unwrap step)
                   (.drop (field* name)))]
      (case type
        :cascade (.cascade step)
        :restrict (.restrict step)

      (cond
       (instance? org.jooq.WithStep (first fields))
       (.select (first fields)
                (->> (map -field (rest fields))
                     (into-array org.jooq.Field)))
       :else
       (->> (map -field fields)
            (into-array org.jooq.Field)
            (DSL/select))))))

