Fix bogus error message

core/compiler/units/units.factor

@@ -18,13 +18,13 @@ TUPLE: redefine-error def ;
     2dup key? [ over redefine-error ] when conjoin ;
 
 : (remember-definition) ( definition loc assoc -- )
-    >r over set-where r> add-once ;
+    [ over set-where ] dip add-once ;
 
 : remember-definition ( definition loc -- )
     new-definitions get first (remember-definition) ;
 
 : remember-class ( class loc -- )
-    over new-definitions get first key? [ dup redefine-error ] when
+    [ dup new-definitions get first key? [ dup redefine-error ] when ] dip
     new-definitions get second (remember-definition) ;
 
 : forward-reference? ( word -- ? )

core/parser/parser-tests.factor

@@ -490,3 +490,9 @@ must-fail-with
 ] [
     error>> staging-violation?
 ] must-fail-with
+
+! Bogus error message
+DEFER: blah
+
+[ "IN: parser.tests USE: kernel TUPLE: blah < tuple ; : blah ; TUPLE: blah < tuple ; : blah ;" eval ]
+[ error>> error>> def>> \ blah eq? ] must-fail-with