* interp/br-data.boot: Tidy.

	* interp/br-util.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/cattable.boot: Likewise.
	* interp/clammed.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/g-cndata.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/ht-util.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/modemap.boot: Likewise.
	* interp/nrungo.boot: Likewise.
	* interp/rulesets.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/Makefile.pamphlet (br-util.$(FASLEXT)): Don't compile as
	Old Boot.
	(bc-solve.$(FASLEXT)): Likewise.
	(ht-util.$(FASLEXT)): Likewise.
	(rulesets.$(FASLEXT)): Likewise.
	(i-object.$(FASLEXT)): Likewise.
	(i-util.$(FASLEXT)): Likewise.
	(nrunfast.$(FASLEXT)): Likewise.
	(nrungo.$(FASLEXT)): Likewise.
	(iterator.$(FASLEXT)): Likewise.
	(cattable.$(FASLEXT)): Likewise.
	(c-doc.$(FASLEXT)): Likewise.
	(posit.$(FASLEXT)): Likewise.
	(modemap.$(FASLEXT)): Likewise.
	(slam.$(FASLEXT)): Likewise.
	(clammed.$(FASLEXT)): Likewise.
	(g-opt.$(FASLEXT)): Likewise.
	(g-error.$(FASLEXT)): Likewise.
	(pathname.$(FASLEXT)): Likewise.
	(g-util.$(FASLEXT)): Likewise.
	(g-cndata.$(FASLEXT)): Likewise.
	* boot/tokens.boot: Remove renaming of NOT to NULL, when compiling
	Old Boot.

17 files changed, 83 insertions, 83 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 50f1ae72..04a3f8e4 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -294,10 +294,10 @@ br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -315,7 +315,7 @@ htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -336,7 +336,7 @@ profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -388,10 +388,10 @@ i-code.$(FASLEXT): i-code.boot i-object.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 i-object.$(FASLEXT): i-object.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-util.$(FASLEXT): i-util.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 format.$(FASLEXT): format.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -423,13 +423,13 @@ nrunopt.$(FASLEXT): nrunopt.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 nrunfast.$(FASLEXT): nrunfast.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruncomp.$(FASLEXT): nruncomp.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -438,7 +438,7 @@ template.$(FASLEXT): template.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile  --output=$@ --load-directory=. $<
 
 iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
@@ -458,7 +458,7 @@ category.$(FASLEXT): category.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 cattable.$(FASLEXT): cattable.boot simpbool.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -477,7 +477,7 @@ interop.$(FASLEXT): interop.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
@@ -591,7 +591,7 @@ unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 posit.$(FASLEXT): posit.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -653,22 +653,22 @@ sfsfun.$(FASLEXT): sfsfun.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 info.$(FASLEXT): info.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -680,13 +680,13 @@ g-boot.$(FASLEXT): g-boot.boot def.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 g-error.$(FASLEXT): g-error.boot diagnostics.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 c-util.$(FASLEXT): c-util.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 pathname.$(FASLEXT): pathname.boot nlib.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 hashcode.$(FASLEXT): hashcode.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -698,10 +698,10 @@ pspad1.$(FASLEXT): pspad1.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT) sys-utility.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-cndata.$(FASLEXT): g-cndata.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index c53776a9..92247bd2 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -596,10 +596,10 @@ br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -617,7 +617,7 @@ htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -638,7 +638,7 @@ profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 osyscmd.$(FASLEXT): osyscmd.boot int-top.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -690,10 +690,10 @@ i-code.$(FASLEXT): i-code.boot i-object.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 i-object.$(FASLEXT): i-object.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-util.$(FASLEXT): i-util.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 format.$(FASLEXT): format.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -725,13 +725,13 @@ nrunopt.$(FASLEXT): nrunopt.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 nrunfast.$(FASLEXT): nrunfast.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruncomp.$(FASLEXT): nruncomp.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -740,7 +740,7 @@ template.$(FASLEXT): template.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile  --output=$@ --load-directory=. $<
 
 iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
