namespaces.extras: clean up

diff --git a/extra/namespaces/extras/extras.factor b/extra/namespaces/extras/extras.factor
index 42d55501f2c1e0b816e7607f674d332bc1362344..78cf6a195d9c70d5ef0d4a752b29b192bc971e32 100644 (file)
--- a/extra/namespaces/extras/extras.factor
+++ b/extra/namespaces/extras/extras.factor
@@ -5,8 +5,8 @@ IN: namespaces.extras
 
 ERROR: variable-required variable ;
 
-: required ( symbol -- str/f )
-    dup get [ nip ] [ variable-required ] if* ;
+: required ( symbol -- obj )
+    [ get ] [ variable-required ] ?unless ;
 
 : 2required ( symbol1 symbol2 -- obj1 obj2 ) [ required ] bi@ ; inline
 : 2get ( symbol1 symbol2 -- obj1 obj2 ) [ get ] bi@ ; inline
@@ -17,6 +17,6 @@ ERROR: variable-required variable ;
 
 ERROR: one-variable-only symbol1 symbol2 value1 value2 ;
 
-: one-of ( symbol1 symbol2 -- str/f first? )
+: one-of ( symbol1 symbol2 -- obj1/obj2 first? )
     2dup [ get ] bi@ 2dup xor* over
     [ [ 4drop ] 2dip ] [ one-variable-only ] if ;