diff --git a/basis/compiler/cfg/builder/builder.factor b/basis/compiler/cfg/builder/builder.factor
index c866835ac5..2eff8b9e28 100755
--- a/basis/compiler/cfg/builder/builder.factor
+++ b/basis/compiler/cfg/builder/builder.factor
@@ -23,30 +23,20 @@ IN: compiler.cfg.builder
 ! Convert tree SSA IR to CFG SSA IR.
 
 SYMBOL: procedures
-SYMBOL: current-word
-SYMBOL: current-label
 SYMBOL: loops
 
-: add-procedure ( -- )
-    basic-block get current-word get current-label get
-    <cfg> procedures get push ;
-
 : begin-procedure ( word label -- )
     end-basic-block
     begin-basic-block
     H{ } clone loops set
-    current-label set
-    current-word set
-    add-procedure ;
+    [ basic-block get ] 2dip
+    <cfg> procedures get push ;
 
 : with-cfg-builder ( nodes word label quot -- )
     '[ begin-procedure @ ] with-scope ; inline
 
 GENERIC: emit-node ( node -- )
 
-: check-basic-block ( node -- node' )
-    basic-block get [ drop f ] unless ; inline
-
 : emit-nodes ( nodes -- )
     [ basic-block get [ emit-node ] [ drop ] if ] each ;