* interp/as.boot: Remove Old Boot semantics.

	* interp/br-con.boot: Likewise.
	* interp/br-data.boot: Likewise.
	* interp/br-op1.boot: Likewise.
	* interp/br-op2.boot: Likewise.
	* interp/br-saturn.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/newfort.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/nrunopt.boot: Likewise.

16 files changed, 147 insertions, 145 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index fa1cd3e5..4457c9f3 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -263,7 +263,7 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
 
 ## Translation to Fortran
 fortcall.$(FASLEXT): fortcall.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## HyperDoc
 topics.$(FASLEXT): topics.boot macros.$(FASLEXT)
@@ -276,22 +276,22 @@ br-search.$(FASLEXT): br-search.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-saturn.$(FASLEXT): br-saturn.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-op2.$(FASLEXT): br-op2.boot br-op1.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-op1.$(FASLEXT): br-op1.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-con.$(FASLEXT): br-con.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-prof.$(FASLEXT): br-prof.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -300,28 +300,28 @@ bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-misc.$(FASLEXT): bc-misc.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-util.$(FASLEXT): bc-util.boot ht-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ht-root.$(FASLEXT): ht-root.boot ht-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 hypertex.$(FASLEXT): hypertex.boot types.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## OpenAxiom's interpreter.
 
@@ -333,7 +333,7 @@ setvars.$(FASLEXT): setvars.boot macros.$(FASLEXT) debug.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -385,7 +385,7 @@ i-intern.$(FASLEXT): i-intern.boot i-object.$(FASLEXT) ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-code.$(FASLEXT): i-code.boot i-object.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-object.$(FASLEXT): i-object.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -397,13 +397,13 @@ format.$(FASLEXT): format.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 match.$(FASLEXT): match.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 record.$(FASLEXT): record.boot nlib.$(FASLEXT) pathname.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 setvart.$(FASLEXT): setvart.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## OpenAxiom's compiler
 wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) define.$(FASLEXT)
@@ -417,22 +417,22 @@ apply.$(FASLEXT): apply.boot compiler.$(FASLEXT)
 
 compiler.$(FASLEXT): compiler.boot c-util.$(FASLEXT) modemap.$(FASLEXT) \
 		pathname.$(FASLEXT) define.$(FASLEXT) iterator.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrunopt.$(FASLEXT): nrunopt.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrunfast.$(FASLEXT): nrunfast.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruncomp.$(FASLEXT): nruncomp.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 template.$(FASLEXT): template.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile  --output=$@ --load-directory=. $<
@@ -442,7 +442,7 @@ iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 package.$(FASLEXT): package.boot clam.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -452,22 +452,22 @@ database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 category.$(FASLEXT): category.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cattable.$(FASLEXT): cattable.boot simpbool.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) \
 		debug.$(FASLEXT)
@@ -481,13 +481,13 @@ c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT)
 
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 as.$(FASLEXT): as.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 server.$(FASLEXT): server.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ##
 ## OpenAxiom's front-end consists of two parts:
@@ -564,7 +564,7 @@ pf2sex.$(FASLEXT): pf2sex.boot ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 macex.$(FASLEXT): macex.boot ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -573,19 +573,19 @@ ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 pile.$(FASLEXT): pile.boot scan.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 scan.$(FASLEXT): scan.boot incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 incl.$(FASLEXT): incl.boot cstream.$(FASLEXT) cformat.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cformat.$(FASLEXT): cformat.boot unlisp.$(FASLEXT) posit.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 serror.$(FASLEXT): serror.boot posit.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -597,16 +597,16 @@ intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 astr.$(FASLEXT): astr.boot vmlisp.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 dq.$(FASLEXT): dq.boot types.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## General support and utilities.
 cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT)
