diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index ea39e82239..0c0d05b52d 100644
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -33,8 +33,9 @@ PRIVATE>
     old-definitions get [ delete ] with each ;
 
 : remember-class ( class loc -- )
-    [ dup new-definitions get first in? [ dup throw-redefine-error ] when ] dip
-    new-definitions get second (remember-definition) ;
+    new-definitions get first2
+    [ dupd in? [ dup throw-redefine-error ] when ]
+    [ (remember-definition) ] bi-curry* bi* ;
 
 : forward-reference? ( word -- ? )
     dup old-definitions get [ in? ] with any? [