diff --git a/graph-lib/graph/graph-modify.lp2.rkt b/graph-lib/graph/graph-modify.lp2.rkt
index 57e1f6b5..10612fd7 100644
--- a/graph-lib/graph/graph-modify.lp2.rkt
+++ b/graph-lib/graph/graph-modify.lp2.rkt
@@ -226,7 +226,7 @@ We derive identifiers for these based on the @tc[node] name:
        
        (define-temp-ids "~a/with-promises-type" (node …) #:first-base root)
        (define-temp-ids "~a/make-with-promises" (node …))
-       (define-temp-ids "~a/with-promises-tag" (node …))
+       (define-temp-ids "~a/with-promises-struct" (node …))
        
        (define-temp-ids "~a/mapping-function" (node …))
        
@@ -369,9 +369,11 @@ that node's @tc[with-promises] type.
 @; TODO: use a type-expander here, instead of a template metafunction.
 
 @CHUNK[<define-with-promises>
+       (struct (A) node/with-promises-struct ([f : A]))
        (define-type node/with-promises-type
-         (tagged node/with-promises-tag
-                 [field : <field/with-promises-type>] …))
+         (node/with-promises-struct (List [field : <field/with-promises-type>] …))
+         #;(tagged node/with-promises-tag
+                 ))
        
        (: node/make-with-promises (→ <field/with-promises-type> …
                                      node/with-promises-type))
diff --git a/graph-lib/graph/graph.lp2.rkt b/graph-lib/graph/graph.lp2.rkt
index 10612fd7..57e1f6b5 100644
--- a/graph-lib/graph/graph.lp2.rkt
+++ b/graph-lib/graph/graph.lp2.rkt
@@ -226,7 +226,7 @@ We derive identifiers for these based on the @tc[node] name:
        
        (define-temp-ids "~a/with-promises-type" (node …) #:first-base root)
        (define-temp-ids "~a/make-with-promises" (node …))
-       (define-temp-ids "~a/with-promises-struct" (node …))
+       (define-temp-ids "~a/with-promises-tag" (node …))
        
        (define-temp-ids "~a/mapping-function" (node …))
        
@@ -369,11 +369,9 @@ that node's @tc[with-promises] type.
 @; TODO: use a type-expander here, instead of a template metafunction.
 
 @CHUNK[<define-with-promises>
-       (struct (A) node/with-promises-struct ([f : A]))
        (define-type node/with-promises-type
-         (node/with-promises-struct (List [field : <field/with-promises-type>] …))
-         #;(tagged node/with-promises-tag
-                 ))
+         (tagged node/with-promises-tag
+                 [field : <field/with-promises-type>] …))
        
        (: node/make-with-promises (→ <field/with-promises-type> …
                                      node/with-promises-type))