5 files changed, 12 insertions, 27 deletions
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 607e6e39..487f85e7 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -336,17 +336,17 @@ orderPredTran(oldList,sig,skip) ==
 --  pp oldList
 
   --(3b) newList= list of ofCat/isDom entries that don't depend on
-  while oldList repeat
+  while oldList ~= nil repeat
     for x in oldList repeat
       if (x is ['ofCategory,v,body]) or (x is ['isDomain,v,body]) then
-        indepvl:=listOfPatternIds v
-        depvl:=listOfPatternIds body
+        indepvl := listOfPatternIds v
+        depvl := listOfPatternIds body
       else
         indepvl := listOfPatternIds x
         depvl := nil
       (INTERSECTIONQ(indepvl,dependList) = nil) =>
-        dependList:= setDifference(dependList,depvl)
-        newList:= [:newList,x]
+        dependList := setDifference(dependList,depvl)
+        newList := [:newList,x]
 --  sayBrightlyNT "newList="
 --  pp newList
 
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 1d7a12d6..acca5b76 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1245,12 +1245,12 @@ orderByDependency(vl,dl) ==
   for v in vl for d in dl | symbolMember?(v,d) repeat
     (SAY(v," depends on itself"); fatalError:= true)
   fatalError => userError '"Parameter specification error"
-  until (null vl) repeat
+  until vl = nil repeat
     newl:=
       [v for v in vl for d in dl | null intersection(d,vl)] or return nil
     orderedVarList:= [:newl,:orderedVarList]
-    vl':= setDifference(vl,newl)
-    dl':= [setDifference(d,newl) for x in vl for d in dl
+    vl' := setDifference(vl,newl)
+    dl' := [setDifference(d,newl) for x in vl for d in dl
              | symbolMember?(x,vl')]
     vl := vl'
     dl := dl'
diff --git a/src/interp/incl.boot b/src/interp/incl.boot
index 8bfe69d9..578f3ff2 100644
--- a/src/interp/incl.boot
+++ b/src/interp/incl.boot
@@ -166,11 +166,11 @@ fileNameStrings fn==
  
 ifCond(s, info) ==
   word := makeSymbol StringTrim(incCommandTail(s, info), WhiteSpaceCset)
-  ListMemberQ?(word, $inclAssertions)
+  symbolMember?(word,$inclAssertions)
  
 assertCond(s, info) ==
   word := makeSymbol StringTrim(incCommandTail(s, info), WhiteSpaceCset)
-  if not ListMemberQ?(word, $inclAssertions) then
+  if not symbolMember?(word,$inclAssertions) then
     $inclAssertions := [word, :$inclAssertions]
  
  
diff --git a/src/interp/macex.boot b/src/interp/macex.boot
index d25074f6..fdc0c5ff 100644
--- a/src/interp/macex.boot
+++ b/src/interp/macex.boot
@@ -86,8 +86,7 @@ macLambdaParameterHandling( replist , pform )  ==
     for p in pfParts pform repeat macLambdaParameterHandling( replist , p )
 
 macSubstituteId( replist , pform ) ==
-    ex := AlistAssocQ( pfIdSymbol pform , replist )
-    ex => 
+    ex := symbolAssoc( pfIdSymbol pform , replist ) =>
         RPLPAIR(pform,rest ex)
         pform
     pform 
diff --git a/src/interp/unlisp.lisp b/src/interp/unlisp.lisp
index 38804adc..bf41d526 100644
--- a/src/interp/unlisp.lisp
+++ b/src/interp/unlisp.lisp
@@ -1,6 +1,6 @@
 ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 ;; All rights reserved.
-;; Copyright (C) 2007-2008, Gabriel Dos Reis.
+;; Copyright (C) 2007-2011, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -124,23 +124,9 @@
     'string )) )
 
 ;;;
-;;; Lists
-;;;
-
-
-(defun |ListMemberQ?| (ob l)
-  (member ob l :test #'eq) )
-
-(defun |ListRemoveQ| (ob l)
-  (remove ob l :test #'eq :count 1) )
-
-;;;
 ;;; Association lists
 ;;;
 
-(defun |AlistAssocQ| (key l)
-  (assoc key l :test #'eq) )
-
 (defun |AlistRemoveQ| (key l)
   (let ((pr (assoc key l :test #'eq)))
        (if pr