* 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/wi2.boot b/src/interp/wi2.boot
index 6e18448c..f11f6b4f 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -108,7 +108,7 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
     $uncondAlist: local := nil
 -->>-- next global initialized here, reset by buildFunctor
     $NRTslot1PredicateList: local :=
-      REMDUP [CADR x for x in attributeList]
+      REMDUP [second x for x in attributeList]
 -->>-- next global initialized here, used by NRTgenAttributeAlist (NRUNOPT)
     $NRTattributeAlist: local := NRTgenInitialAttributeAlist attributeList
     $NRTslot1Info: local := nil --set in NRTmakeSlot1Info
@@ -542,7 +542,7 @@ compFormWithModemap1(form,m,e,modemap,Rep2Dollar?) ==
         op = "elt" and f is ['XLAM,:.] and IDENTP(z:=CAR argl) and
           (c:=get(z,'condition,e)) and
             c is [["case",=z,c1]] and
-              (c1 is ['_:,=(CADR argl),=m] or EQ(c1,CADR argl) ) =>
+              (c1 is ['_:,=(second argl),=m] or EQ(c1,second argl) ) =>
 -- first is a full tag, as placed by getInverseEnvironment
 -- second is what getSuccessEnvironment will place there
                 ["CDR",z]
@@ -855,7 +855,7 @@ compIterator(it,e) ==
           stackMessage ["final value of index: ",final," must be an integer"]
       optFinal:= [final]
     indexmode:=
-      comp(CADDR it,$NonNegativeInteger,e) => $NonNegativeInteger
+      comp(third it,$NonNegativeInteger,e) => $NonNegativeInteger
       $Integer
 --  markImport ['Segment,indexmode]
     if null get(index,"mode",e) then [.,.,e]:=
@@ -937,10 +937,10 @@ compRepeatOrCollect(form,m,e) ==
           repeatOrCollect="COLLECT" =>
             targetMode = '$EmptyMode => '$EmptyMode
             (u:=modeIsAggregateOf('List,targetMode,e)) =>
-              CADR u
+              second u
             (u:=modeIsAggregateOf('Vector,targetMode,e)) =>
               repeatOrCollect:='COLLECTV
-              CADR u
+              second u
             stackMessage('"Invalid collect bodytype")
             return nil
             -- If we're doing a collect, and the type isn't conformable
@@ -1073,7 +1073,7 @@ doItSeq item ==
 doItDomain item ==
   -- convert naked top level domains to import
   u:= ["import", [first item,:rest item]]
-  markImport CADR u
+  markImport second u
   stackWarning ["Use: import ", [first item,:rest item]]
 --wiReplaceNode(item, u, 14)
   RPLACA(item, first u)
@@ -1134,7 +1134,7 @@ doItDef item ==
   chk(item,3)
   RPLACA(item,"CodeDefine")
         --Note that DescendCode, in CodeDefine, is looking for this
-  RPLACD(CADR item,[$signatureOfForm])
+  RPLACD(second item,[$signatureOfForm])
   chk(item,4)
       --This is how the signature is updated for buildFunctor to recognise
 --+