diff --git a/basis/compiler/codegen/codegen.factor b/basis/compiler/codegen/codegen.factor
index 27e1c1d1c9..2dcb25fe2e 100755
--- a/basis/compiler/codegen/codegen.factor
+++ b/basis/compiler/codegen/codegen.factor
@@ -81,7 +81,8 @@ M: ##dispatch generate-insn
 : with-fixup ( quot -- code )
     '[
         init-relocation
-        init-gc-maps
+        V{ } clone return-addresses set
+        V{ } clone gc-maps set
         init-fixup
         [
             @
diff --git a/basis/compiler/codegen/gc-maps/gc-maps-tests.factor b/basis/compiler/codegen/gc-maps/gc-maps-tests.factor
index d7f79e4d8f..7b86f8dbba 100644
--- a/basis/compiler/codegen/gc-maps/gc-maps-tests.factor
+++ b/basis/compiler/codegen/gc-maps/gc-maps-tests.factor
@@ -15,7 +15,8 @@ M: fake-cpu gc-root-offset ;
 
 [
     init-relocation
-    init-gc-maps
+    V{ } clone return-addresses set
+    V{ } clone gc-maps set
 
     50 <byte-array> %
 
diff --git a/basis/compiler/codegen/gc-maps/gc-maps.factor b/basis/compiler/codegen/gc-maps/gc-maps.factor
index e78e0d04b7..35f8d8e10c 100644
--- a/basis/compiler/codegen/gc-maps/gc-maps.factor
+++ b/basis/compiler/codegen/gc-maps/gc-maps.factor
@@ -68,10 +68,6 @@ SYMBOLS: return-addresses gc-maps ;
         return-addresses get length emit-uint
     ] B{ } make ;
 
-: init-gc-maps ( -- )
-    V{ } clone return-addresses set
-    V{ } clone gc-maps set ;
-
 : emit-gc-maps ( -- )
     serialize-gc-maps [
         length compiled-offset +
diff --git a/basis/cpu/x86/x86-tests.factor b/basis/cpu/x86/x86-tests.factor
index 5c3efd11c5..61206f4c51 100644
--- a/basis/cpu/x86/x86-tests.factor
+++ b/basis/cpu/x86/x86-tests.factor
@@ -1,8 +1,9 @@
 USING: compiler.cfg.instructions compiler.cfg.registers
-compiler.codegen.gc-maps compiler.codegen.relocation compiler.test
-cpu.architecture cpu.x86 cpu.x86.assembler cpu.x86.assembler.operands
-cpu.x86.features kernel kernel.private layouts literals make math
-math.libm namespaces sequences system tools.test ;
+compiler.codegen compiler.codegen.gc-maps compiler.codegen.relocation
+compiler.test cpu.architecture cpu.x86 cpu.x86.assembler
+cpu.x86.assembler.operands cpu.x86.features kernel kernel.private
+layouts literals make math math.libm namespaces sequences system
+tools.test ;
 IN: cpu.x86.tests
 
 { } [
@@ -39,23 +40,22 @@ cpu x86.64? [
 
 ! %alien-invoke
 { 1 } [
-    init-relocation init-gc-maps [
+    [
         f { } { } { } { } 0 0 { } "dll" T{ gc-map { scrub-d V{ 0 } } } %alien-invoke
-    ] B{ } make drop
-    gc-maps get length
+    ] with-fixup drop gc-maps get length
 ] unit-test
 
 ! %call-gc
 { V{ } } [
-    init-relocation init-gc-maps
-    [ T{ gc-map { scrub-d V{ } } } %call-gc ] B{ } make drop
-    gc-maps get
+    [
+        T{ gc-map { scrub-d V{ } } } %call-gc
+    ] with-fixup drop gc-maps get
 ] unit-test
 
 { 1 } [
-    init-relocation init-gc-maps
-    [ T{ gc-map { scrub-d V{ 0 0 } } } %call-gc ] B{ } make drop
-    gc-maps get length
+    [
+        T{ gc-map { scrub-d V{ 0 0 } } } %call-gc
+    ] with-fixup drop gc-maps get length
 ] unit-test
 
 ! %clear