diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index 7c150612f9..ddda96afca 100644
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -373,10 +373,10 @@ SYMBOL: a
 
 [ "4" ] [
     [
-        "4" "a" set
-        "http://localhost" add-addr "__u" set
-        "session-id" get session-id-key set
-    ] H{ } make-assoc
+        "4" "a" ,,
+        "http://localhost" add-addr "__u" ,,
+        "session-id" get session-id-key ,,
+    ] H{ } make
     "http://localhost/" add-addr <post-request> "cookies" get >>cookies http-request nip test-a
 ] unit-test
 
@@ -385,10 +385,10 @@ SYMBOL: a
 ! Test flash scope
 [ "xyz" ] [
     [
-        "xyz" "a" set
-        "http://localhost" add-addr "__u" set
-        "session-id" get session-id-key set
-    ] H{ } make-assoc
+        "xyz" "a" ,,
+        "http://localhost" add-addr "__u" ,,
+        "session-id" get session-id-key ,,
+    ] H{ } make
     "http://localhost/" add-addr <post-request> "cookies" get >>cookies http-request nip test-a
 ] unit-test
 
diff --git a/basis/match/match.factor b/basis/match/match.factor
index 2c5fdf5a01..c9f9c0c221 100644
--- a/basis/match/match.factor
+++ b/basis/match/match.factor
@@ -23,7 +23,7 @@ SYNTAX: MATCH-VARS: ! vars ...
     dup word? [ "match-var" word-prop ] [ drop f ] if ;
 
 : set-match-var ( value var -- ? )
-    dup namespace key? [ get = ] [ set t ] if ;
+    dup building get key? [ get = ] [ ,, t ] if ;
 
 : (match) ( value1 value2 -- matched? )
     {
@@ -40,7 +40,7 @@ SYNTAX: MATCH-VARS: ! vars ...
     } cond ;
 
 : match ( value1 value2 -- bindings )
-    [ (match) ] H{ } make-assoc swap [ drop f ] unless ;
+    [ (match) ] H{ } make swap [ drop f ] unless ;
 
 MACRO: match-cond ( assoc -- )
     <reversed>
@@ -73,7 +73,7 @@ MACRO: match-cond ( assoc -- )
         2dup length head over match
         [ swap ?1-tail ] [ [ rest ] dip (match-first) ] ?if
     ] if ;
-    
+
 : match-first ( seq pattern-seq -- bindings )
     (match-first) drop ;
 
diff --git a/extra/game/models/obj/obj.factor b/extra/game/models/obj/obj.factor
index eef576d419..e2b42cd448 100644
--- a/extra/game/models/obj/obj.factor
+++ b/extra/game/models/obj/obj.factor
@@ -151,14 +151,14 @@ PRIVATE>
 M: obj-models stream>models
     drop
     [
-        V{ } clone vp set
-        V{ } clone vt set
-        V{ } clone vn set
-        V{ } clone models set
-        V{ } V{ } H{ } <indexed-seq> current-model set
-        f current-material set
-        f material-dictionary set
-    ] H{ } make-assoc 
+        V{ } clone vp ,,
+        V{ } clone vt ,,
+        V{ } clone vn ,,
+        V{ } clone models ,,
+        V{ } V{ } H{ } <indexed-seq> current-model ,,
+        f current-material ,,
+        f material-dictionary ,,
+    ] H{ } make
     [
         [ line>obj ] each-stream-line push-current-model
         models get