Alternative representation of dataspacePatterns

schemas/dataspacePatterns.prs

@@ -6,14 +6,18 @@ embeddedType EntityRef.Cap .
 # One key difference is that Dataspace patterns are extensible, in that
 # they ignore fields not mentioned in DCompound patterns.
 
-Pattern = DDiscard / DBind / DLit / DCompound .
+Pattern =
+    / @discard <_>
+    / <bind @pattern Pattern>
+    / <lit @value AnyAtom>
+    / <g @type GroupType @entries { any: Pattern ...:... }>
+.
 
-DDiscard = <_>.
-DBind = <bind @pattern Pattern>.
-DLit = <lit @value AnyAtom>.
-DCompound = <rec @label any @fields { int: Pattern ...:... }>
-          / <arr @items { int: Pattern ...:... }>
-          / <dict @entries { any: Pattern ...:... }> .
+GroupType =
+    / <rec @label any>
+    / <arr>
+    / <dict>
+.
 
 AnyAtom =
     / @bool bool

schemas/noise.prs

@@ -60,7 +60,7 @@ NoisePreSharedKeys = @present { preSharedKeys: [bytes ...] } / @invalid { preSha
 # complete Noise "transport message"; when `complete`, the whole thing is likewise a complete
 # "transport message".
 #
-# Retraction of the `Introduction` ends the session from the initiator-side; retraction of the
+# Retraction of the `Initiator` ends the session from the initiator-side; retraction of the
 # `<accepted ...>` assertion ends the session from the responder-side.
 
 SessionItem = Initiator / Packet .