@@ -656,7 +656,7 @@ modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 info.$(FASLEXT): info.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -677,7 +677,7 @@ msgdb.$(FASLEXT): msgdb.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-boot.$(FASLEXT): g-boot.boot def.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-error.$(FASLEXT): g-error.boot diagnostics.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 46ef06d6..eec6d8fd 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -565,7 +565,7 @@ $(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
 
 ## Translation to Fortran
 fortcall.$(FASLEXT): fortcall.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## HyperDoc
 topics.$(FASLEXT): topics.boot macros.$(FASLEXT)
@@ -578,22 +578,22 @@ br-search.$(FASLEXT): br-search.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-saturn.$(FASLEXT): br-saturn.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-op2.$(FASLEXT): br-op2.boot br-op1.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-op1.$(FASLEXT): br-op1.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-con.$(FASLEXT): br-con.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-prof.$(FASLEXT): br-prof.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-data.$(FASLEXT): br-data.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 br-util.$(FASLEXT): br-util.boot bc-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -602,28 +602,28 @@ bc-solve.$(FASLEXT): bc-solve.boot bc-matrix.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-matrix.$(FASLEXT): bc-matrix.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-misc.$(FASLEXT): bc-misc.boot bc-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bc-util.$(FASLEXT): bc-util.boot ht-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ht-root.$(FASLEXT): ht-root.boot ht-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 hypertex.$(FASLEXT): hypertex.boot types.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## OpenAxiom's interpreter.
 
@@ -635,7 +635,7 @@ setvars.$(FASLEXT): setvars.boot macros.$(FASLEXT) debug.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 profile.$(FASLEXT): profile.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -687,7 +687,7 @@ i-intern.$(FASLEXT): i-intern.boot i-object.$(FASLEXT) ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-code.$(FASLEXT): i-code.boot i-object.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 i-object.$(FASLEXT): i-object.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -699,13 +699,13 @@ format.$(FASLEXT): format.boot macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 match.$(FASLEXT): match.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 record.$(FASLEXT): record.boot nlib.$(FASLEXT) pathname.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 setvart.$(FASLEXT): setvart.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## OpenAxiom's compiler
 wi2.$(FASLEXT): wi2.boot macros.$(FASLEXT) define.$(FASLEXT)
@@ -719,22 +719,22 @@ apply.$(FASLEXT): apply.boot compiler.$(FASLEXT)
 
 compiler.$(FASLEXT): compiler.boot c-util.$(FASLEXT) modemap.$(FASLEXT) \
 		pathname.$(FASLEXT) define.$(FASLEXT) iterator.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrunopt.$(FASLEXT): nrunopt.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrunfast.$(FASLEXT): nrunfast.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruncomp.$(FASLEXT): nruncomp.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nrungo.$(FASLEXT): nrungo.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 nruntime.$(FASLEXT): nruntime.boot c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 template.$(FASLEXT): template.boot c-util.$(FASLEXT)
 	$(BOOTSYS) --compile  --output=$@ --load-directory=. $<
@@ -744,7 +744,7 @@ iterator.$(FASLEXT): iterator.boot g-util.$(FASLEXT)
 
 define.$(FASLEXT): define.boot cattable.$(FASLEXT) category.$(FASLEXT) \
 			c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 package.$(FASLEXT): package.boot clam.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -754,22 +754,22 @@ database.$(FASLEXT): database.boot clam.$(FASLEXT) nlib.$(FASLEXT) \
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 functor.$(FASLEXT): functor.boot category.$(FASLEXT) c-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 category.$(FASLEXT): category.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cattable.$(FASLEXT): cattable.boot simpbool.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 compat.$(FASLEXT): compat.boot pathname.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) \
 		debug.$(FASLEXT)
@@ -783,13 +783,13 @@ c-doc.$(FASLEXT): c-doc.boot c-util.$(FASLEXT)
 
 ## Interface with the Aldor compiler.
 ax.$(FASLEXT): ax.boot as.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 as.$(FASLEXT): as.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 server.$(FASLEXT): server.boot macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ##
 ## OpenAxiom's front-end consists of two parts:
@@ -866,7 +866,7 @@ pf2sex.$(FASLEXT): pf2sex.boot ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cparse.$(FASLEXT): cparse.boot ptrees.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 macex.$(FASLEXT): macex.boot ptrees.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -875,19 +875,19 @@ ptrees.$(FASLEXT): ptrees.boot posit.$(FASLEXT) serror.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 pile.$(FASLEXT): pile.boot scan.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 scan.$(FASLEXT): scan.boot incl.$(FASLEXT) bits.$(FASLEXT) dq.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 incl.$(FASLEXT): incl.boot cstream.$(FASLEXT) cformat.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cformat.$(FASLEXT): cformat.boot unlisp.$(FASLEXT) posit.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 serror.$(FASLEXT): serror.boot posit.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 unlisp.$(FASLEXT): unlisp.lisp sys-macros.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -899,16 +899,16 @@ intfile.$(FASLEXT): intfile.boot cstream.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 cstream.$(FASLEXT): cstream.boot sys-macros.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 astr.$(FASLEXT): astr.boot vmlisp.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 bits.$(FASLEXT): bits.lisp boot-pkg.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 dq.$(FASLEXT): dq.boot types.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 ## General support and utilities.
 cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT)
