diff --git a/basis/match/match.factor b/basis/match/match.factor
index 9125eb6ed0..f009aa2ccb 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 ;
+    building get ?at [ = ] [ ,, 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>