diff --git a/basis/regexp/minimize/minimize.factor b/basis/regexp/minimize/minimize.factor
index 65830ac720..50379f9779 100644
--- a/basis/regexp/minimize/minimize.factor
+++ b/basis/regexp/minimize/minimize.factor
@@ -6,7 +6,7 @@ regexp.transition-tables sequences sets sorting ;
 IN: regexp.minimize
 
 : table>state-numbers ( table -- assoc )
-    transitions>> keys <enum> [ swap ] H{ } assoc-map-as ;
+    transitions>> keys H{ } zip-index-as ;
 
 : number-states ( table -- newtable )
     dup table>state-numbers transitions-at ;
diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 0a759c625e..978aa18606 100644
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -51,7 +51,7 @@ CONSTANT: categories {
 <PRIVATE
 
 MEMO: categories-map ( -- hashtable )
-    categories <enum> [ swap ] H{ } assoc-map-as ;
+    categories H{ } zip-index-as ;
 
 CONSTANT: num-chars 0x2FA1E