@@ -958,7 +958,7 @@ modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 info.$(FASLEXT): info.boot g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
@@ -979,7 +979,7 @@ msgdb.$(FASLEXT): msgdb.boot g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-boot.$(FASLEXT): g-boot.boot def.$(FASLEXT) g-util.$(FASLEXT)
-	$(BOOTSYS) --compile --boot="old" --output=$@ --load-directory=. $<
+	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
 
 g-error.$(FASLEXT): g-error.boot diagnostics.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 64e04098..4fcf7c01 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -282,8 +282,8 @@ asGetModemaps(opAlist,oform,kind,modemap) ==
 --  and generating $TriangleVariableList
   for [op,:itemlist] in SUBLISLIS(rpvl, $FormalMapVariableList,opAlist) repeat
     for [sig0, pred] in itemlist repeat
-      sig := SUBST(dc,"$",sig0)
-      pred:= SUBST(dc,"$",pred)
+      sig := substitute(dc,"$",sig0)
+      pred:= subtitute(dc,"$",pred)
       sig := SUBLISLIS(rpvl,KDR oform,sig)
       pred:= SUBLISLIS(rpvl,KDR oform,pred)
       pred := pred or 'T
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 1bbb6d94..5c84cc7c 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -264,7 +264,7 @@ domainDescendantsOf(conform,domform) == main where --called by kargPage
       x is ['CATEGORY,.,:r] => alist := catScreen(r,alist)
       keepList := nil
       for [item,:pred] in domainsOf(x,IFCAR domlist) repeat
-        u := ASSOC(item,alist) =>
+        u := assoc(item,alist) =>
           keepList := [[item,:quickAnd(CDR u,pred)],:keepList]
       alist := keepList
     for pair in alist repeat RPLACD(pair,simpHasPred CDR pair)
@@ -398,7 +398,7 @@ dbSearchOrder(conform,domname,$domain) ==  --domain = nil or set to live domain
         p:=SUBLISLIS(rest conform,$FormalMapVariableList,kTestPred catpredvec.i)
         $domain => EVAL p
         p
-      if domname and CONTAINED('$,pred) then pred := SUBST(domname,'$,pred)
+      if domname and CONTAINED('$,pred) then pred := substitute(domname,'$,pred)
 --    which = '"attribute" => pred    --all categories
       (pak := catinfo . i) and pred   --only those with default packages
     pakform() ==
@@ -406,7 +406,7 @@ dbSearchOrder(conform,domname,$domain) ==  --domain = nil or set to live domain
       catform := kFormatSlotDomain catvec . i
 --    which = '"attribute" => dbSubConform(rest conform,catform)
       res := dbSubConform(rest conform,[pak,"$",:rest catform])
-      if domname then res := SUBST(domname,'$,res)
+      if domname then res := substitute(domname,'$,res)
       res
   [:dbAddChain conform,:catforms]
 
@@ -538,7 +538,7 @@ kcaPage1(htPage,kind,article,whichever,fn, isCatDescendants?) ==
   if whichever ^= '"ancestor" then
     ancestors := augmentHasArgs(ancestors,conform)
   ancestors := listSort(function GLESSEQP,ancestors)
---if domname then ancestors := SUBST(domname,'$,ancestors)
+--if domname then ancestors := substitute(domname,'$,ancestors)
   htpSetProperty(htPage,'cAlist,ancestors)
   htpSetProperty(htPage,'thing,whichever)
   choice :=
@@ -805,7 +805,7 @@ koPageAux(htPage,which,domname,heading) == --from koPage, koPageFromKKPage
     which = '"general operation" => koOps(conform,domname,true)
     koOps(conform,domname)
   if selectedOperation := htpProperty(htPage,'selectedOperation) then
-    opAlist := [ASSOC(selectedOperation,opAlist) or systemError()]
+    opAlist := [assoc(selectedOperation,opAlist) or systemError()]
   dbShowOperationsFromConform(htPage,which,opAlist)
 
 koPageAux1(htPage,opAlist) ==
@@ -1199,7 +1199,7 @@ Z := '"{\sf Record} is a primitive domain of \Language{} which cannot be defined
 
 MESSAGE := STRCONC(X,Y,Z)
 
-PUT('Record,'documentation,SUBST(MESSAGE,'MESSAGE,'(
+PUT('Record,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
  (_=  (((Boolean) _$ _$)
    "\spad{r = s} tests for equality of two records \spad{r} and \spad{s}"))
@@ -1223,7 +1223,7 @@ Y := '"For an alternate form of {\sf Union} with _"tags_", see \downlink{Union(a
 
 MESSAGE := STRCONC(X,Y)
 
-PUT('UntaggedUnion,'documentation,SUBST(MESSAGE,'MESSAGE,'(
+PUT('UntaggedUnion,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
   (_=  (((Boolean) $ $)
     "\spad{u = v} tests if two objects of the union are equal, that is, u and v are hold objects of same branch which are equal."))
@@ -1253,7 +1253,7 @@ A := '"{\sf Union} is a primitive domain of \Language{} which cannot be defined
 
 MESSAGE := STRCONC(X,Y,Z,W,A)
 
-PUT('Union,'documentation,SUBST(MESSAGE,'MESSAGE,'(
+PUT('Union,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
   (_=  (((Boolean) $ $)
     "\spad{u = v} tests if two objects of the union are equal, that is, \spad{u} and \spad{v} are objects of same branch which are equal."))
@@ -1279,7 +1279,7 @@ Z := '"{\sf Mapping} is a primitive domain of \Language{} which cannot be define
 
 MESSAGE := STRCONC(X,Y,Z)
 
-PUT('Mapping,'documentation, SUBST(MESSAGE,'MESSAGE,'(
+PUT('Mapping,'documentation, substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
   (_=  (((Boolean) $ $)
     "\spad{u = v} tests if mapping objects are equal."))
@@ -1291,7 +1291,7 @@ Y := '" The {\em Enumeration} can constructor can take any number of symbols as
 
 MESSAGE := STRCONC(X, Y)
 
-PUT('Enumeration, 'documentation, SUBST(MESSAGE, 'MESSAGE, '(
+PUT('Enumeration, 'documentation, substitute(MESSAGE, 'MESSAGE, '(
   (constructor (NIL MESSAGE))
   (_= (((Boolean) _$ _$)
     "\spad{e = f} tests for equality of two enumerations \spad{e} and \spad{f}"))
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index e704fc31..3aeb8249 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -508,7 +508,7 @@ getParentsFor(cname,formalParams,constructorCategory) ==
   for x in folks constructorCategory repeat
     x := SUBLISLIS(formalParams,formals,x)
     x := SUBLISLIS(IFCDR constructorForm,formalParams,x)
-    x := SUBST('Type,'Object,x)
+    x := substitute('Type,'Object,x)
     acc := [:explodeIfs x,:acc]
   NREVERSE acc
 
@@ -575,7 +575,7 @@ childrenOf conform ==
     childAssoc(conform,parentsOfForm first pair)]
 
 childAssoc(form,alist) ==
-  null (argl := CDR form) => ASSOC(form,alist)
+  null (argl := CDR form) => assoc(form,alist)
   u := assocCar(opOf form, alist) => childArgCheck(argl,rest CAR u) and u
   nil
 
@@ -647,7 +647,7 @@ ancestorsAdd(pred,form) == --called by ancestorsRecur
   null pred => nil
   op := IFCAR form or form
   alist := HGET($if,op)
-  existingNode := ASSOC(form,alist) =>
+  existingNode := assoc(form,alist) =>
     RPLACD(existingNode,quickOr(CDR existingNode,pred))
   HPUT($if,op,[[form,:pred],:alist])
 
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 8df539d2..76aa6e69 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -365,7 +365,7 @@ dbGatherData(htPage,opAlist,which,key) ==
         item is [.,'ASCONST,:.] => 'ASCONST
         nil
       newEntry :=
-        u := ASSOC(entry,data) =>           --key seen before? look on DATA
+        u := assoc(entry,data) =>           --key seen before? look on DATA
           RPLACA(CDR u,CADR u or exposeFlag)--yes, expose if any 1 is exposed
           u
         data := [y := [entry,exposeFlag,:tail],:data]
@@ -665,8 +665,8 @@ dbShowOpDocumentation(htPage,opAlist,which,data) ==
         pred := predicate or true
         index := (exactlyOneOpSig => nil; base + j)
         if which = '"package operation" then
-          sig    := SUBST(conform,'_$,sig)
-          origin := SUBST(conform,'_$,origin)
+          sig    := substitute(conform,'_$,sig)
+          origin := substitute(conform,'_$,origin)
         displayDomainOp(htPage,newWhich,origin,op,sig,pred,doc,index,'dbChooseDomainOp,null exposeFlag,true)
   htSaySaturn '"\end{description}"
 
@@ -862,7 +862,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) ==
 --  must change any % into $ otherwise we will not pick up comments properly
 --  delete the SUBLISLIS when we fix on % or $ 
               dbGetDocTable(op,SUBLISLIS(['$],['%],sig),dbDocTable origin,which,nil)
-            if packageSymbol then sig := SUBST('_$,packageSymbol,sig)
+            if packageSymbol then sig := substitute('_$,packageSymbol,sig)
             dbGetDocTable(op,sig,docTable,which,nil)
           origin := IFCAR u or origin
           docCode := IFCDR u   --> (doc . code)
@@ -957,9 +957,9 @@ getDomainOpTable(dom,fromIfTrue,:options) ==
           f = 'nowhere => 'nowhere           --see replaceGoGetSlot
           f = 'makeSpadConstant => 'constant
           f = function IDENTITY => 'constant
-          f = 'newGoGet => SUBST('_$,domname,devaluate CAR r)
+          f = 'newGoGet => substitute('_$,domname,devaluate CAR r)
           null VECP r => systemError devaluateList r
-          SUBST('_$,domname,devaluate r)
+          substitute('_$,domname,devaluate r)
         'nowhere
       [sig1,:info]
 
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index 4744cd5c..9ef668ee 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -245,7 +245,7 @@ getSubstInsert(x,candidates) ==
     return insert(x,candidates)
     null candidates => [x]
     or/[CONTAINED(x,y) for y in candidates] => candidates
-    y := or/[CONTAINED(y,x) for y in candidates] => SUBST(x,y,candidates)
+    y := or/[CONTAINED(y,x) for y in candidates] => substitute(x,y,candidates)
     candidates
 
 
@@ -568,7 +568,7 @@ modemap2Sig(op,mm) ==
   if partial? then
     target := dcSig . 1
     ntarget := ['Union, target, '"failed"]
-    dcSig := SUBST(ntarget, target, dcSig)
+    dcSig := substitute(ntarget, target, dcSig)
   alist := findSubstitutionOrder? pairlis(vlist, flist) or systemError()
   predList := substInOrder(alist, predList)
   nsig := substInOrder(alist, sig)
@@ -580,7 +580,7 @@ modemap2Sig(op,mm) ==
     pp mm
     $badStack := [[op, mm], :$badStack]
 --pause nsig
-  [predList, origin, SUBST("%", origin, nsig)]
+  [predList, origin, substitute("%", origin, nsig)]
 
 modemap2SigConds conds ==
   conds is ['OR,:r] => modemap2SigConds first r
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 1de6b47d..27866a69 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -754,7 +754,7 @@ getSaturnExampleList() ==
   file := STRCONC(systemRootDirectory(), "/doc/axug/examples.lsp")
   not PROBE_-FILE file => nil
   fp := MAKE_-INSTREAM file
-  lst := READ fp
+  lst := VMREAD fp
   SHUT fp
   lst
   
@@ -794,7 +794,7 @@ dbPresentCons(htPage,kind,:exclusions) ==
     then htSay '"{\em Names}"
     else htMakePage [['bcLispLinks,['"Names",'"",'dbShowCons,'names]]]
   htSay '"}{"
-  if one? or member('parameters,exclusions) or not "or"/[CDAR x for x in cAlist]
+  if one? or member('parameters,exclusions) or not ("or"/[CDAR x for x in cAlist])
     then htSay '"{\em Parameters}"
     else htMakePage [['bcLispLinks,['"Parameters",'"",'dbShowCons,'parameters]]]
   htSay '"}{"
@@ -839,7 +839,7 @@ dbPresentConsSaturn(htPage,kind,exclusions) ==
   if one? or member('names,exclusions)
     then htSayCold '"\&Names"
     else htMakePage [['bcLispLinks,['"\&Names",'"",'dbShowCons,'names]]]
-  if one? or member('parameters,exclusions) or not "or"/[CDAR x for x in cAlist]
+  if one? or member('parameters,exclusions) or not ("or"/[CDAR x for x in cAlist])
     then htSayCold '"\&Parameters"
     else htMakePage [['bcLispLinks,['"\&Parameters",'"",'dbShowCons,'parameters]]]
   htSaySaturn '"\hrule"
@@ -1313,7 +1313,7 @@ displayDomainOp(htPage,which,origin,op,sig,predicate,
     htSaySaturn '"{\em Conditions:}"
     htSayStandard('"\newline\tab{2}{\em Conditions:}")
     firstTime := true
-    for p in displayBreakIntoAnds SUBST($conform,"$",pred) repeat
+    for p in displayBreakIntoAnds substitute($conform,"$",pred) repeat
       if not firstTime then htSaySaturn '"\\"
       htSayIndentRel(15,count > 1)
       firstTime := false
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index e134eb22..8534306d 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1328,7 +1328,7 @@ coerceExtraHard(T is [x,m',e],m) ==
 belongsTo?(m,cat,e) ==
   c := get(m,"mode",e)
   c isnt ["Join",:cats] => nil
-  cat in cats
+  member(cat,cats)
 
 coerceable(m,m',e) ==
   m=m' => m
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 94df2a18..673c45cd 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -703,7 +703,7 @@ genDomainOps(viewName,dom,cat) ==
         for [op,sig] in siglist]]]]
   $getDomainCode:= [cd,:$getDomainCode]
   for [opsig,cond,:.] in oplist for i in 0.. repeat
-    if opsig in $ConditionalOperators then cond:=nil
+    if member(opsig,$ConditionalOperators) then cond:=nil
     [op,sig]:=opsig
     $e:= addModemap(op,dom,sig,cond,['ELT,viewName,i],$e)
   viewName
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index d5cefb20..402800b8 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -337,7 +337,7 @@ makeUnion aspType ==
   ["Union",[":","fp",aspType],[":","fn","FileName"]]
 
 axiomType(a,decls,asps,aspInfo) ==
-  a in asps =>
+  member(a, asps) =>
     entry := first [u for u in aspInfo | first(u) = a]
     ftc := ["$elt","FortranType","construct"]
     rc  := ["$elt", _
@@ -739,7 +739,7 @@ sendNagmanErrorSignal()==
 -- $fortranCompilerName := '"f90"
 
 inFirstNotSecond(f,s)==
- [i for i in f | not i in s]
+ [i for i in f | not member(i,s)]
 
 -- Code for use in the Windows version of the AXIOM/NAG interface.
 
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 657a7a13..4d42c2ed 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -420,7 +420,7 @@ mkDomainConstructor x ==
 setVector4(catNames,catsig,conditions) ==
   if $HackSlot4 then
     for ['LET,name,cond,:.] in $getDomainCode repeat
-      $HackSlot4:=SUBST(name,cond,$HackSlot4)
+      $HackSlot4:=substitute(name,cond,$HackSlot4)
   code:=
 --+
     ['SETELT,'$,4,'TrueDomain]
@@ -965,10 +965,10 @@ getViewsConditions u ==
  
 DescendCodeVarAdd(base,flag) ==
    princview := CAR $catvecList
-   [SetFunctionSlots(sig,SUBST('ELT,'CONST,implem),flag,'adding) repeat
+   [SetFunctionSlots(sig,substitute('ELT,'CONST,implem),flag,'adding) repeat
        for i in 6..MAXINDEX princview |
          princview.i is [sig:=[op,types],:.] and
-           LASSOC([base,:SUBST(base,'$,types)],get(op,'modemap,$e)) is
+           LASSOC([base,:substitute(base,'$,types)],get(op,'modemap,$e)) is
                   [[pred,implem]]]
  
 resolvePatternVars(p,args) ==
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index dd1bc8cc..6f4901da 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -60,7 +60,7 @@ htShowSetTree(setTree) ==
   maxWidth2 := MAX(41,maxWidth2)
   tabset1 := STRINGIMAGE (maxWidth1)
   tabset2 := STRINGIMAGE (maxWidth2 + maxWidth1 - 1)
-  htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + (maxWidth2/3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
+  htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + QUOTIENT(maxWidth2,3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
   for setData in REVERSE okList repeat
       htSay '"\item"
       label := STRCONC('"\menuitemstyle{",setData.setName,'"}")
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index a83d2381..5f66a94b 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -129,7 +129,7 @@ exp2Fort2(e,prec,oldOp) ==
     ['")",:exp2Fort2(SECOND args, prec, op),'",",:exp2Fort2(first args,prec,op),'"("]
   member(op,nonUnaryOps) =>
     if nargs > 0 then arg1 := first args
-    nargs = 1 and op in '("+" "*") => exp2Fort2(arg1,prec,op)
+    nargs = 1 and member(op, '("+" "*")) => exp2Fort2(arg1,prec,op)
     if nargs > 1 then arg2 := first rest args
     p := position(op,binaryOps)
     if p = -1
@@ -139,12 +139,12 @@ exp2Fort2(e,prec,oldOp) ==
       else nprec := binaryPrecs.p
     s := nil
     for arg in args repeat
-      op = '"+" and (arg is [m,a]) and m in '(_- "=") =>
+      op = '"+" and (arg is [m,a]) and member(m,'(_- "=")) =>
         if not s then s := ['junk]
         s:= [op,:exp2Fort2(a,nprec,op),'"-",:rest s]
       s := [op,:exp2Fort2(arg,nprec,op),:s]
     s := rest s
-    op = oldOp and op in ['"*",'"+"] => s
+    op = oldOp and member(op,['"*",'"+"]) => s
     nprec <= prec => ['")",:s,'"("]
     s
   exp2FortFn(op,args,nargs)
@@ -448,7 +448,7 @@ exp2FortSpecial(op,args,nargs) ==
       si := $fortranArrayStartingIndex
       hidim := #elts - 1 + si
       if LISTP first elts and #elts=1 and first elts is [sOp,:sArgs] then
-        sOp in ['"SEGMENT","SEGMENT"] =>
+        member(sOp, ['"SEGMENT","SEGMENT"]) =>
           #sArgs=1 => fortError1 first elts
           not(NUMBERP(first sArgs) and NUMBERP(SECOND sArgs)) =>
             fortError("Cannot expand segment: ",first elts)
@@ -462,10 +462,10 @@ exp2FortSpecial(op,args,nargs) ==
   op in ["CONCAT","CONCATB"] =>
     nargs = 0 => NIL
     nargs = 1 => fortPre1 first args
-    nargs = 2 and first rest args in ["!",'"!"] =>
+    nargs = 2 and member(second args, ["!",'"!"]) =>
       mkFortFn("FACTORIAL",[first args],1)
     fortError1 [op,:args]
-  op in ['"MATRIX","MATRIX"] =>
+  member(op, ['"MATRIX","MATRIX"]) =>
     args is [var, =NIL,:rows] =>
       var := object2String var
       nrows := #rows - 1
@@ -787,12 +787,12 @@ fortPre1 e ==
   STRINGP(e) => e
   e = "%e" => fortPre1 ["exp" , 1]
   imags := ['"%i","%i"]
-  e in imags => ['"CMPLX",fortPre1(0),fortPre1(1)]
+  member(e, imags) => ['"CMPLX",fortPre1(0),fortPre1(1)]
   -- other special objects
   ELT(STRINGIMAGE e,0) = "%" => SUBSEQ(STRINGIMAGE e,1)
   atom e => e
   [op, :args] := e
-  op in ["**" , '"**"] =>
+  member(op,["**" , '"**"]) =>
     [rand,exponent] := args
     rand = "%e" => fortPre1 ["exp", exponent]
     (IDENTP rand or STRINGP rand) and exponent=2 => ["*", rand, rand]
@@ -801,12 +801,12 @@ fortPre1 e ==
   op = "ROOT" =>
     #args = 1 => fortPreRoot ["sqrt", first args]
     [ "**" , fortPreRoot first args , [ "/" , fortPreRoot(1), fortPreRoot first rest args] ]
-  if op in ['"OVER", "OVER"] then op := '"/"
+  if member(op,['"OVER", "OVER"]) then op := '"/"
   specialOps  := '(BRACKET BRACE SUB AGGLST SUPERSUB MATRIX SEGMENT ALTSUPERSUB
                    PAREN CONCAT CONCATB QUOTE STRING SIGMA  STEP IN SIGMA2
                    INTSIGN  PI PI2 INDEFINTEGRAL)
   op in specialOps => exp2FortSpecial(op,args,#args)
-  op in ['"*", "*", '"+", "+", '"-", "-"] and (#args > 2) =>
+  member(op,['"*", "*", '"+", "+", '"-", "-"]) and (#args > 2) =>
     binaryExpr := fortPre1 [op,first args, SECOND args]
     for i in 3..#args repeat
       binaryExpr := [op,binaryExpr,fortPre1 NTH(i-1,args)]
@@ -814,15 +814,17 @@ fortPre1 e ==
   -- Now look for any complex objects
   #args = 2 =>
     [arg1,arg2] := args
-    op in ["*",'"*"] and arg2 in imags => ['"CMPLX",fortPre1(0),fortPre1(arg1)]
-    op in ["+",'"+"] and arg2 in imags => ['"CMPLX",fortPre1(arg1),fortPre1(1)]
-    op in ["+",'"+"] and arg2 is [mop,m1,m2] and mop in ["*",'"*"] =>
-      m2 in imags => ['"CMPLX",fortPre1(arg1),fortPre1(m1)]
-      m1 in imags => ['"CMPLX",fortPre1(arg1),fortPre1(m2)]
+    member(op, ["*",'"*"]) and member(arg2, imags) => 
+      ['"CMPLX",fortPre1(0),fortPre1(arg1)]
+    member(op,["+",'"+"]) and member(arg2,imags) => 
+      ['"CMPLX",fortPre1(arg1),fortPre1(1)]
+    member(op,["+",'"+"]) and arg2 is [mop,m1,m2] and member(mop,["*",'"*"]) =>
+      member(m2,imags) => ['"CMPLX",fortPre1(arg1),fortPre1(m1)]
+      member(m1,imags) => ['"CMPLX",fortPre1(arg1),fortPre1(m2)]
       ["+",fortPre1 arg1,fortPre1 arg2]
-    op in ["+",'"+"] and arg1 is [mop,m1,m2] and mop in ["*",'"*"] =>
-      m2 in imags => ['"CMPLX",fortPre1(arg2),fortPre1(m1)]
-      m1 in imags => ['"CMPLX",fortPre1(arg2),fortPre1(m2)]
+    member(op,["+",'"+"]) and arg1 is [mop,m1,m2] and member(mop,["*",'"*"]) =>
+      member(m2,imags) => ['"CMPLX",fortPre1(arg2),fortPre1(m1)]
+      member(m1,imags) => ['"CMPLX",fortPre1(arg2),fortPre1(m2)]
       ["+",fortPre1 arg1,fortPre1 arg2]
     mkFortFn(op,args,2)
   mkFortFn(op,args,#args)
@@ -872,7 +874,7 @@ fortExpSize e ==
   op := STRINGIMAGE op
   op = '"CMPLX" => 3+fortSize [fortExpSize arg1,fortExpSize arg2]
   narys := ['"+",'"*"] -- those nary ops we changed to binary
-  op in narys =>
+  member(op,narys) =>
     LISTP arg1 and not(op=STRINGIMAGE first arg1) =>
       2+fortSize MAPCAR(function fortExpSize, e)
     LISTP arg2 and not(op=STRINGIMAGE first arg2) =>
@@ -892,12 +894,12 @@ segment l ==
   not $fortranSegment => l
   s := nil
   for e in l repeat
-    if LISTP(e) and first e in ["=",'"="] then
+    if LISTP(e) and first member(e,["=",'"="]) then
       var := NTH(1,e)
       exprs := segment1(THIRD e,
                         $maximumFortranExpressionLength-1-fortExpSize var)
       s:= [:[['"=",var,car exprs],:cdr exprs],:s]
-    else if LISTP(e) and first e in ['"RETURN"] then
+    else if LISTP(e) and first e = '"RETURN" then
       exprs := segment1(SECOND e,
                         $maximumFortranExpressionLength-2-fortExpSize first e)
       s := [:[[first e,car exprs],:cdr exprs],:s]
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 6d11867c..749488e1 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -153,7 +153,7 @@ optDeltaEntry(op,sig,dc,eltOrConst) ==
     dc = '$ => $functorForm
     atom dc and (dcval := get(dc,'value,$e)) => dcval.expr
     dc
-  sig := SUBST(ndc,dc,sig)
+  sig := substitute(ndc,dc,sig)
   not MEMQ(KAR ndc,$optimizableConstructorNames) => nil
   dcval := optCallEval ndc
   -- MSUBST guarantees to use EQUAL testing
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index e768caef..ade21c0f 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -339,7 +339,7 @@ testBitVector(vec,i) ==
  
 bitsOf n ==
   n = 0 => 0
-  1 + bitsOf (n/2)
+  1 + bitsOf QUOTIENT(n,2)
  
 --=======================================================================
 --               Generate Slot 4 Constructor Vectors
@@ -631,7 +631,7 @@ dcData con ==
 
 dcData1 vec ==
   n := MAXINDEX vec
-  tens := n / 10
+  tens := QUOTIENT(n,10)
   for i in 0..tens repeat
     start := 10*i
     sayBrightlyNT rightJustifyString(STRINGIMAGE start,6)
@@ -717,7 +717,7 @@ nodeSize(n) == 12 * n
 vectorSize(n) == 4 * (1 + n)
 
 halfWordSize(n) == 
-  n < 128 => n / 2
+  n < 128 => QUOTIENT(n,2)
   n < 256 => n
   2 * n