* 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, 5 insertions, 5 deletions

diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 61ccfd58..e3f17e52 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -366,7 +366,7 @@ dbGatherData(htPage,opAlist,which,key) ==
         nil
       newEntry :=
         u := assoc(entry,data) =>           --key seen before? look on DATA
-          RPLACA(CDR u,CADR u or exposeFlag)--yes, expose if any 1 is exposed
+          RPLACA(CDR u,second u or exposeFlag)--yes, expose if any 1 is exposed
           u
         data := [y := [entry,exposeFlag,:tail],:data]
         y                                   --no, create new entry in DATA
@@ -435,8 +435,8 @@ dbSelectData(htPage,opAlist,key) ==
 
 dbReduceOpAlist(opAlist,data,branch) ==
   branch = 'signatures => dbReduceBySignature(opAlist,CAAR data,CADAR data)
-  branch = 'origins => dbReduceBySelection(opAlist,CAR data,function CADDR)
-  branch = 'conditions => dbReduceBySelection(opAlist,CAR data,function CADR)
+  branch = 'origins => dbReduceBySelection(opAlist,CAR data,function third)
+  branch = 'conditions => dbReduceBySelection(opAlist,CAR data,function second)
   branch = 'implementation => dbReduceByOpSignature(opAlist,CDDR data)
   branch = 'parameters => dbReduceByForm(opAlist,CAR data)
   systemError ['"Unexpected branch: ",branch]
@@ -817,7 +817,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) ==
         --Case 1: Already expanded; just cons it onto ACC
           null STRINGP line => --already expanded
             if condition? then --this could have been expanded at a lower level
-              if null atom (pred := CADR line) then value := pred
+              if null atom (pred := second line) then value := pred
             acc := [line,:acc] --this one is already expanded; record it anyway
         --Case 2: unexpanded; expand it then cons it onto ACC
           [name,nargs,xflag,sigs,conname,pred,comments] := dbParts(line,7,1)
@@ -875,7 +875,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) ==
 getRegistry(op,sig) ==
   u := getConstructorDocumentationFromDB "AttributeRegistry"
   v := LASSOC(op,u)
-  match := or/[y for y in v | y is [['attribute,: =sig],:.]] => CADR match
+  match := or/[y for y in v | y is [['attribute,: =sig],:.]] => second match
   '""
 
 evalableConstructor2HtString domform ==