diff --git a/library/compiler/linearizer.factor b/library/compiler/linearizer.factor
index 6a47323dfa..0724f2873a 100644
--- a/library/compiler/linearizer.factor
+++ b/library/compiler/linearizer.factor
@@ -112,7 +112,7 @@ M: #call-label linearize* ( node -- next )
 
 M: #shuffle linearize* ( #shuffle -- )
     compute-free-vregs
-    node-shuffle dup do-inputs
+    node-shuffle trim-shuffle dup do-inputs
     dup shuffle-out-d swap shuffle-out-r template-outputs
     iterate-next ;
 
diff --git a/library/compiler/templates.factor b/library/compiler/templates.factor
index 27aa2bc08d..a068eee8f4 100644
--- a/library/compiler/templates.factor
+++ b/library/compiler/templates.factor
@@ -100,10 +100,6 @@ M: object vreg>stack ( value loc -- )
     phantom-d get finalize-phantom
     phantom-r get finalize-phantom ;
 
-: end-basic-block* ( -- )
-    phantom-d get vregs>stack
-    phantom-r get vregs>stack ;
-
 G: stack>vreg ( value vreg loc -- operand )
     2 standard-combination ;