* interp/as.boot: Clean up.

	* interp/ax.boot: Likewise.
	* 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/br-search.boot: Likewise.
	* interp/c-util.boot: Likewise.
	* interp/category.boot: Likewise.
	* interp/cattable.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/cstream.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/g-boot.boot: Likewise.
	* interp/g-opt.boot: Likewise.
	* interp/g-timer.boot: Likewise.
	* interp/guess.boot: Likewise.
	* interp/i-analy.boot: Likewise.
	* interp/i-coerce.boot: Likewise.
	* interp/i-coerfn.boot: Likewise.
	* interp/i-eval.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-intern.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/i-object.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/i-resolv.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/i-spec2.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/int-top.boot: Likewise.
	* interp/interop.boot: Likewise.
	* interp/lisplib.boot: Likewise.
	* interp/mark.boot: Likewise.
	* interp/modemap.boot: Likewise.
	* interp/msg.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/newfort.boot: Likewise.
	* interp/nrunfast.boot: Likewise.
	* interp/nrungo.boot: Likewise.
	* interp/nrunopt.boot: Likewise.
	* interp/pf2atree.boot: Likewise.
	* interp/pile.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/ptrees.boot: Likewise.
	* interp/scan.boot: Likewise.
	* interp/sfsfun.boot: Likewise.
	* interp/showimp.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/wi1.boot: Likewise.
	* interp/word.boot: Likewise.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 6f85c84c..21e76792 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -647,7 +647,7 @@ getFormModemaps(form is [op,:argl],e) ==
      then modemapList:= eltModemapFilter(LAST argl,modemapList,e) or return nil
      else
       if op="setelt" then modemapList:=
-        seteltModemapFilter(CADR argl,modemapList,e) or return nil
+        seteltModemapFilter(second argl,modemapList,e) or return nil
   nargs:= #argl
   finalModemapList:= [mm for (mm:= [[.,.,:sig],:.]) in modemapList 
                        | enoughArguments(argl,sig)]
@@ -1039,9 +1039,9 @@ replaceExitEtc(x,tag,opFlag,opMode) ==
             $finalEnv => intersectionEnvironment($finalEnv,t.env)
             t.env
           rplac(first x,"THROW")
-          rplac(CADR x,tag)
-          rplac(CADDR x,(convertOrCroak(t,opMode)).expr)
-        true => rplac(CADR x,CADR x-1)
+          rplac(second x,tag)
+          rplac(third x,(convertOrCroak(t,opMode)).expr)
+        true => rplac(second x,second x-1)
       x is [key,n,t] and key in '(TAGGEDreturn TAGGEDexit) =>
         rplac(first t,replaceExitEtc(first t,tag,opFlag,opMode))
       replaceExitEtc(first x,tag,opFlag,opMode)
@@ -1306,7 +1306,7 @@ getUnionMode(x,e) ==
 
 isUnionMode(m,e) ==
   m is ["Union",:.] => m
-  (m':= getmode(m,e)) is ["Mapping",["UnionCategory",:.]] => CADR m'
+  (m':= getmode(m,e)) is ["Mapping",["UnionCategory",:.]] => second m'
   v:= get(RepIfRepHack m,"value",e) =>
     (v.expr is ["Union",:.] => v.expr; nil)
   nil
@@ -1624,7 +1624,7 @@ tryCourtesyCoercion(T,m) ==
     keyedSystemError("S2GE0016",['"coerce",
       '"function coerce called from the interpreter."])
   if $useRepresentationHack then
-    rplac(CADR T,MSUBST("$",$Rep,CADR T))
+    rplac(second T,MSUBST("$",$Rep,second T))
   T':= coerceEasy(T,m) => T'
   T':= coerceSubset(T,m) => T'
   T':= coerceHard(T,m) => T'
@@ -2427,7 +2427,7 @@ compIterator(it,e) ==
           stackMessage('"final value of index: %1b must be an integer",[final])
       optFinal:= [final]
     indexmode:=
-      comp(CADDR it,$NonNegativeInteger,e) => $NonNegativeInteger
+      comp(third it,$NonNegativeInteger,e) => $NonNegativeInteger
       $Integer
     if null get(index,"mode",e) then [.,.,e]:=
       compMakeDeclaration(index,indexmode,e) or return nil