diff --git a/syndicate/distributed/tcp-server.rkt b/syndicate/distributed/tcp-server.rkt
index c2d7abb..0a23a75 100644
--- a/syndicate/distributed/tcp-server.rkt
+++ b/syndicate/distributed/tcp-server.rkt
@@ -24,7 +24,7 @@
     (newline)
     (displayln (bytes->hex-string (sturdy-encode (->preserve root-cap))))
 
-    (define spec (TcpLocal "0.0.0.0" 5999))
+    (define spec (TcpLocal "0.0.0.0" 8001))
     (at ds
       (stop-on (asserted (StreamListenerError spec _)))
       (during/spawn (StreamConnection $source $sink spec)
diff --git a/syndicate/entity-ref.rkt b/syndicate/entity-ref.rkt
index 2dd1a83..d3156b4 100644
--- a/syndicate/entity-ref.rkt
+++ b/syndicate/entity-ref.rkt
@@ -9,7 +9,7 @@
          (struct-out facet)
          (struct-out entity-ref)
 
-         parse-Ref!)
+         parse-Cap!)
 
 (require racket/match)
 (require (only-in racket/string string-join))
@@ -95,7 +95,7 @@
                   ""
                   (format " ~s" a))))])
 
-(define (parse-Ref! r)
+(define (parse-Cap! r)
   (if (entity-ref? r)
       r
       (error 'parse-Ref! "Expected entity-ref; got ~v" r)))
diff --git a/syndicate/rewrite.rkt b/syndicate/rewrite.rkt
index 64f1d0b..9990b48 100644
--- a/syndicate/rewrite.rkt
+++ b/syndicate/rewrite.rkt
@@ -13,7 +13,7 @@
 (require "schemas/sturdy.rkt")
 
 (define (match-Pattern p v)
-  (define bindings (make-hasheq))
+  (define bindings-rev '())
 
   (define (walk p v)
     (match p
@@ -26,13 +26,16 @@
       [(Pattern-PAtom (PAtom-String)) (string? v)]
       [(Pattern-PAtom (PAtom-Symbol)) (symbol? v)]
       [(Pattern-PEmbedded (PEmbedded)) (embedded? v)]
-      [(Pattern-PBind (PBind n p)) (and (walk p v) (begin (hash-set! bindings n v) #t))]
+      [(Pattern-PBind (PBind p))
+       (and (walk p v)
+            (begin (set! bindings-rev (cons v bindings-rev))
+                   #t))]
       [(Pattern-PAnd ps) (andmap (lambda (p) (walk p v)) ps)]
       [(Pattern-PNot p)
-       (let ((saved bindings))
-         (set! bindings (make-hasheq))
+       (let ((saved bindings-rev))
+         (set! bindings-rev '())
          (let ((result (walk p v)))
-           (set! bindings saved)
+           (set! bindings-rev saved)
            (not result)))]
       [(Pattern-Lit (Lit expected)) (preserve=? expected v)]
       [(Pattern-PCompound (PCompound (ConstructorSpec-CRec (CRec label arity))
@@ -56,7 +59,7 @@
               (define vv (hash-ref v key (void)))
               (and (not (void? vv)) (walk pp vv))))]))
 
-  (and (walk p v) bindings))
+  (and (walk p v) (reverse bindings-rev)))
 
 (define (instantiate-Template t bindings)
   (let walk ((t t))
@@ -64,8 +67,10 @@
       [(Template-TAttenuate (TAttenuate t (Attenuation attenuation)))
        (match-define (embedded v) (walk t))
        (embedded (apply attenuate-entity-ref v attenuation))]
-      [(Template-TRef (TRef name))
-       (hash-ref bindings name (lambda () (error 'instantiate-Template "Missing binding: ~v" name)))]
+      [(Template-TRef (TRef index))
+       (if (< index (length bindings))
+           (list-ref bindings index)
+           (error 'instantiate-Template "Binding index out of range: ~v" index))]
       [(Template-Lit (Lit v)) v]
       [(Template-TCompound (TCompound (ConstructorSpec-CRec (CRec label arity))
                                       (TCompoundMembers members)))