@@ -760,7 +760,7 @@ category.$(FASLEXT): category.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 cattable.$(FASLEXT): cattable.boot simpbool.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -779,7 +779,7 @@ interop.$(FASLEXT): interop.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
@@ -893,7 +893,7 @@ unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 posit.$(FASLEXT): posit.boot sys-macros.$(FASLEXT) astr.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -955,22 +955,22 @@ sfsfun.$(FASLEXT): sfsfun.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 info.$(FASLEXT): info.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 clammed.$(FASLEXT): clammed.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
@@ -982,13 +982,13 @@ g-boot.$(FASLEXT): g-boot.boot def.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 g-error.$(FASLEXT): g-error.boot diagnostics.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 c-util.$(FASLEXT): c-util.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
 
 pathname.$(FASLEXT): pathname.boot nlib.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 hashcode.$(FASLEXT): hashcode.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -1000,10 +1000,10 @@ pspad1.$(FASLEXT): pspad1.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT) sys-utility.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-cndata.$(FASLEXT): g-cndata.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compress.$(FASLEXT): compress.boot sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 95e275c7..91bef7ba 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -102,7 +102,7 @@ buildLibdbConEntry conname ==
     abb:= getConstructorAbbreviationFromDB conname
     $conname := conname
     conform := getConstructorFormFromDB conname or [conname] --hack for Category,..
