diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index b64957b2c5..6c9aa3eb73 100644
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -9,8 +9,8 @@ IN: lisp
 DEFER: convert-form
 DEFER: funcall
 DEFER: lookup-var
-DEFER: lisp-macro?
 DEFER: lookup-macro
+DEFER: lisp-macro?
 DEFER: macro-expand
 DEFER: define-lisp-macro
     
@@ -110,10 +110,9 @@ PRIVATE>
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 SYMBOL: lisp-env
-ERROR: no-such-var variable-name ;
-    
 SYMBOL: macro-env
     
+ERROR: no-such-var variable-name ;
 M: no-such-var summary drop "No such variable" ;
 
 : init-env ( -- )
diff --git a/extra/lists/lists.factor b/extra/lists/lists.factor
index 3799d48fff..13d77f757a 100644
--- a/extra/lists/lists.factor
+++ b/extra/lists/lists.factor
@@ -8,7 +8,7 @@ IN: lists
 MIXIN: list
 GENERIC: car   ( cons -- car )
 GENERIC: cdr   ( cons -- cdr )
-GENERIC: nil?   ( cons -- ?   )
+GENERIC: nil?  ( object -- ?   )
     
 TUPLE: cons car cdr ;