-    $conform := dbMkForm SUBST('T,"T$",conform)
+    $conform := dbMkForm substitute('T,"T$",conform)
     null $conform => nil
     $exposed? := (isExposedConstructor conname => '"x"; '"n")
     $doc      := getConstructorDocumentationFromDB conname
@@ -171,8 +171,8 @@ buildLibOp(op,sig,pred) ==
 --operations      OKop  \#\sig \conname\pred\comments (K is U or C)
   nsig := SUBLISLIS(rest $conform,$FormalMapVariableList,sig)
   pred := SUBLISLIS(rest $conform,$FormalMapVariableList,pred)
-  nsig := SUBST('T,"T$",nsig)   --this ancient artifact causes troubles!
-  pred := SUBST('T,"T$",pred)
+  nsig := substitute('T,"T$",nsig)   --this ancient artifact causes troubles!
+  pred := substitute('T,"T$",pred)
   sigpart:= form2LispString ['Mapping,:nsig]
   predString := (pred = 'T => '""; form2LispString pred)
   sop :=
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index c7244c40..64d34d20 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -518,7 +518,7 @@ extractHasArgs pred ==
       MEMQ(op,'(AND OR NOT)) => or/[find y for y in argl]
       nil
     nil
-  [rest x,:simpBool SUBST('T,x,pred)]
+  [rest x,:simpBool substitute('T,x,pred)]
 
 splitConTable cons ==
   uncond := cond := nil
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index b343b13d..95d33691 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -45,12 +45,12 @@ getDoc(conName,op,modemap) ==
   [dc,target,sl,pred,D] := simplifyModemap modemap
   sig := [target,:sl]
   null atom dc =>
-    sig := SUBST('$,dc,sig)
+    sig := substitute('$,dc,sig)
     sig := SUBLISLIS($FormalMapVariableList,rest dc,sig)
     getDocForDomain(conName,op,sig)
   if argList := IFCDR getOfCategoryArgument pred then
      SUBLISLIS($FormalMapArgumentList,argList,sig)
-  sig := SUBST('$,dc,sig)
+  sig := substitute('$,dc,sig)
   getDocForCategory(conName,op,sig)
 
 ++ Given a preidcate `pred' for a modemap, returns the first
@@ -132,7 +132,7 @@ collectAndDeleteAssoc x ==
 
 finalizeDocumentation() ==
   unusedCommentLineNumbers := [x for (x := [n,:r]) in $COMBLOCKLIST | r]
-  docList := SUBST("$","%",transDocList($op,$docList))
+  docList := substitute("$","%",transDocList($op,$docList))
   if u := [sig for [sig,:doc] in docList | null doc] then
     for y in u repeat
       y = 'constructor => noHeading := true
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 27cdebd5..86508063 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -77,7 +77,7 @@ genCategoryTable() ==
 simpTempCategoryTable() ==
   for id in HKEYS _*ANCESTORS_-HASH_* repeat
     for (u:=[a,:b]) in getConstructorAncestorsFromDB id repeat
-      RPLACA(u,SUBST('Type,'Object,a))
+      RPLACA(u,substitute('Type,'Object,a))
       RPLACD(u,simpHasPred b)
 
 simpCategoryTable() == main where
@@ -116,7 +116,7 @@ simpHasPred(pred,:options) == main where
     pred in '(T etc) => pred
     null pred => nil
     pred
-  simpDevaluate a == EVAL SUBST('QUOTE,'devaluate,a)
+  simpDevaluate a == EVAL substitute('QUOTE,'devaluate,a)
   simpHas(pred,a,b) ==
     b is ['ATTRIBUTE,attr] => simpHasAttribute(pred,a,attr)
     b is ['SIGNATURE,op,sig] => simpHasSignature(pred,a,op,sig)
@@ -400,9 +400,9 @@ categoryParts(conform,category,:options) == main where
     item is ['IF,pred1,s1,s2] =>
       build(s1,quickAnd(pred,pred1))
       s2 => build(s2,quickAnd(pred,['NOT,pred1]))
-    item is ['PROGN,:r] => for x in r repeat build(x,pred)
-    item in '(%noBranch) => 'ok
     null item => 'ok
+    item = "%noBranch" => 'ok
+    item is ['PROGN,:r] => for x in r repeat build(x,pred)
     systemError '"build error"
   exportsOf(target) ==
     target is ['CATEGORY,.,:r] => r
diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot
index cd7cb165..01493950 100644
--- a/src/interp/clammed.boot
+++ b/src/interp/clammed.boot
@@ -1,6 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -77,7 +77,7 @@ isValidType form ==
   -- are not valid.
   STRINGP form => true
   IDENTP  form => false
-  form in $LangSupportTypes => true
+  member(form,$LangSupportTypes) => true
   form is ['Record,:selectors] =>
     and/[isValidType type for [:.,type] in selectors]
   form is ['Enumeration,:args] =>
diff --git a/src/interp/define.boot b/src/interp/define.boot
index a765091d..937ce162 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -271,8 +271,8 @@ mkCategoryPackage(form is [op,:argl],cat,def) ==
                      :SUBLISLIS(argl,$FormalMapVariableList,catOpList)]
   nils:= [nil for x in argl]
   packageSig := [packageCategory,form,:nils]
-  $categoryPredicateList := SUBST(nameForDollar,'$,$categoryPredicateList)
-  SUBST(nameForDollar,'$,
+  $categoryPredicateList := substitute(nameForDollar,'$,$categoryPredicateList)
+  substitute(nameForDollar,'$,
       ['DEF,[packageName,:packageArgl],packageSig,[nil,:nils],def])
  
 compDefineCategory2(form,signature,specialCases,body,m,e,
@@ -662,7 +662,7 @@ makeFunctorArgumentParameters(argl,sigl,target) ==
         $ConditionalOperators:=[CDR u,:$ConditionalOperators]
       s is ['Join,:sl] =>
         u:=ASSQ('CATEGORY,ss) =>
-          SUBST([:u,:ss],u,s)
+          MSUBST([:u,:ss],u,s)
         ['Join,:sl,['CATEGORY,'package,:ss]]
       ['Join,s,['CATEGORY,'package,:ss]]
     fn(a,s) ==
@@ -720,7 +720,7 @@ mkOpVec(dom,siglist) ==
     assoc(sig,u) is [.,n,.,'ELT] => ops.i := dom.n
     noplist:= SUBLIS(substargs,u)
  -- following variation on assoc needed for GENSYMS in Mutable domains
-    AssocBarGensym(SUBST(dom.0,'$,sig),noplist) is [.,n,.,'ELT] =>
+    AssocBarGensym(substitute(dom.0,'$,sig),noplist) is [.,n,.,'ELT] =>
                    ops.i := dom.n
     ops.i := [function Undef,[dom.0,i],:opSig]
   ops
@@ -993,7 +993,7 @@ stripOffArgumentConditions argl ==
   [f for x in argl for i in 1..] where
     f() ==
       x is ["|",arg,condition] =>
-        condition:= SUBST('_#1,arg,condition)
+        condition:= substitute('_#1,arg,condition)
         -- in case conditions are given in terms of argument names, replace
         $argumentConditionList:= [[i,arg,condition],:$argumentConditionList]
         arg
@@ -1014,7 +1014,7 @@ compArgumentConditions e ==
   $argumentConditionList:=
     [f for [n,a,x] in $argumentConditionList] where
       f() ==
-        y:= SUBST(a,'_#1,x)
+        y:= substitute(a,'_#1,x)
         T := [.,.,e]:= compOrCroak(y,$Boolean,e)
         [n,x,T.expr]
   e
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 373abac0..d7042859 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -1,6 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -176,7 +176,7 @@ isNameOfType x ==
   $doNotAddEmptyModeIfTrue:local:= true
   (val := get(x,'value,$InteractiveFrame)) and
     (domain := objMode val) and
-      domain in $LangSupportTypes => true
+      member(domain,$LangSupportTypes) => true
   y := opOf unabbrev x
   constructor? y
  
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index f8e53dc7..d1a5b70b 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -455,7 +455,7 @@ formatUnabbreviated t ==
     [t]
   null t =>
     ['"()"]
-  t is [p,sel,arg] and p in '(_: ":") =>
+  t is [p,sel,arg] and p = ":" =>
     [sel,'": ",:formatUnabbreviated arg]
   t is ['Union,:args] =>
     ['Union,'"(",:formatUnabbreviatedTuple args,'")"]
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index d12eef90..c66c8449 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -487,7 +487,7 @@ renamePatternVariables1(condList, substList, patVars) ==
 
 substFromAlist(l, substAlist) ==
   for [pvar, :replace] in substAlist repeat
-    l := SUBST(replace, pvar, l)
+    l := substitute(replace, pvar, l)
   l
 
 computeDomainVariableAlist() ==
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index f11478e4..ceab55c3 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -755,7 +755,7 @@ compileCoerceMap(op,argTypes,mm) ==
   body := ['SPADCALL,:argCode,['LIST,['function,imp]]]
   minivectorName := makeInternalMapMinivectorName(name)
   $minivectorNames := [[op,:minivectorName],:$minivectorNames]
-  body := SUBST(minivectorName,"$$$",body)
+  body := substitute(minivectorName,"$$$",body)
   if $compilingInputFile then
     $minivectorCode := [:$minivectorCode,minivectorName]
   setDynamicBinding(minivectorName,LIST2REFVEC $minivector)
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 6b80b41c..e5ed26c5 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -156,7 +156,7 @@ compileADEFBody(t,vars,types,body,computedResultType) ==
   $compiledOpNameList := [$mapName]
   minivectorName := makeInternalMapMinivectorName(PNAME $mapName)
   $minivectorNames := [[$mapName,:minivectorName],:$minivectorNames]
-  body := SUBST(minivectorName,"$$$",body)
+  body := substitute(minivectorName,"$$$",body)
   if $compilingInputFile then
     $minivectorCode := [:$minivectorCode,minivectorName]
   setDynamicBinding(minivectorName,LIST2REFVEC $minivector)
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot
index b211d3bc..f5a3b157 100644
--- a/src/interp/modemap.boot
+++ b/src/interp/modemap.boot
@@ -1,4 +1,4 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
 -- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -258,7 +258,7 @@ augModemapsFromCategoryRep(domainName,repDefn,functorBody,categoryForm,e) ==
   e:= putDomainsInScope(domainName,e)
   $base:= 4
   for [lhs:=[op,sig,:.],cond,fnsel] in fnAlist repeat
-    u:=assoc(SUBST("Rep",domainName,lhs),repFnAlist)
+    u:=assoc(substitute("Rep",domainName,lhs),repFnAlist)
     u and not AMFCR_,redefinedList(op,functorBody) =>
       fnsel':=CADDR u
       e:= addModemap(op,domainName,sig,cond,fnsel',e)
diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot
index e9228806..237b392f 100644
--- a/src/interp/nrungo.boot
+++ b/src/interp/nrungo.boot
@@ -384,7 +384,7 @@ NRTisRecurrenceRelation(op,body,minivectorName) ==
   sharpPosition := PARSE_-INTEGER SUBSTRING(sharpArg,1,nil)
   al:= mkDiffAssoc(op,generalTerm,k,sharpPosition,sharpArg,diffSlot,minivectorName)
   null al => false
-  '$failed in al => false
+  "$failed" in al => false
   body:= generalTerm
   for [a,:b] in al repeat
     body:= substitute(b,a,body)
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index d6e9ae15..7ce97720 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -1,6 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -147,7 +147,7 @@ $generalTTRules == '( _
 createResolveTTRules() ==
   -- expand multivariate polynomial rules
   mps := '(MP DMP NDMP)
-  mpRules := "append"/[SUBST(mp,'mpoly1,$mpolyTTRules) for mp in mps]
+  mpRules := "append"/[substitute(mp,'mpoly1,$mpolyTTRules) for mp in mps]
   $Res := CONS('(t1 t2 x y),
     EQSUBSTLIST($nameList,$abList,append($generalTTRules,mpRules)))
   true
@@ -283,8 +283,8 @@ $newResolveAbbreviations == '( _
 createResolveTMRules() ==
   -- expand multivariate polynomial rules
   mps := '(MP DMP NDMP)
-  mpRules0 := "append"/[SUBST(mp,'mpoly1,$mpolyTMRules) for mp in mps]
-  mpRules := "append"/[SUBST(mp,'mpoly2,mpRules0) for mp in mps]
+  mpRules0 := "append"/[substitute(mp,'mpoly1,$mpolyTMRules) for mp in mps]
+  mpRules := "append"/[substitute(mp,'mpoly2,mpRules0) for mp in mps]
   $ResMode := CONS('(t1 t2 x y),
     EQSUBSTLIST($nameList,$abList,append(mpRules,$generalTMRules)))
   true
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index c616b3f2..62e539e8 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -45,7 +45,7 @@ reportFunctionCompilation(op,nam,argl,body,isRecursive) ==
   $compiledOpNameList := [nam]
   minivectorName := makeInternalMapMinivectorName(nam)
   $minivectorNames := [[op,:minivectorName],:$minivectorNames]
-  body := SUBST(minivectorName,"$$$",body)
+  body := substitute(minivectorName,"$$$",body)
   if $compilingInputFile then
     $minivectorCode := [:$minivectorCode,minivectorName]
   setDynamicBinding(minivectorName,LIST2REFVEC $minivector)
@@ -195,7 +195,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
     cbody:=
       endTest:=
         ["COND", [["EQL",sharpArg,gIndex],['RETURN,returnValue]]]
-      newValueCode:= ["LET",g,SUBST(gIndex,sharpArg,
+      newValueCode:= ["LET",g,substitute(gIndex,sharpArg,
         EQSUBSTLIST(gsList,rest $TriangleVariableList,body))]
       ["PROGN",:decomposeCode,
         ["REPEAT",["WHILE",'T],["PROGN",endTest,advanceCode,