More algebra dependency layering.

2 files changed, 857 insertions, 541 deletions

diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index 3c0f0acd..966b1e50 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -415,6 +415,33 @@ strap-0/COMPLEX.$(FASLEXT): strap-0/COMPCAT.$(FASLEXT)
 strap-0/COMPCAT.$(FASLEXT): strap-0/COMRING.$(FASLEXT) 
 strap-0/MSET.$(FASLEXT): strap-0/MSETAGG.$(FASLEXT)
 strap-0/MSETAGG.$(FASLEXT): strap-0/MDAGG.$(FASLEXT)
+strap-0/AN.$(FASLEXT): strap-0/ACF.$(FASLEXT)
+strap-0/SEGBIND.$(FASLEXT): strap-0/RNGBIND.$(FASLEXT) \
+	strap-0/SEG.$(FASLEXT)
+strap-0/EXPR.$(FASLEXT): strap-0/FS.$(FASLEXT) \
+	strap-0/ACFS.$(FASLEXT) strap-0/COMBOPC.$(FASLEXT) \
+	strap-0/LFCAT.$(FASLEXT) strap-0/SPFCAT.$(FASLEXT)
+strap-0/ACFS.$(FASLEXT): strap-0/ACF.$(FASLEXT)
+strap-0/IFAMON.$(FASLEXT): strap-0/FAMONC.$(FASLEXT)
+strap-0/HDP.$(FASLEXT): strap-0/DIRPCAT.$(FASLEXT)
+strap-0/DMP.$(FASLEXT): strap-0/GDMP.$(FASLEXT)
+strap-0/LFCAT.$(FASLEXT): strap-0/PRIMCAT.$(FASLEXT)
+strap-0/INTRVL.$(FASLEXT): strap-0/INTCAT.$(FASLEXT)
+strap-0/FS2UPS.$(FASLEXT): strap-0/UPSCAT.$(FASLEXT) \
+	strap-0/PTRANFN.$(FASLEXT)
+strap-0/UPSCAT.$(FASLEXT): strap-0/PSCAT.$(FASLEXT)
+strap-0/UPXS.$(FASLEXT): strap-0/UPXSCAT.$(FASLEXT) strap-0/UPXSCCA.$(FASLEXT)
+strap-0/EFUPXS.$(FASLEXT): strap-0/ULSCAT.$(FASLEXT)
+strap-0/ULS.$(FASLEXT): strap-0/ULSCCAT.$(FASLEXT)
+strap-0/EFULS.$(FASLEXT): strap-0/UTSCAT.$(FASLEXT)
+strap-0/POINT.$(FASLEXT): strap-0/PTCAT.$(FASLEXT)
+strap-0/SPACE3.$(FASLEXT): strap-0/SPACEC.$(FASLEXT)
+strap-0/LODO.$(FASLEXT): strap-0/LODOCAT.$(FASLEXT)
+strap-0/LODOCAT.$(FASLEXT): strap-0/OREPCAT.$(FASLEXT)
+strap-0/SASTCAT.$(FASLEXT): strap-0/ASTCAT.$(FASLEXT)
+strap-0/ASTCAT.$(FASLEXT): strap-0/HOMOTOP.$(FASLEXT)
+strap-0/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT)
+strap-0/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT)
 
 # Bootstrap stage 1 dependencies.
 # At this stage, we attempt to compile domains essential for completing
@@ -1013,6 +1040,91 @@ strap-1/COMPCAT.$(FASLEXT): strap-0/CINTSLPE.$(FASLEXT) \
 strap-1/MONOGEN.$(FASLEXT): strap-0/CPIMA.$(FASLEXT)
 strap-1/ALIST.$(FASLEXT): strap-1/ALAGG.$(FASLEXT)
 
+strap-1/MPRFF.$(FASLEXT): strap-0/MFINFACT.$(FASLEXT)
+strap-1/INNMFACT.$(FASLEXT): strap-0/LEADCDET.$(FASLEXT) \
+	strap-0/AN.$(FASLEXT)
+strap-1/GENUFACT.$(FASLEXT): strap-0/OUT.$(FASLEXT) \
+	strap-0/RATFACT.$(FASLEXT) strap-0/COMPFACT.$(FASLEXT) \
+	strap-0/ALGFACT.$(FASLEXT) strap-0/UP.$(FASLEXT) \
+	strap-0/SAEFACT.$(FASLEXT) strap-0/SAERFFC.$(FASLEXT)
+strap-1/EMR.$(FASLEXT): strap-0/MODRING.$(FASLEXT)
+strap-1/MFINFACT.$(FASLEXT): strap-0/MPC2.$(FASLEXT)
+strap-1/ACF.$(FASLEXT): strap-0/NTPOLFN.$(FASLEXT) strap-0/PDECOMP.$(FASLEXT)
+strap-1/FS.$(FASLEXT): strap-0/MKUCFUNC.$(FASLEXT) strap-1/ES.$(FASLEXT) \
+	strap-0/LIST2MAP.$(FASLEXT) strap-0/INFORM1.$(FASLEXT) \
+	strap-0/POLYCATQ.$(FASLEXT)
+strap-1/LF.$(FASLEXT): strap-0/SEGBIND.$(FASLEXT)
+strap-1/LFCAT.$(FASLEXT): strap-1/PRIMCAT.$(FASLEXT)
+strap-1/ALGMANIP.$(FASLEXT): strap-1/POLYROOT.$(FASLEXT) \
+	strap-1/POLYCATQ.$(FASLEXT) strap-1/FS.$(FASLEXT)
+strap-1/POLYROOT.$(FASLEXT): strap-0/FACTFUNC.$(FASLEXT)
+strap-1/AN.$(FASLEXT): strap-1/IAN.$(FASLEXT)
+strap-1/IAN.$(FASLEXT): strap-0/EXPR.$(FASLEXT) strap-0/EXPR2.$(FASLEXT)
+strap-1/EXPR2.$(FASLEXT): strap-0/FS2.$(FASLEXT) strap-0/ES2.$(FASLEXT)
+strap-1/MKUCFUNC.$(FASLEXT): strap-0/MKFUNC.$(FASLEXT)
+strap-1/FAGROUP.$(FASLEXT): strap-1/FAMONC.$(FASLEXT) \
+	strap-0/IFAMON.$(FASLEXT)
+strap-1/CMPLXRT.$(FASLEXT): strap-0/INFSP.$(FASLEXT)
+strap-1/POLTOPOL.$(FASLEXT): strap-1/OVAR.$(FASLEXT) \
+	strap-1/HDMP.$(FASLEXT) strap-0/MPC3.$(FASLEXT) \
+	strap-0/DMP.$(FASLEXT) strap-0/DIRPROD.$(FASLEXT)
+strap-1/HDMP.$(FASLEXT): strap-1/GDMP.$(FASLEXT) strap-0/HDP.$(FASLEXT)
+strap-1/GDMP.$(FASLEXT): strap-1/DIRPCAT.$(FASLEXT)
+strap-1/GROEBSOL.$(FASLEXT): strap-0/GB.$(FASLEXT) \
+	strap-1/GBINTERN.$(FASLEXT) strap-1/LGROBP.$(FASLEXT) \
+	strap-1/GENMFACT.$(FASLEXT)
+strap-1/GENMFACT.$(FASLEXT): strap-0/MPCPF.$(FASLEXT)
+strap-1/COMBF.$(FASLEXT): strap-0/SEGBIND.$(FASLEXT)
+strap-1/ACFS.$(FASLEXT): strap-1/ACF.$(FASLEXT)
+strap-1/MPCPF.$(FASLEXT): strap-1/PUSHVAR.$(FASLEXT) \
+	strap-0/GENMFACT.$(FASLEXT)
+strap-1/SIGNEF.$(FASLEXT): strap-0/TOOLSIGN.$(FASLEXT) \
+	strap-0/SIGNRF.$(FASLEXT) strap-0/LIMITPS.$(FASLEXT) \
+	strap-0/TRIGMNIP.$(FASLEXT) strap-0/ORDCOMP.$(FASLEXT) \
+	strap-0/INTRVL.$(FASLEXT)
+strap-1/SIGNRF.$(FASLEXT): strap-0/INPSIGN.$(FASLEXT) \
+	strap-0/TOOLSIGN.$(FASLEXT) strap-0/ORDCOMP.$(FASLEXT)
+strap-1/LIMITPS.$(FASLEXT): strap-0/EFSTRUC.$(FASLEXT) \
+	strap-0/FS2UPS.$(FASLEXT) strap-0/UPXS.$(FASLEXT) \
+	strap-0/EFUPXS.$(FASLEXT) strap-0/ULS.$(FASLEXT) \
+	strap-0/EFULS.$(FASLEXT) strap-0/UTS.$(FASLEXT) \
+	strap-0/FS2EXPXP.$(FASLEXT) strap-0/EXPEXPAN.$(FASLEXT) \
+	strap-0/SIGNEF.$(FASLEXT)
+strap-1/TRIGMNIP.$(FASLEXT): strap-0/ITRIGMNP.$(FASLEXT)
+strap-1/ULS.$(FASLEXT): strap-0/VARIABLE.$(FASLEXT) \
+	strap-0/ULSCONS.$(FASLEXT)
+strap-1/UTS.$(FASLEXT): strap-1/ITAYLOR.$(FASLEXT) \
+	strap-0/FSINT.$(FASLEXT)
+strap-1/ITAYLOR.$(FASLEXT): strap-0/STTAYLOR.$(FASLEXT)
+strap-1/STTAYLOR.$(FASLEXT): strap-0/YSTREAM.$(FASLEXT)
+strap-1/FSINT.$(FASLEXT): strap-0/INTTOOLS.$(FASLEXT) \
+	strap-0/INTEF.$(FASLEXT) strap-0/IR2F.$(FASLEXT) \
+	strap-0/TRMANIP.$(FASLEXT) strap-0/IR2.$(FASLEXT) \
+	strap-0/FSCINT.$(FASLEXT) strap-0/IR.$(FASLEXT)
+strap-1/UP.$(FASLEXT): strap-0/VARIABLE.$(FASLEXT)
+strap-1/RULE.$(FASLEXT): strap-0/APPRULE.$(FASLEXT) \
+	strap-0/PMASSFS.$(FASLEXT)
+strap-1/PTPACK.$(FASLEXT): strap-0/POINT.$(FASLEXT)
+strap-1/PLOTTOOL.$(FASLEXT): strap-0/GRDEF.$(FASLEXT) \
+	strap-1/PLOT.$(FASLEXT) strap-1/CLIP.$(FASLEXT) \
+	strap-1/DROPT0.$(FASLEXT) strap-1/DROPT1.$(FASLEXT) \
+	strap-0/VIEW.$(FASLEXT)
+
+strap-1/DROPT0.$(FASLEXT): strap-1/DROPT1.$(FASLEXT)
+strap-1/DROPT1.$(FASLEXT): strap-1/DROPT.$(FASLEXT)
+strap-1/DROPT.$(FASLEXT): strap-0/SPACE3.$(FASLEXT)
+strap-1/ODEEF.$(FASLEXT): strap-0/NODE1.$(FASLEXT) \
+	strap-0/LODO.$(FASLEXT) strap-0/ODESYS.$(FASLEXT) \
+	strap-0/LODEEF.$(FASLEXT)
+strap-1/ASTCAT.$(FASLEXT): strap-0/SYNTAX.$(FASLEXT) \
+	strap-0/HOMOTOP.$(FASLEXT)
+strap-1/IMPTAST.$(FASLEXT): strap-0/TYPEAST.$(FASLEXT)
+strap-1/DEFAST.$(FASLEXT): strap-0/HEADAST.$(FASLEXT) \
+	strap-0/SPADAST.$(FASLEXT) strap-0/SIG.$(FASLEXT)
+strap-1/CATAST.$(FASLEXT): strap-0/CTORKIND.$(FASLEXT)
+strap-1/HEADAST.$(FASLEXT): strap-0/PARAMAST.$(FASLEXT)
+strap-1/ITFORM.$(FASLEXT): strap-0/IRFORM.$(FASLEXT)
+strap-1/LINBASIS.$(FASLEXT): strap-0/DBASIS.$(FASLEXT)
 
 # Bootstrap stage 2 dependencies.
 # At this stage we recompile everything from stage 1, including
@@ -1422,6 +1534,163 @@ strap-2/DFSFUN.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) \
 
 strap-2/POLY.$(FASLEXT): strap-2/UDPO.$(FASLEXT)
 
+strap-2/MULTFACT.$(FASLEXT): strap-1/MRATFAC.$(FASLEXT) \
+	strap-1/MPRFF.$(FASLEXT) strap-1/INNMFACT.$(FASLEXT) \
+	strap-1/GENUFACT.$(FASLEXT)
+
+strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT)
+
+strap-2/COMPCAT.$(FASLEXT): strap-1/CINTSLPE.$(FASLEXT) \
+	strap-1/COMPLPAT.$(FASLEXT) strap-1/CPMATCH.$(FASLEXT)
+strap-2/GENEEZ.$(FASLEXT): strap-1/EMR.$(FASLEXT)
+strap-2/MPRFF.$(FASLEXT): strap-1/MFINFACT.$(FASLEXT)
+strap-2/ACFS.$(FASLEXT): strap-2/ACF.$(FASLEXT) strap-1/FS.$(FASLEXT)
+strap-2/ACF.$(FASLEXT): strap-2/NTPOLFN.$(FASLEXT) \
+	strap-2/PDECOMP.$(FASLEXT)
+strap-2/NTPOLFN.$(FASLEXT): strap-2/PNTHEORY.$(FASLEXT)
+strap-2/PNTHEORY.$(FASLEXT): strap-1/INTHEORY.$(FASLEXT)
+strap-2/EXPR.$(FASLEXT): strap-1/COMBOPC.$(FASLEXT) \
+	strap-1/LFCAT.$(FASLEXT) strap-1/SPFCAT.$(FASLEXT) \
+	strap-1/KERNEL2.$(FASLEXT) strap-1/ALGMANIP.$(FASLEXT) \
+	strap-1/AF.$(FASLEXT) strap-1/EF.$(FASLEXT) \
+	strap-1/FSPECF.$(FASLEXT) strap-1/COMBF.$(FASLEXT) \
+	strap-1/SEGBIND.$(FASLEXT) strap-1/POLYCATQ.$(FASLEXT) \
+	strap-1/SUPFRACF.$(FASLEXT) strap-1/AN.$(FASLEXT) \
+	strap-1/EXPR2.$(FASLEXT) strap-1/ES2.$(FASLEXT) \
+	strap-1/MKUCFUNC.$(FASLEXT) strap-2/PMFS.$(FASLEXT) \
+	strap-1/LIST2MAP.$(FASLEXT) strap-1/FAGROUP.$(FASLEXT) \
+	strap-1/ACFS.$(FASLEXT) strap-1/LF.$(FASLEXT)
+strap-2/EXPR2.$(FASLEXT): strap-2/EXPR.$(FASLEXT) strap-1/FS2.$(FASLEXT)
+strap-2/PMFS.$(FASLEXT): strap-2/PMKERNEL.$(FASLEXT)
+strap-2/INFSP.$(FASLEXT): strap-1/POLY2.$(FASLEXT) \
+	strap-1/CMPLXRT.$(FASLEXT) strap-1/REAL0.$(FASLEXT) \
+	strap-1/SUBRESP.$(FASLEXT) strap-1/POLTOPOL.$(FASLEXT) \
+	strap-1/DMP.$(FASLEXT) strap-1/DIRPROD.$(FASLEXT) \
+	strap-1/GROEBSOL.$(FASLEXT)
+
+strap-2/GENMFACT.$(FASLEXT): strap-1/MPCPF.$(FASLEXT)
+strap-2/TOOLSIGN.$(FASLEXT): strap-1/SIGNEF.$(FASLEXT)
+strap-2/SIGNEF.$(FASLEXT): strap-1/SIGNRF.$(FASLEXT) \
+	strap-1/LIMITPS.$(FASLEXT) strap-1/TRIGMNIP.$(FASLEXT) \
+	strap-1/ORDCOMP.$(FASLEXT) strap-2/INTRVL.$(FASLEXT) \
+	strap-1/TOOLSIGN.$(FASLEXT)
+strap-2/INTRVL.$(FASLEXT): strap-2/INTCAT.$(FASLEXT)
+strap-2/UPXS.$(FASLEXT): strap-2/UPXSCCA.$(FASLEXT) \
+	strap-1/ULS.$(FASLEXT) strap-1/ULSCCAT.$(FASLEXT) \
+	strap-1/VARIABLE.$(FASLEXT) strap-1/UTS.$(FASLEXT) \
+	strap-1/UPXSCONS.$(FASLEXT)
+strap-2/UPXSCCA.$(FASLEXT): strap-2/UPXSCAT.$(FASLEXT)
+strap-2/UPXSCAT.$(FASLEXT): strap-2/UPSCAT.$(FASLEXT) \
+	strap-2/ULSCAT.$(FASLEXT)
+strap-2/UPSCAT.$(FASLEXT): strap-2/PSCAT.$(FASLEXT)
+strap-2/UTS.$(FASLEXT): strap-2/UTSCAT.$(FASLEXT) \
+	strap-1/VARIABLE.$(FASLEXT) strap-1/ITAYLOR.$(FASLEXT)
+strap-2/UTSCAT.$(FASLEXT): strap-1/STTAYLOR.$(FASLEXT) \
+	strap-1/STTF.$(FASLEXT) strap-1/STTFNC.$(FASLEXT) \
+	strap-1/UP.$(FASLEXT) strap-1/FSINT.$(FASLEXT) \
+	strap-1/UPSCAT.$(FASLEXT) strap-1/PSCAT.$(FASLEXT)
+strap-2/APPRULE.$(FASLEXT): strap-1/RULE.$(FASLEXT)
+strap-2/PLOT.$(FASLEXT): strap-1/PPCURVE.$(FASLEXT) \
+	strap-1/PTPACK.$(FASLEXT) strap-1/POINT.$(FASLEXT)
+strap-2/GRIMAGE.$(FASLEXT): strap-1/COLOR.$(FASLEXT) \
+	strap-1/PALETTE.$(FASLEXT) \
+	strap-1/VIEWDEF.$(FASLEXT) \
+	strap-1/PLOTTOOL.$(FASLEXT) \
+	strap-1/COORDSYS.$(FASLEXT) \
+	strap-1/PTCAT.$(FASLEXT)
+strap-2/NODE1.$(FASLEXT): strap-1/ODEINT.$(FASLEXT) \
+	strap-1/ODEEF.$(FASLEXT)
+strap-2/SPADAST.$(FASLEXT): strap-2/SASTCAT.$(FASLEXT) \
+	strap-2/SPADXPT.$(FASLEXT) \
+	strap-2/TYPEAST.$(FASLEXT) \
+	strap-2/IMPTAST.$(FASLEXT) \
+	strap-2/DEFAST.$(FASLEXT) \
+	strap-2/MACROAST.$(FASLEXT) \
+	strap-2/WHEREAST.$(FASLEXT) \
+	strap-2/CATAST.$(FASLEXT) \
+	strap-2/JOINAST.$(FASLEXT) \
+	strap-2/CAPSLAST.$(FASLEXT) \
+	strap-2/SIGAST.$(FASLEXT) \
+	strap-2/ATTRAST.$(FASLEXT) \
+	strap-2/MAPPAST.$(FASLEXT) \
+	strap-2/IFAST.$(FASLEXT) \
+	strap-2/RPTAST.$(FASLEXT) \
+	strap-2/WHILEAST.$(FASLEXT) \
+	strap-2/INAST.$(FASLEXT) \
+	strap-2/STEPAST.$(FASLEXT) \
+	strap-2/CLLCTAST.$(FASLEXT) \
+	strap-2/LSTAST.$(FASLEXT) \
+	strap-2/EXITAST.$(FASLEXT) \
+	strap-2/RETAST.$(FASLEXT) \
+	strap-2/CRCEAST.$(FASLEXT) \
+	strap-2/PRTDAST.$(FASLEXT) \
+	strap-2/RSTRCAST.$(FASLEXT) \
+	strap-2/SEGAST.$(FASLEXT) \
+	strap-2/SEQAST.$(FASLEXT) \
+	strap-2/LETAST.$(FASLEXT) \
+	strap-2/SUCHTAST.$(FASLEXT) \
+	strap-2/COLONAST.$(FASLEXT) \
+	strap-2/ADDAST.$(FASLEXT) \
+	strap-2/CASEAST.$(FASLEXT) \
+	strap-2/HASAST.$(FASLEXT) \
+	strap-2/ISAST.$(FASLEXT) \
+	strap-2/CATAST.$(FASLEXT) \
+	strap-2/WHEREAST.$(FASLEXT) \
+	strap-2/COMMAAST.$(FASLEXT) \
+	strap-2/QQUTAST.$(FASLEXT) \
+	strap-2/MACROAST.$(FASLEXT)
+strap-2/DEFAST.$(FASLEXT): strap-1/HEADAST.$(FASLEXT) \
+	strap-1/SIG.$(FASLEXT)
+strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \
+	strap-0/SPADXPT.$(FASLEXT) \
+	strap-0/TYPEAST.$(FASLEXT) \
+	strap-0/IMPTAST.$(FASLEXT) \
+	strap-0/DEFAST.$(FASLEXT) \
+	strap-0/MACROAST.$(FASLEXT) \
+	strap-0/WHEREAST.$(FASLEXT) \
+	strap-0/CATAST.$(FASLEXT) \
+	strap-0/JOINAST.$(FASLEXT) \
+	strap-0/CAPSLAST.$(FASLEXT) \
+	strap-0/SIGAST.$(FASLEXT) \
+	strap-0/ATTRAST.$(FASLEXT) \
+	strap-0/MAPPAST.$(FASLEXT) \
+	strap-0/IFAST.$(FASLEXT) \
+	strap-0/RPTAST.$(FASLEXT) \
+	strap-0/WHILEAST.$(FASLEXT) \
+	strap-0/INAST.$(FASLEXT) \
+	strap-0/STEPAST.$(FASLEXT) \
+	strap-0/CLLCTAST.$(FASLEXT) \
+	strap-0/LSTAST.$(FASLEXT) \
+	strap-0/EXITAST.$(FASLEXT) \
+	strap-0/RETAST.$(FASLEXT) \
+	strap-0/CRCEAST.$(FASLEXT) \
+	strap-0/PRTDAST.$(FASLEXT) \
+	strap-0/RSTRCAST.$(FASLEXT) \
+	strap-0/SEGAST.$(FASLEXT) \
+	strap-0/SEQAST.$(FASLEXT) \
+	strap-0/LETAST.$(FASLEXT) \
+	strap-0/SUCHTAST.$(FASLEXT) \
+	strap-0/COLONAST.$(FASLEXT) \
+	strap-0/ADDAST.$(FASLEXT) \
+	strap-0/CASEAST.$(FASLEXT) \
+	strap-0/HASAST.$(FASLEXT) \
+	strap-0/ISAST.$(FASLEXT) \
+	strap-0/CATAST.$(FASLEXT) \
+	strap-0/WHEREAST.$(FASLEXT) \
+	strap-0/COMMAAST.$(FASLEXT) \
+	strap-0/QQUTAST.$(FASLEXT) \
+	strap-0/MACROAST.$(FASLEXT)
+
+strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT)
+strap-2/SASTCAT.$(FASLEXT): strap-2/HOMOTOP.$(FASLEXT) \
+	strap-1/ASTCAT.$(FASLEXT) strap-1/SYNTAX.$(FASLEXT)
+
+strap-2/CATAST.$(FASLEXT): strap-1/CTORKIND.$(FASLEXT)
+strap-2/TYPEAST.$(FASLEXT): strap-1/SPADAST.$(FASLEXT)
+strap-2/IRFORM.$(FASLEXT): strap-1/ITFORM.$(FASLEXT)
+strap-2/LINELT.$(FASLEXT): strap-1/LINBASIS.$(FASLEXT)
+
+
 
 #
 #
@@ -2012,16 +2281,10 @@ $(OUT)/FLAGG.$(FASLEXT): strap-2/FLASORT.$(FASLEXT)
 
 oa_algebra_layer_2 = \
   SYNTAX   INTRET   SEGXCAT CONTOUR  LIST3   MKUCFUNC \
-  FNCAT    SCACHE   SET     IFARRAY  FARRAY  SIG \
+  FNCAT    SCACHE   IFARRAY  FARRAY  SET     SIG \
   FUNDESC  DOMTMPLT MKBCFUNC RNGBIND SEG     OVERSET \
   CTORCAT  CTORCAT- CTOR
 
-$(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)
-$(OUT)/DOMTMPLT.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) $(OUT)/OAMONS.$(FASLEXT)
-$(OUT)/SET.$(FASLEXT): $(OUT)/FARRAY.$(FASLEXT)
-$(OUT)/FARRAY.$(FASLEXT): $(OUT)/IFARRAY.$(FASLEXT)
-
 oa_algebra_layer_2_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_2))
 
@@ -2033,12 +2296,6 @@ oa_algebra_layer_3 = \
    MAPPKG2   MAPPKG3  INTBIT   MONAD    MONAD-   SEG2    \
    BOP	     BOP1    COMMONOP CATCTOR  CTORCALL
 
-
-$(OUT)/MONAD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/SCOPE.$(FASLEXT): $(OUT)/BINDING.$(FASLEXT)
-$(OUT)/COMMONOP.$(FASLEXT): $(OUT)/BOP.$(FASLEXT)
-$(OUT)/FCTRDATA.$(FASLEXT): $(OUT)/DOMTMPLT.$(FASLEXT)
-
 oa_algebra_layer_3_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_3))
 
@@ -2046,11 +2303,6 @@ oa_algebra_layer_3_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_3)))
 
-$(OUT)/ENV.$(FASLEXT): $(OUT)/SCOPE.$(FASLEXT)
-$(OUT)/COMM.$(FASLEXT): $(OUT)/OSI.$(FASLEXT)
-$(OUT)/PALETTE.$(FASLEXT): $(OUT)/COLOR.$(FASLEXT)
-
-
 oa_algebra_layer_4 = \
   ANON     OSI      COMM     COMPPROP   SEGBIND2 \
   FAMONC   IDPC              NONE       FCTRDATA \
@@ -2069,10 +2321,6 @@ oa_algebra_layer_4_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_4)))
 
-$(OUT)/KERNEL.$(FASLEXT): $(OUT)/KERNEL2.$(FASLEXT)
-$(OUT)/DVARCAT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
-$(OUT)/IDPAM.$(FASLEXT): $(OUT)/IDPO.$(FASLEXT)
-
 oa_algebra_layer_5 = \
   CARD     DVARCAT  DVARCAT- ELEMFUN  \
   ELEMFUN- FCOMP    IDPAM    IDPO     \
@@ -2129,7 +2377,8 @@ oa_algebra_layer_8 = \
   NAALG-   OP       UNISEG2  XALG     FST      RADIX \
   POLY     OFMONOID ARR2CAT  ARR2CAT- LINDEP   STACK    \
   PADICCT  MOEBIUS  PRTITION HDMP     MPC2     MPC3     DMP \
-  GBINTERN VARIABLE SMATCAT  SMATCAT- IMATLIN  IMATQF   MODMON   
+  GBINTERN VARIABLE SMATCAT  SMATCAT- IMATLIN  IMATQF   MODMON   \
+  FINRALG  FINRALG- CVMP    LIST2    FINAALG  FINAALG-  
 
 oa_algebra_layer_8_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_8))
@@ -2146,10 +2395,15 @@ $(OUT)/POLY.$(FASLEXT): strap-2/INDE.$(FASLEXT)
 oa_algebra_layer_9 = \
   DLP      EAB      IPADIC   MAGMA    QUEUE    MATLIN   \
   FAMONOID CONTFRAC WP       PERM     PERMGRP  DDFACT   \
-  FSERIES  FT       IDPAG    INFINITY LA       FS       FS-      \
+  FSERIES  FT       IDPAG    INFINITY LA       \
   OMLO     ORTHPOL  PRODUCT  POLTOPOL SQMATRIX \
   GB       RATRET   RADUTIL  UP       PINTERPA  \
-  XFALG    ZLINDEP  BBTREE   TABLEAU  MATSTOR  
+  XFALG    ZLINDEP  BBTREE   TABLEAU  MATSTOR  \
+  FRNAALG  FRNAALG- FRAMALG  FRAMALG- CPIMA    
+
+# FIXME: Investigate circularity
+$(OUT)/CPIMA.$(FASLEXT): strap-2/MONOGEN.$(FASLEXT) \
+	strap-2/UPOLYC2.$(FASLEXT)
 
 oa_algebra_layer_9_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_9))
@@ -2160,25 +2414,28 @@ oa_algebra_layer_9_objects = \
 
 
 oa_algebra_layer_10 = \
-  BPADIC   ANY      LWORD    FR \
+  BPADIC   ANY      LWORD    FR       \
   SEXOF    CRAPACK  DEQUEUE  DLIST    \
   FLASORT  PATRES \
   FM       FM1      FPC      FPC-     \
-  IROOT    LIECAT   LIECAT-  LIST2    LIST2MAP \
+  IROOT    LIECAT   LIECAT-  LIST2MAP \
   SEX      MODFIELD \
   MRING    MTHING   NCNTFRAC NCODIV   \
   ODR      OREPCAT  OREPCAT- OWP      \
   PADIC    PATTERN2 \
   PBWLB    PENDTREE PGE      PGROEB   \
   PINTERP  PFR      PMDOWN   \
-  PMINS    PMTOOLS  ACF      ACF-    \
-  PSCAT    PSCAT-   QFORM    MTSCAT   \
+  PMINS    PMTOOLS  MONOGEN MONOGEN- EMR     \
+  PSCAT    PSCAT-   QFORM    MTSCAT   GHENSEL  \
   STTAYLOR TABLBUMP UPSCAT   UPSCAT-  \
-  UDPO     UNISEG   VSPACE  OREPCTO   \
+  UDPO     UNISEG   VSPACE  OREPCTO   GENEEZ   \
   VSPACE-  XPOLYC   XPR      BTAGG    BTAGG-  \
-  RMATRIX  PTCAT    XDPOLY   XRPOLY   \
+  RMATRIX  PTCAT    XDPOLY   XRPOLY  CINTSLPE  \
   MATRIX  MATCAT   MATCAT-  IARRAY2  FFIELDC  FFIELDC-
 
+# FIXME: Investigate circularity
+$(OUT)/CINTSLPE.$(FASLEXT): strap-2/COMPCAT.$(FASLEXT)
+$(OUT)/GHENSEL.$(FASLEXT): strap-2/GENEEZ.$(FASLEXT)
 
 oa_algebra_layer_10_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_10))
@@ -2191,15 +2448,17 @@ oa_algebra_layer_11 = \
   APPLYORE ARRAY1   ARRAY12  ARRAY2   ONECOMP2          \
   ASTACK   COMBINAT POINT    UDVO     \
   CSTTOOLS MRF2     ITAYLOR   ORDCOMP2  \
-  FLALG    GALUTIL  HEAP              \
-  INTCAT   INTHEORY UTSCAT  UTSCAT-   \
+  FLALG    GALUTIL  HEAP    COMPLPAT  CPMATCH   \
+  INTCAT   INTHEORY COMPCAT  COMPCAT- \
   IRREDFFX LFCAT    LODOCAT  LODOCAT- \
-  ORESUP   OREUP    \
+  ORESUP   OREUP    QEQUAT   \
   PR       PREASSOC PRIMARR2 REDORDER \
-           SYMPOLY  ACFS    ACFS-    \
-  TS       TUPLE    \
-                    XEXPPKG  \
-  XF       XF-               XPOLY 
+  SYMPOLY  TUPLE    XEXPPKG  HB       IBITS \
+  XF       XF-               XPOLY    INFORM   INFORM1  
+
+# FIXME: Investigate circularity
+$(OUT)/COMPCAT.$(FASLEXT): strap-2/COMPLEX.$(FASLEXT)
+
 
 oa_algebra_layer_11_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_11))
@@ -2208,9 +2467,21 @@ oa_algebra_layer_11_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_11)))
 oa_algebra_layer_12 = \
-  ULSCAT   TUBE    BITS     DIRPROD2 UTS      UPXSCAT  \
-           LPOLY   LSMP    LSMP1   MATCAT2           TRIMAT  \
-                   SYSTEM  HOSTNAME PORTNUM
+  ULSCAT   TUBE     BITS     DIRPROD2 UPXSCAT  SETMN    POLYROOT \
+  STTF     LPOLY    LSMP     LSMP1    MATCAT2  TRIMAT   POLYCATQ \
+  STTFNC   SYSTEM   HOSTNAME PORTNUM  UPOLYC2  PFBRU    SGCF   \
+  OUT      PSEUDLIN BYTEBUF  COMPLEX  FS       FS-      ALGMANIP \
+  AF       EF       FSPECF   COMBF    LF      RATFACT   SUPFRACF         \
+  COMMUPC  IAN      AN       IALGFACT SAE     SAEFACT  ALGFACT  \
+  RFFACT  SAERFFC  
+
+## FIXME:
+$(OUT)/POLYCATQ.$(FASLEXT): strap-2/SUP2.$(FASLEXT)
+$(OUT)/IAN.$(FASLEXT): strap-2/EXPR.$(FASLEXT) strap-2/AN.$(FASLEXT) \
+	strap-2/EXPR2.$(FASLEXT)
+$(OUT)/AF.$(FASLEXT): strap-2/ACF.$(FASLEXT)
+$(OUT)/SUPFRACF.$(FASLEXT): strap-2/MULTFACT.$(FASLEXT)
+
 
 oa_algebra_layer_12_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_12))
@@ -2220,18 +2491,23 @@ oa_algebra_layer_12_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_12)))
 
 oa_algebra_layer_13 = \
-  ASSOCEQ  CARTEN   CLIF     CLIP     \
-  UPOLYC   UPOLYC-                    \
-  COORDSYS DBASE    DHMATRIX DIOSP    \
-                    FAXF     FAXF-    FFPOLY2  \
-  FNLA     GRAY     HB       IRSN     \
-  MHROWRED NUMODE   NUMQUAD  MESH     \
+  ASSOCEQ  CARTEN   UTSCAT  UTSCAT-   PNTHEORY NTPOLFN  \
+  UPOLYC   UPOLYC-  MRATFAC  NPCOEF   MLIFT    PDECOMP \
+  COORDSYS DBASE    DHMATRIX DIOSP    FACUTIL  EXPR     \
+  ACF      ACF-     FAXF     FAXF-    LEADCDET COMPFACT  \
+  FNLA     GRAY     IRSN     INNMFACT ACFS    ACFS-   \
+  MHROWRED NUMODE   NUMQUAD  GENUFACT MULTFACT   \
   ODESYS   ODETOOLS ORDFUNS  PERMAN   \
-  PSEUDLIN UPXSCCA  UPXSCCA- ULSCCAT  ULSCCAT- \
-  PTPACK   REP2     SETMN    PLOTTOOL          \
+  UPXSCCA  UPXSCCA- ULSCCAT  ULSCCAT- \
+  PTPACK   REP2     MSET              \
   SYMFUNC  VECTOR2  VECTOR   CHAR     XPBWPOLY \
   INBCON   INBCON-  OUTBCON  OUTBCON- LEXP    
 
+# FIXME: Investigate cyle.
+$(OUT)/MRATFAC.$(FASLEXT): strap-2/MULTFACT.$(FASLEXT)
+$(OUT)/MULTFACT.$(FASLEXT): strap-2/MPRFF.$(FASLEXT)
+$(OUT)/EXPR.$(FASLEXT): strap-2/ACFS.$(FASLEXT)
+
 oa_algebra_layer_13_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_13))
 
@@ -2240,59 +2516,53 @@ oa_algebra_layer_13_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_13)))
 
 oa_algebra_layer_14 = \
-  PLOT3D    \
-  BALFACT  BEZOUT   BINARY   BOUNDZRO \
-  BPADICRT BRILL    CDEN     CHVAR   OPQUERY   \
-  COMMUPC  CVMP     CYCLOTOM \
-  CYCLES   DECIMAL           DISPLAY   \
-  DPMO     DPOLCAT  DPOLCAT- EMR      EQ       ERROR    \
-  EVALCYC  FACUTIL  FF       FFCG     \
-  FFCGX    FFHOM    FFNB     FFNBX    \
-  FFPOLY   FFX      FFSLPE   FGLMICPK \
-  FILE     FINAALG  FINAALG- FINRALG  \
-  FINRALG-          FLOATRP  FNAME    FRAC     \
-  GENEEZ   GENMFACT GENPGCD  \
-  GALFACTU GALPOLYU GBEUCLID \
-  GBF      GHENSEL  GMODPOL  \
-  GOSPER   GRIMAGE  GROEBSOL \
-  HEXADEC  HEUGCD   IBPTOOLS \
-  IFF               ICARD    \
-  IDECOMP           \
-  INMODGCD INNMFACT INPSIGN  INTHERTR \
-  INTRAT   INTRF    INTSLPE  INTTR    \
-  ISUMP    LAUPOL   LEADCDET LGROBP   \
-  LIMITRF  LPEFRAC  \
-  LSPP     MCDEN    MDDFACT  \
-  MFINFACT MLIFT    \
-  MMAP     MONOTOOL MPCPF    \
-  MPOLY    MPRFF    \
-  MRATFAC  MULTSQFR NORMRETR NPCOEF   \
-  NSUP     NTPOLFN  ODP      ODEPRIM  \
-  ODEPRRIC                    \
-  PADICRAT PADICRC  PCOMP    PDECOMP  \
-  PF       PFBR     PFBRU    PFOTOOLS \
-  PFRPAC   PGCD     PLEQN    \
-  PMPLCAT  PMQFCAT  PNTHEORY POLUTIL  \
-  POLYCATQ POLYLIFT POLYROOT \
-  POLY2    POLY2UP  PRS      PSQFR    \
-  PUSHVAR  QALGSET  QFCAT2   \
-  RATFACT  RCFIELD  RCFIELD- RDETR    \
-  RDETRS   REAL0    REAL0Q   REALSOLV \
-  RESRING  RETSOL   RF       RFFACTOR \
-                    RRCC     RRCC-    \
-  SCPKG    SHDP     SHP      SIGNRF   \
-  SMITH             SMTS     SOLVEFOR \
-  SPLTREE  STINPROD STTFNC   SUBRESP  \
-  SUMRF    SUP      SUPFRACF TANEXP   \
-  TEX      TEXTFILE          \
-  TWOFACT  UNIFACT  UPCDEN   \
-  UPDECOMP UPDIVP   UPMP     UPOLYC2  \
-  UPSQFREE VIEWDEF  VIEW2D   \
-           WEIER    \
-  EQTBL    GSTBL            \
-           STBL     STRTBL\
-                    SYMS     SYMTAB \
-  IOBCON   
+  PLOT3D   CLIF     GALFACTU CDEN     UPCDEN   ICARD    BALFACT  \
+  BEZOUT   BINARY   BRILL    CHVAR    OPQUERY  CYCLOTOM FFP      \
+  IPF      PF       CYCLES   DECIMAL  DISPLAY  FFPOLY   FFX      \
+  NORMRETR TWOFACT  MFINFACT DPMO     DPOLCAT  DPOLCAT- EQ       \
+  ERROR    LGROBP   PUSHVAR  MPCPF    GENMFACT   \
+  EVALCYC  FF       FFF      FFCGP    FFCG     GROEBSOL \
+  FFCGX    FFPOLY2  FFHOM    INBFF    FFNBP   FFNB     FFNBX    \
+  FFSLPE   FGLMICPK REAL0    PRS      SUBRESP  \
+  FNAME    FILE     POLY2    CMPLXRT  INFSP    FLOATRP  FRAC     \
+  GENPGCD  GALPOLYU GBEUCLID GBF      GMODPOL  GOSPER   \
+  HEXADEC  MDDFACT  INMODGCD HEUGCD   IBPTOOLS IFF      IDEAL     \
+  IDECOMP  INPSIGN  MONOTOOL INTHERTR IR       LAUPOL   INTTR    \
+  RDETR    INTRAT   IR2      INTRF    INTSLPE  TANEXP   INTTOOLS \
+  EFSTRUC  FS2UPS   EFUPXS   BOUNDZRO ODEPRIM  \
+  DSMP     LODOOPS   LODO    LODO1     LODO2   UTSODE   UTSODETL \
+  ODERAT   INTG0    FFCAT    FFCAT-   IBATOOL  FFINTBAS RADFF   \
+  FDIVCAT  FDIVCAT- FRIDEAL  HELLFDIV FRMOD    FDIV     DBLRESP  \
+  PFOTOOLS FSRED    MMAP     ALGFF    FORDER   FFCAT2   FRIDEAL2 \
+  FDIV2    RDIV     PFO      INTHERAL FSUPFACT INTALG   INTAF    \
+  ODERED   ODEPAL   INTPAF   PRIMELT  FSPRMELT RDEEF    SMITH    \
+  RDETRS   RDEEFS   PMASSFS  FS2      ITRIGMNP TRIGMNIP \
+  PMPREDFS INTPM    INTEF    IR2F     RULE     APPRULE  TRMANIP  \
+  FSCINT   FSINT    UTS      EFULS    ULSCONS  ULS      EXPUPXS  \
+  UPXSSING EXPEXPAN FS2EXPXP LIMITPS  \
+  ISUMP    SIGNRF   SIGNEF   TOOLSIGN LIMITRF  LPEFRAC  \
+  LSPP     MCDEN    MPOLY    MPRFF    MULTSQFR \
+  NSUP     ODP      ODEPRRIC PADICRC  PADICRAT \
+  PCOMP    PFBR     PFRPAC   PGCD     PLEQN    \
+  PMPLCAT  PMQFCAT  POLUTIL  POLYLIFT POLY2UP  PSQFR    \
+  QALGSET  QFCAT2   RCFIELD  RCFIELD- REAL0Q   REALSOLV \
+  RESRING  SYSSOLP  RETSOL   RF       RFFACTOR RRCC     RRCC-    \
+  SCPKG    SHDP     SHP      SMTS     SOLVEFOR SPLTREE  STINPROD \
+  SUMRF    UPMP     SUP      TEX      TEXTFILE UNIFACT  \
+  UPDIVP   UPDECOMP UPSQFREE VIEWDEF  \
+  TS       WEIER    EQTBL    GSTBL    STBL     STRTBL\
+  DOMCTOR  DOMAIN   SYMTAB   SYMS     IOBCON   
+
+# FIXME:
+$(OUT)/CMPLXRT.$(FASLEXT): strap-2/INFSP.$(FASLEXT)
+$(OUT)/MPCPF.$(FASLEXT): strap-2/GENMFACT.$(FASLEXT)
+$(OUT)/SIGNEF.$(FASLEXT): strap-2/TOOLSIGN.$(FASLEXT)
+$(OUT)/FS2UPS.$(FASLEXT): strap-2/SIGNEF.$(FASLEXT)
+$(OUT)/LIMITPS.$(FASLEXT): strap-2/UPXS.$(FASLEXT) \
+	strap-2/TOOLSIGN.$(FASLEXT)
+$(OUT)/ODERAT.$(FASLEXT): strap-2/UTS.$(FASLEXT)
+$(OUT)/RULE.$(FASLEXT): strap-2/APPRULE.$(FASLEXT)
+$(OUT)/EXPUPXS.$(FASLEXT): strap-2/UPXS.$(FASLEXT)
 
 
 oa_algebra_layer_14_nrlibs = \
@@ -2304,11 +2574,15 @@ oa_algebra_layer_14_objects = \
 
 
 oa_algebra_layer_15 = \
-  DSMP     EXPUPXS  UPXS     UPXSCONS TEX1     SUP2     \
-  FRAMALG  FRAMALG- ODPOL    NSUP2    UP2      VIEW     \
-  PLOT     RMCAT2   ROIRC    SDPOL   FRAC2    \
-  ULS      ULSCONS  TUBETOOL JVMBCODE          BYTEBUF    \
-  GRDEF     
+  UPXSCONS UPXS     TEX1     SUP2     ODPOL    NSUP2    UP2  \
+  SUBSPACE SPACE3   DROPT    DROPT1   DROPT0   GRDEF    CLIP \
+  VIEW2D   VIEW     PLOTTOOL GRIMAGE  PLOT     RMCAT2   ROIRC \
+  SDPOL    FRAC2    TUBETOOL JVMBCODE MESH    
+
+#FIXME:
+$(OUT)/GRDEF.$(FASLEXT): strap-2/PLOT.$(FASLEXT)
+$(OUT)/VIEW.$(FASLEXT): strap-2/GRIMAGE.$(FASLEXT)
+$(OUT)/VIEW2D.$(FASLEXT): strap-2/GRIMAGE.$(FASLEXT)
 
 oa_algebra_layer_15_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_15))
@@ -2318,11 +2592,10 @@ oa_algebra_layer_15_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_15)))
 
 oa_algebra_layer_16 = \
-  DPMM     EFUPXS  FFINTBAS FRIDEAL  ULS2      IR2       \
-  FRIDEAL2 FRMOD   CARTEN2  COMPLEX2 DRAWHACK  \
-  IBATOOL  INTFACT DEGRED   PMPRED   UPXS2   NUMTUBE  \
-  MONOGEN MONOGEN- NFINTBAS PMASS    PADEPAC PLOT1 \
-  SPACE3   FFF     SUBSPACE PTFUNC2  DRAWCX  DRAWPT   
+  DPMM     UTS2    ULS2    CARTEN2  COMPLEX2 LMDICT      \
+  INTFACT DEGRED   PMPRED  UPXS2   NUMTUBE   \
+  NFINTBAS PMASS   PADE    PADEPAC  MKFLCFN PLOT1  \
+  PTFUNC2  VIEW3D  DRAWCX  DRAWPT   
 
 
 oa_algebra_layer_16_nrlibs = \
@@ -2333,11 +2606,10 @@ oa_algebra_layer_16_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_16)))
 
 oa_algebra_layer_17 = \
-  CCLASS  FSAGG2  GALFACT IALGFACT TOPSP    \
-  IBACHIN MMLFORM NORMMA  ODERED  OMSAGG    OPSIG    \
-  PRIMES  PWFFINTB DROPT   \
-  RDIST   SAE     SAEFACT SAERFFC  \
-  SGCF VIEW3D   RPOLCAT  RPOLCAT-
+  CCLASS  FSAGG2   GALFACT  TOPSP   BPADICRT  \
+  IBACHIN MMLFORM  NORMMA   OMSAGG    OPSIG    \
+  PRIMES  WFFINTBS PWFFINTB RDIST   RPOLCAT  RPOLCAT-
+
 
 oa_algebra_layer_17_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_17))
@@ -2347,7 +2619,7 @@ oa_algebra_layer_17_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_17)))
 
 oa_algebra_layer_18 = \
-  DROPT1   IPF     DOMCTOR  KAFILE  TBCMPPK PSETCAT  PSETCAT- 
+  KAFILE  IPRNTPK TBCMPPK PSETCAT  PSETCAT- 
 
 
 oa_algebra_layer_18_nrlibs = \
@@ -2358,30 +2630,12 @@ oa_algebra_layer_18_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_18)))
 
 oa_algebra_layer_19 = \
-  ACPLOT   ANTISYM           \
-                             COMPCAT \
-  COMPCAT- DRAW     DRAWCFUN \
-  DROPT0   EP       \
-  FFCAT    FFCAT-   FFCGP    FFNBP   \
-  FFP      FLOAT    FPARFRAC         \
-  FRNAALG  FRNAALG- EXPR             \
-           FUNCTION HACKPI  \
-  IDEAL    INFORM   INFORM1  IPRNTPK \
-  IR       ISUPS             LIB     \
-  LMDICT   LODOOPS           MKFLCFN \
-  MSET                         \
-  NREP     NUMFMT   OC       OC-     \
-           ODERAT                    \
-                    PATTERN  \
-  PMKERNEL PMSYM             PRIMELT \
-  QALGSET2 QEQUAT   RECLOS   REP1    \
-           QUATCAT  QUATCAT- RFFACT  \
-           ROMAN    \
-           RULECOLD \
-  SPECOUT           \
-                    SYSSOLP          \
-           WFFINTBS SPADPRSR \
-  PARSER            TSETCAT  TSETCAT-
+  ACPLOT   ANTISYM  DRAWCFUN DRAW    \
+  EP       FLOAT    FPARFRAC FUNCTION HACKPI  \
+  ISUPS    LIB      INEP    \
+  NREP     NUMFMT   OC       OC-      PATTERN  \
+  PMKERNEL PMSYM    QALGSET2 RECLOS   REP1     QUATCAT  QUATCAT- \
+  ROMAN    RULECOLD SPECOUT  SPADPRSR PARSER   TSETCAT  TSETCAT-
 
 oa_algebra_layer_19_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_19))
@@ -2391,35 +2645,16 @@ oa_algebra_layer_19_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_19)))
 
 oa_algebra_layer_20 = \
-  AF       ALGFACT  ALGFF    ALGMANIP ALGMFACT ALGPKG   \
-  ALGSC    AN       APPRULE  CINTSLPE COMPFACT COMPLEX  \
-  COMPLPAT CMPLXRT  CPMATCH  CRFP     \
-  CTRIGMNP \
-  DBLRESP  DERHAM   DFSFUN   DRAWCURV \
-  EF       EFSTRUC  \
-  ELFUTS   EXPEXPAN EXPRODE  \
-  EXPRTUBE EXPR2    FDIVCAT  \
-  FDIVCAT- FDIV2    FFCAT2   FLOATCP  \
-  FORDER   FSRED    FSUPFACT \
-  FRNAAF2  FSPECF   FS2      FS2UPS   \
-  GAUSSFAC GCNAALG  GENUFACT GENUPS   \
-  GTSET    GPOLSET  IAN      INEP     \
-  INFPROD0 INFSP    INPRODFF INPRODPF \
-  INTAF    INTALG   INTEF    INTG0    \
-  INTHERAL INTPAF   INTPM    INTTOOLS \
-  ITRIGMNP JORDAN   KOVACIC  LF       \
-  LIE      LODOF    LSQM              \
-  MULTFACT NCEP     \
-  NLINSOL  NSMP     NUMERIC  OCT      \
-  OCTCT2   ODEPAL   ODERTRIC PADE     \
-  PAN2EXPR          PFO      PFOQ     \
-  PICOERCE PMASSFS  PMFS     PMPREDFS \
-  PSETPK   QUAT     QUATCT2  RADFF    \
-  RDEEF    RDEEFS   RDIV     RSETCAT  \
-  RSETCAT- RULE     RULESET  SIMPAN   \
-  SOLVESER SUMFS    SUTS     \
-  TOOLSIGN TRIGMNIP TRMANIP  UPXSSING UTSODE   UTSODETL \
-  UTS2     WUTSET   
+  ALGMFACT ALGPKG   ALGSC    CRFP     CTRIGMNP \
+  DERHAM   DFSFUN   DRAWCURV ELFUTS   EXPRODE  \
+  EXPRTUBE EXPR2    FLOATCP  FRNAAF2    \
+  GAUSSFAC GCNAALG  GENUPS   GTSET    GPOLSET   \
+  INFPROD0 INPRODFF INPRODPF JORDAN    \
+  NLINSOL  ODERTRIC KOVACIC  LIE      LODOF    LSQM     \
+  NCEP     NSMP     NUMERIC  QUAT     OCT      \
+  OCTCT2   PAN2EXPR PFOQ     PICOERCE PMFS     \
+  PSETPK   QUATCT2  RSETCAT  RSETCAT- RULESET  SIMPAN  \
+  DRAWHACK SOLVESER SUMFS    SUTS     WUTSET   
 
 oa_algebra_layer_20_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_20))
@@ -2429,13 +2664,12 @@ oa_algebra_layer_20_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_20)))
 
 oa_algebra_layer_21 = \
-  DEFINTEF DFINTTLS DEFINTRF \
-  EFULS             EXPR2UPS \
-  FDIV     FSCINT   FSINT    FS2EXPXP \
-  GSERIES  HELLFDIV INVLAPLA IR2F     \
-  IRRF2F   LAPLACE  LIMITPS  LODEEF   \
-  NODE1    ODECONST ODEINT   REP      \
-  SOLVERAD SULS     SUPXS   
+  DFINTTLS DEFINTEF IRRF2F   DEFINTRF GSERIES EXPR2UPS  INVLAPLA \
+  LAPLACE  ODEINT   ODECONST LODEEF   ODEEF   NODE1      \
+  SOLVERAD REP      SULS     SUPXS   
+
+# FIXME:
+$(OUT)/ODEEF.$(FASLEXT): strap-2/NODE1.$(FASLEXT)
 
 oa_algebra_layer_21_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_21))
@@ -2444,12 +2678,9 @@ oa_algebra_layer_21_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_21)))
 oa_algebra_layer_22 = \
-           COMBF    FSPRMELT \
-  INBFF    LODO     LODO1    LODO2    \
-  NTSCAT   REGSET   RGCHAIN  RSETGCD  \
-  RSDCMPK  SFRTCAT  SIGNEF   SNTSCAT  \
-  SOLVETRA SRDCMPK  SREGSET  STTF     \
-           ZDSOLVE
+  NTSCAT   QCMPACK  RSETGCD  RSDCMPK  REGSET   RGCHAIN  \
+  SFRTCAT  SNTSCAT  SOLVETRA SFQCMPK  SFRGCD   SRDCMPK  \
+  SREGSET  NORMPK   LEXTRIPK IRURPK   ZDSOLVE
 
 oa_algebra_layer_22_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_22))
@@ -2459,9 +2690,7 @@ oa_algebra_layer_22_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_22)))
 
 oa_algebra_layer_23 = \
-  CPIMA    IRURPK   LAZM3PK  LEXTRIPK \
-  NORMPK   QCMPACK  RURPK    SFRGCD   \
-  SFQCMPK  INTRVL   ODEEF    DOMAIN   CATEGORY
+  LAZM3PK  RURPK    INTRVL     CATEGORY
 
 oa_algebra_layer_23_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_23))
@@ -2471,20 +2700,27 @@ oa_algebra_layer_23_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_23)))
 
 oa_algebra_layer_24 =  \
-	RINTERP	 ASTCAT   ASTCAT-  SASTCAT  HEADAST  \
+	RINTERP	 ASTCAT   ASTCAT-  SASTCAT  PARAMAST HEADAST  \
 	LITERAL           TYPEAST  IMPTAST  MAPPAST  ATTRAST  \
 	JOINAST  IFAST    RPTAST   WHILEAST INAST    CLLCTAST \
 	LSTAST   EXITAST  RETAST   SEGAST   PRTDAST  CRCEAST   \
-	LETAST   RDUCEAST COLONAST ADDAST   CAPSLAST \
+	LETAST   RDUCEAST COLONAST ADDAST   CAPSLAST SUCHTAST \
 	CASEAST  HASAST   ISAST    CATAST   WHEREAST COMMAAST \
-	QQUTAST  DEFAST   MACROAST SPADXPT  SPADAST  PARAMAST \
+	QQUTAST  DEFAST   MACROAST SPADXPT  SPADAST  SIGAST \
 	INBFILE  OUTBFILE IOBFILE  RGBCMDL  RGBCSPC  STEPAST  \
-        IP4ADDR  NETCLT   INETCLTS                   \
-	IRFORM   COMPILER MSYSCMD  PRINT   OUT      \
-	ITFORM   ELABOR   TALGOP   YDIAGRAM LINELT   DBASIS   \
-	LINFORM  LINBASIS JVMOP    JVMCFACC JVMFDACC JVMMDACC \
+        IP4ADDR  NETCLT   INETCLTS ITFORM   RSTRCAST SEQAST   \
+	IRFORM   ELABOR   COMPILER MSYSCMD  PRINT      \
+	TALGOP   YDIAGRAM LINFORM  LINBASIS DBASIS LINELT     \
+        JVMOP    JVMCFACC JVMFDACC JVMMDACC \
 	JVMCSTTG
 
+$(OUT)/TYPEAST.$(FASLEXT): strap-2/SPADAST.$(FASLEXT)
+$(OUT)/ITFORM.$(FASLEXT): strap-2/IRFORM.$(FASLEXT)
+$(OUT)/LINFORM.$(FASLEXT): strap-2/LINELT.$(FASLEXT) \
+	strap-2/DBASIS.$(FASLEXT)
+
+
+
 oa_algebra_layer_24_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_24))
 
@@ -2492,84 +2728,8 @@ oa_algebra_layer_24_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_24)))
 
-$(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
-$(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/HEADAST.$(FASLEXT): $(OUT)/PARAMAST.$(FASLEXT)
-$(OUT)/SPADXPT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
-$(OUT)/ATTRAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/TYPEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/IMPTAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/MAPPAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/SIGAST.$(FASLEXT): $(OUT)/SIG.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
-$(OUT)/JOINAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/IFAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RPTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/WHILEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/INAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/STEPAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) \
-		$(OUT)/IDENT.$(FASLEXT) $(OUT)/MAYBE.$(FASLEXT)
-$(OUT)/CLLCTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/LSTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/EXITAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RETAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SEGAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SEQAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/PRTDAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CRCEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT)
-$(OUT)/RSTRCAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/LETAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RDUCEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SUCHTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/COLONAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/ADDAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CAPSLAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CASEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/HASAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/ISAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CATAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/WHEREAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/COMMAAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/QQUTAST.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/DEFAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/MACROAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SPADAST.$(FASLEXT): $(OUT)/SIGAST.$(FASLEXT) \
-	$(OUT)/RSTRCAST.$(FASLEXT) $(OUT)/SEQAST.$(FASLEXT) \
-	$(OUT)/SUCHTAST.$(FASLEXT)
-
-$(OUT)/INBFILE.$(FASLEXT): $(OUT)/FNAME.$(FASLEXT) \
-	$(OUT)/INBCON.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/OUTBFILE.$(FASLEXT): $(OUT)/FNAME.$(FASLEXT) \
-	$(OUT)/OUTBCON.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/IOBFILE.$(FASLEXT): $(OUT)/INBFILE.$(FASLEXT) \
-	$(OUT)/OUTBFILE.$(FASLEXT)
-
-$(OUT)/CTOR.$(FASLEXT): $(OUT)/CTORKIND.$(FASLEXT) \
-	$(OUT)/IDENT.$(FASLEXT)
-
-$(OUT)/NETCLT.$(FASLEXT): $(OUT)/IOBCON.$(FASLEXT)
-$(OUT)/INETCLTS.$(FASLEXT): $(OUT)/NETCLT.$(FASLEXT)
-
-
-$(OUT)/IRFORM.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT)
-$(OUT)/COMPILER.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) $(OUT)/ENV.$(FASLEXT) \
-	$(OUT)/ELABOR.$(FASLEXT)
-$(OUT)/ITFORM.$(FASLEXT): $(OUT)/IRFORM.$(FASLEXT)
-$(OUT)/ELABOR.$(FASLEXT): $(OUT)/ITFORM.$(FASLEXT) $(OUT)/ENV.$(FASLEXT) \
-	$(OUT)/IRFORM.$(FASLEXT)
-
-
-$(OUT)/LINBASIS.$(FASLEXT): $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/OVAR.$(FASLEXT)
-$(OUT)/LINELT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/FM.$(FASLEXT) \
-	$(OUT)/LINBASIS.$(FASLEXT)
-$(OUT)/DBASIS.$(FASLEXT): $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/KVTFROM.$(FASLEXT)
-$(OUT)/LINFORM.$(FASLEXT): $(OUT)/DBASIS.$(FASLEXT) \
-	$(OUT)/VSPACE.$(FASLEXT) $(OUT)/LINELT.$(FASLEXT)
-
-$(OUT)/JVMOP.$(FASLEXT): $(OUT)/JVMBCODE.$(FASLEXT)
-$(OUT)/JVMCFACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
-$(OUT)/JVMFDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
-$(OUT)/JVMMDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
+
+
 
 
 .PHONY: all-algebra all-algstrap
@@ -2634,7 +2794,7 @@ $(INPUT)/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet
 
 $(DOC)/diagrams.tex: $(oa_src_docdir)/diagrams.tex
 	@cp -p $< $@
- 
+
 $(oa_algebra_layer_1_objects): 0-stamp
 $(oa_algebra_layer_2_objects): 1-stamp
 $(oa_algebra_layer_3_objects): 2-stamp
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 55b79c6d..fd9f582f 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -818,7 +818,7 @@ oa_algebra_layer_1_objects = \
 
 oa_algebra_layer_2 = \
   SYNTAX   INTRET   SEGXCAT CONTOUR  LIST3   MKUCFUNC \
-  FNCAT    SCACHE   SET     IFARRAY  FARRAY  SIG \
+  FNCAT    SCACHE   IFARRAY  FARRAY  SET     SIG \
   FUNDESC  DOMTMPLT MKBCFUNC RNGBIND SEG     OVERSET \
   CTORCAT  CTORCAT- CTOR
 
@@ -909,7 +909,8 @@ oa_algebra_layer_8 = \
   NAALG-   OP       UNISEG2  XALG     FST      RADIX \
   POLY     OFMONOID ARR2CAT  ARR2CAT- LINDEP   STACK    \
   PADICCT  MOEBIUS  PRTITION HDMP     MPC2     MPC3     DMP \
-  GBINTERN VARIABLE SMATCAT  SMATCAT- IMATLIN  IMATQF   MODMON   
+  GBINTERN VARIABLE SMATCAT  SMATCAT- IMATLIN  IMATQF   MODMON   \
+  FINRALG  FINRALG- CVMP    LIST2    FINAALG  FINAALG-  
 
 oa_algebra_layer_8_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_8))
@@ -921,10 +922,11 @@ oa_algebra_layer_8_objects = \
 oa_algebra_layer_9 = \
   DLP      EAB      IPADIC   MAGMA    QUEUE    MATLIN   \
   FAMONOID CONTFRAC WP       PERM     PERMGRP  DDFACT   \
-  FSERIES  FT       IDPAG    INFINITY LA       FS       FS-      \
+  FSERIES  FT       IDPAG    INFINITY LA       \
   OMLO     ORTHPOL  PRODUCT  POLTOPOL SQMATRIX \
   GB       RATRET   RADUTIL  UP       PINTERPA  \
-  XFALG    ZLINDEP  BBTREE   TABLEAU  MATSTOR  
+  XFALG    ZLINDEP  BBTREE   TABLEAU  MATSTOR  \
+  FRNAALG  FRNAALG- FRAMALG  FRAMALG- CPIMA    
 
 oa_algebra_layer_9_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_9))
@@ -934,23 +936,23 @@ oa_algebra_layer_9_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_9)))
 
 oa_algebra_layer_10 = \
-  BPADIC   ANY      LWORD    FR \
+  BPADIC   ANY      LWORD    FR       \
   SEXOF    CRAPACK  DEQUEUE  DLIST    \
   FLASORT  PATRES \
   FM       FM1      FPC      FPC-     \
-  IROOT    LIECAT   LIECAT-  LIST2    LIST2MAP \
+  IROOT    LIECAT   LIECAT-  LIST2MAP \
   SEX      MODFIELD \
   MRING    MTHING   NCNTFRAC NCODIV   \
   ODR      OREPCAT  OREPCAT- OWP      \
   PADIC    PATTERN2 \
   PBWLB    PENDTREE PGE      PGROEB   \
   PINTERP  PFR      PMDOWN   \
-  PMINS    PMTOOLS  ACF      ACF-    \
-  PSCAT    PSCAT-   QFORM    MTSCAT   \
+  PMINS    PMTOOLS  MONOGEN MONOGEN- EMR     \
+  PSCAT    PSCAT-   QFORM    MTSCAT   GHENSEL  \
   STTAYLOR TABLBUMP UPSCAT   UPSCAT-  \
-  UDPO     UNISEG   VSPACE  OREPCTO   \
+  UDPO     UNISEG   VSPACE  OREPCTO   GENEEZ   \
   VSPACE-  XPOLYC   XPR      BTAGG    BTAGG-  \
-  RMATRIX  PTCAT    XDPOLY   XRPOLY   \
+  RMATRIX  PTCAT    XDPOLY   XRPOLY  CINTSLPE  \
   MATRIX  MATCAT   MATCAT-  IARRAY2  FFIELDC  FFIELDC-
 
 oa_algebra_layer_10_nrlibs = \
@@ -964,15 +966,13 @@ oa_algebra_layer_11 = \
   APPLYORE ARRAY1   ARRAY12  ARRAY2   ONECOMP2          \
   ASTACK   COMBINAT POINT    UDVO     \
   CSTTOOLS MRF2     ITAYLOR   ORDCOMP2  \
-  FLALG    GALUTIL  HEAP              \
-  INTCAT   INTHEORY UTSCAT  UTSCAT-   \
+  FLALG    GALUTIL  HEAP    COMPLPAT  CPMATCH   \
+  INTCAT   INTHEORY COMPCAT  COMPCAT- \
   IRREDFFX LFCAT    LODOCAT  LODOCAT- \
-  ORESUP   OREUP    \
+  ORESUP   OREUP    QEQUAT   \
   PR       PREASSOC PRIMARR2 REDORDER \
-           SYMPOLY  ACFS    ACFS-    \
-  TS       TUPLE    \
-                    XEXPPKG  \
-  XF       XF-               XPOLY 
+  SYMPOLY  TUPLE    XEXPPKG  HB       IBITS \
+  XF       XF-               XPOLY    INFORM   INFORM1  
 
 oa_algebra_layer_11_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_11))
@@ -982,9 +982,13 @@ oa_algebra_layer_11_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_11)))
 
 oa_algebra_layer_12 = \
-  ULSCAT   TUBE    BITS     DIRPROD2 UTS      UPXSCAT  \
-           LPOLY   LSMP    LSMP1   MATCAT2           TRIMAT  \
-                   SYSTEM  HOSTNAME PORTNUM
+  ULSCAT   TUBE     BITS     DIRPROD2 UPXSCAT  SETMN    POLYROOT \
+  STTF     LPOLY    LSMP     LSMP1    MATCAT2  TRIMAT   POLYCATQ \
+  STTFNC   SYSTEM   HOSTNAME PORTNUM  UPOLYC2  PFBRU    SGCF   \
+  OUT      PSEUDLIN BYTEBUF  COMPLEX  FS       FS-      ALGMANIP \
+  AF       EF       FSPECF   COMBF    LF      RATFACT   SUPFRACF         \
+  COMMUPC  IAN      AN       IALGFACT SAE     SAEFACT  ALGFACT  \
+  RFFACT  SAERFFC  
 
 oa_algebra_layer_12_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_12))
@@ -994,15 +998,15 @@ oa_algebra_layer_12_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_12)))
 
 oa_algebra_layer_13 = \
-  ASSOCEQ  CARTEN   CLIF     CLIP     \
-  UPOLYC   UPOLYC-                    \
-  COORDSYS DBASE    DHMATRIX DIOSP    \
-                    FAXF     FAXF-    FFPOLY2  \
-  FNLA     GRAY     HB       IRSN     \
-  MHROWRED NUMODE   NUMQUAD  MESH     \
+  ASSOCEQ  CARTEN   UTSCAT  UTSCAT-   PNTHEORY NTPOLFN  \
+  UPOLYC   UPOLYC-  MRATFAC  NPCOEF   MLIFT    PDECOMP \
+  COORDSYS DBASE    DHMATRIX DIOSP    FACUTIL  EXPR     \
+  ACF      ACF-     FAXF     FAXF-    LEADCDET COMPFACT  \
+  FNLA     GRAY     IRSN     INNMFACT ACFS    ACFS-   \
+  MHROWRED NUMODE   NUMQUAD  GENUFACT MULTFACT   \
   ODESYS   ODETOOLS ORDFUNS  PERMAN   \
-  PSEUDLIN UPXSCCA  UPXSCCA- ULSCCAT  ULSCCAT- \
-  PTPACK   REP2     SETMN    PLOTTOOL          \
+  UPXSCCA  UPXSCCA- ULSCCAT  ULSCCAT- \
+  PTPACK   REP2     MSET              \
   SYMFUNC  VECTOR2  VECTOR   CHAR     XPBWPOLY \
   INBCON   INBCON-  OUTBCON  OUTBCON- LEXP    
 
@@ -1014,59 +1018,42 @@ oa_algebra_layer_13_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_13)))
 
 oa_algebra_layer_14 = \
-  PLOT3D    \
-  BALFACT  BEZOUT   BINARY   BOUNDZRO \
-  BPADICRT BRILL    CDEN     CHVAR   OPQUERY   \
-  COMMUPC  CVMP     CYCLOTOM \
-  CYCLES   DECIMAL           DISPLAY   \
-  DPMO     DPOLCAT  DPOLCAT- EMR      EQ       ERROR    \
-  EVALCYC  FACUTIL  FF       FFCG     \
-  FFCGX    FFHOM    FFNB     FFNBX    \
-  FFPOLY   FFX      FFSLPE   FGLMICPK \
-  FILE     FINAALG  FINAALG- FINRALG  \
-  FINRALG-          FLOATRP  FNAME    FRAC     \
-  GENEEZ   GENMFACT GENPGCD  \
-  GALFACTU GALPOLYU GBEUCLID \
-  GBF      GHENSEL  GMODPOL  \
-  GOSPER   GRIMAGE  GROEBSOL \
-  HEXADEC  HEUGCD   IBPTOOLS \
-  IFF               ICARD    \
-  IDECOMP           \
-  INMODGCD INNMFACT INPSIGN  INTHERTR \
-  INTRAT   INTRF    INTSLPE  INTTR    \
-  ISUMP    LAUPOL   LEADCDET LGROBP   \
-  LIMITRF  LPEFRAC  \
-  LSPP     MCDEN    MDDFACT  \
-  MFINFACT MLIFT    \
-  MMAP     MONOTOOL MPCPF    \
-  MPOLY    MPRFF    \
-  MRATFAC  MULTSQFR NORMRETR NPCOEF   \
-  NSUP     NTPOLFN  ODP      ODEPRIM  \
-  ODEPRRIC                    \
-  PADICRAT PADICRC  PCOMP    PDECOMP  \
-  PF       PFBR     PFBRU    PFOTOOLS \
-  PFRPAC   PGCD     PLEQN    \
-  PMPLCAT  PMQFCAT  PNTHEORY POLUTIL  \
-  POLYCATQ POLYLIFT POLYROOT \
-  POLY2    POLY2UP  PRS      PSQFR    \
-  PUSHVAR  QALGSET  QFCAT2   \
-  RATFACT  RCFIELD  RCFIELD- RDETR    \
-  RDETRS   REAL0    REAL0Q   REALSOLV \
-  RESRING  RETSOL   RF       RFFACTOR \
-                    RRCC     RRCC-    \
-  SCPKG    SHDP     SHP      SIGNRF   \
-  SMITH             SMTS     SOLVEFOR \
-  SPLTREE  STINPROD STTFNC   SUBRESP  \
-  SUMRF    SUP      SUPFRACF TANEXP   \
-  TEX      TEXTFILE          \
-  TWOFACT  UNIFACT  UPCDEN   \
-  UPDECOMP UPDIVP   UPMP     UPOLYC2  \
-  UPSQFREE VIEWDEF  VIEW2D   \
-           WEIER    \
-  EQTBL    GSTBL            \
-           STBL     STRTBL\
-                    SYMS     SYMTAB \
-  IOBCON   
+  PLOT3D   CLIF     GALFACTU CDEN     UPCDEN   ICARD    BALFACT  \
+  BEZOUT   BINARY   BRILL    CHVAR    OPQUERY  CYCLOTOM FFP      \
+  IPF      PF       CYCLES   DECIMAL  DISPLAY  FFPOLY   FFX      \
+  NORMRETR TWOFACT  MFINFACT DPMO     DPOLCAT  DPOLCAT- EQ       \
+  ERROR    LGROBP   PUSHVAR  MPCPF    GENMFACT   \
+  EVALCYC  FF       FFF      FFCGP    FFCG     GROEBSOL \
+  FFCGX    FFPOLY2  FFHOM    INBFF    FFNBP   FFNB     FFNBX    \
+  FFSLPE   FGLMICPK REAL0    PRS      SUBRESP  \
+  FNAME    FILE     POLY2    CMPLXRT  INFSP    FLOATRP  FRAC     \
+  GENPGCD  GALPOLYU GBEUCLID GBF      GMODPOL  GOSPER   \
+  HEXADEC  MDDFACT  INMODGCD HEUGCD   IBPTOOLS IFF      IDEAL     \
+  IDECOMP  INPSIGN  MONOTOOL INTHERTR IR       LAUPOL   INTTR    \
+  RDETR    INTRAT   IR2      INTRF    INTSLPE  TANEXP   INTTOOLS \
+  EFSTRUC  FS2UPS   EFUPXS   BOUNDZRO ODEPRIM  \
+  DSMP     LODOOPS   LODO    LODO1     LODO2   UTSODE   UTSODETL \
+  ODERAT   INTG0    FFCAT    FFCAT-   IBATOOL  FFINTBAS RADFF   \
+  FDIVCAT  FDIVCAT- FRIDEAL  HELLFDIV FRMOD    FDIV     DBLRESP  \
+  PFOTOOLS FSRED    MMAP     ALGFF    FORDER   FFCAT2   FRIDEAL2 \
+  FDIV2    RDIV     PFO      INTHERAL FSUPFACT INTALG   INTAF    \
+  ODERED   ODEPAL   INTPAF   PRIMELT  FSPRMELT RDEEF    SMITH    \
+  RDETRS   RDEEFS   PMASSFS  FS2      ITRIGMNP TRIGMNIP \
+  PMPREDFS INTPM    INTEF    IR2F     RULE     APPRULE  TRMANIP  \
+  FSCINT   FSINT    UTS      EFULS    ULSCONS  ULS      EXPUPXS  \
+  UPXSSING EXPEXPAN FS2EXPXP LIMITPS  \
+  ISUMP    SIGNRF   SIGNEF   TOOLSIGN LIMITRF  LPEFRAC  \
+  LSPP     MCDEN    MPOLY    MPRFF    MULTSQFR \
+  NSUP     ODP      ODEPRRIC PADICRC  PADICRAT \
+  PCOMP    PFBR     PFRPAC   PGCD     PLEQN    \
+  PMPLCAT  PMQFCAT  POLUTIL  POLYLIFT POLY2UP  PSQFR    \
+  QALGSET  QFCAT2   RCFIELD  RCFIELD- REAL0Q   REALSOLV \
+  RESRING  SYSSOLP  RETSOL   RF       RFFACTOR RRCC     RRCC-    \
+  SCPKG    SHDP     SHP      SMTS     SOLVEFOR SPLTREE  STINPROD \
+  SUMRF    UPMP     SUP      TEX      TEXTFILE UNIFACT  \
+  UPDIVP   UPDECOMP UPSQFREE VIEWDEF  \
+  TS       WEIER    EQTBL    GSTBL    STBL     STRTBL\
+  DOMCTOR  DOMAIN   SYMTAB   SYMS     IOBCON   
 
 oa_algebra_layer_14_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_14))
@@ -1076,11 +1063,10 @@ oa_algebra_layer_14_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_14)))
 
 oa_algebra_layer_15 = \
-  DSMP     EXPUPXS  UPXS     UPXSCONS TEX1     SUP2     \
-  FRAMALG  FRAMALG- ODPOL    NSUP2    UP2      VIEW     \
-  PLOT     RMCAT2   ROIRC    SDPOL   FRAC2    \
-  ULS      ULSCONS  TUBETOOL JVMBCODE          BYTEBUF    \
-  GRDEF     
+  UPXSCONS UPXS     TEX1     SUP2     ODPOL    NSUP2    UP2  \
+  SUBSPACE SPACE3   DROPT    DROPT1   DROPT0   GRDEF    CLIP \
+  VIEW2D   VIEW     PLOTTOOL GRIMAGE  PLOT     RMCAT2   ROIRC \
+  SDPOL    FRAC2    TUBETOOL JVMBCODE MESH    
 
 oa_algebra_layer_15_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_15))
@@ -1090,11 +1076,10 @@ oa_algebra_layer_15_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_15)))
 
 oa_algebra_layer_16 = \
-  DPMM     EFUPXS  FFINTBAS FRIDEAL  ULS2      IR2       \
-  FRIDEAL2 FRMOD   CARTEN2  COMPLEX2 DRAWHACK  \
-  IBATOOL  INTFACT DEGRED   PMPRED   UPXS2   NUMTUBE  \
-  MONOGEN MONOGEN- NFINTBAS PMASS    PADEPAC PLOT1 \
-  SPACE3   FFF     SUBSPACE PTFUNC2  DRAWCX  DRAWPT   
+  DPMM     UTS2    ULS2    CARTEN2  COMPLEX2 LMDICT      \
+  INTFACT DEGRED   PMPRED  UPXS2   NUMTUBE   \
+  NFINTBAS PMASS   PADE    PADEPAC  MKFLCFN PLOT1  \
+  PTFUNC2  VIEW3D  DRAWCX  DRAWPT   
 
 oa_algebra_layer_16_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_16))
@@ -1104,11 +1089,9 @@ oa_algebra_layer_16_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_16)))
 
 oa_algebra_layer_17 = \
-  CCLASS  FSAGG2  GALFACT IALGFACT TOPSP    \
-  IBACHIN MMLFORM NORMMA  ODERED  OMSAGG    OPSIG    \
-  PRIMES  PWFFINTB DROPT   \
-  RDIST   SAE     SAEFACT SAERFFC  \
-  SGCF VIEW3D   RPOLCAT  RPOLCAT-
+  CCLASS  FSAGG2   GALFACT  TOPSP   BPADICRT  \
+  IBACHIN MMLFORM  NORMMA   OMSAGG    OPSIG    \
+  PRIMES  WFFINTBS PWFFINTB RDIST   RPOLCAT  RPOLCAT-
 
 oa_algebra_layer_17_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_17))
@@ -1118,7 +1101,7 @@ oa_algebra_layer_17_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_17)))
 
 oa_algebra_layer_18 = \
-  DROPT1   IPF     DOMCTOR  KAFILE  TBCMPPK PSETCAT  PSETCAT- 
+  KAFILE  IPRNTPK TBCMPPK PSETCAT  PSETCAT- 
 
 oa_algebra_layer_18_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_18))
@@ -1128,30 +1111,12 @@ oa_algebra_layer_18_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_18)))
 
 oa_algebra_layer_19 = \
-  ACPLOT   ANTISYM           \
-                             COMPCAT \
-  COMPCAT- DRAW     DRAWCFUN \
-  DROPT0   EP       \
-  FFCAT    FFCAT-   FFCGP    FFNBP   \
-  FFP      FLOAT    FPARFRAC         \
-  FRNAALG  FRNAALG- EXPR             \
-           FUNCTION HACKPI  \
-  IDEAL    INFORM   INFORM1  IPRNTPK \
-  IR       ISUPS             LIB     \
-  LMDICT   LODOOPS           MKFLCFN \
-  MSET                         \
-  NREP     NUMFMT   OC       OC-     \
-           ODERAT                    \
-                    PATTERN  \
-  PMKERNEL PMSYM             PRIMELT \
-  QALGSET2 QEQUAT   RECLOS   REP1    \
-           QUATCAT  QUATCAT- RFFACT  \
-           ROMAN    \
-           RULECOLD \
-  SPECOUT           \
-                    SYSSOLP          \
-           WFFINTBS SPADPRSR \
-  PARSER            TSETCAT  TSETCAT-
+  ACPLOT   ANTISYM  DRAWCFUN DRAW    \
+  EP       FLOAT    FPARFRAC FUNCTION HACKPI  \
+  ISUPS    LIB      INEP    \
+  NREP     NUMFMT   OC       OC-      PATTERN  \
+  PMKERNEL PMSYM    QALGSET2 RECLOS   REP1     QUATCAT  QUATCAT- \
+  ROMAN    RULECOLD SPECOUT  SPADPRSR PARSER   TSETCAT  TSETCAT-
 
 oa_algebra_layer_19_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_19))
@@ -1161,35 +1126,16 @@ oa_algebra_layer_19_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_19)))
 
 oa_algebra_layer_20 = \
-  AF       ALGFACT  ALGFF    ALGMANIP ALGMFACT ALGPKG   \
-  ALGSC    AN       APPRULE  CINTSLPE COMPFACT COMPLEX  \
-  COMPLPAT CMPLXRT  CPMATCH  CRFP     \
-  CTRIGMNP \
-  DBLRESP  DERHAM   DFSFUN   DRAWCURV \
-  EF       EFSTRUC  \
-  ELFUTS   EXPEXPAN EXPRODE  \
-  EXPRTUBE EXPR2    FDIVCAT  \
-  FDIVCAT- FDIV2    FFCAT2   FLOATCP  \
-  FORDER   FSRED    FSUPFACT \
-  FRNAAF2  FSPECF   FS2      FS2UPS   \
-  GAUSSFAC GCNAALG  GENUFACT GENUPS   \
-  GTSET    GPOLSET  IAN      INEP     \
-  INFPROD0 INFSP    INPRODFF INPRODPF \
-  INTAF    INTALG   INTEF    INTG0    \
-  INTHERAL INTPAF   INTPM    INTTOOLS \
-  ITRIGMNP JORDAN   KOVACIC  LF       \
-  LIE      LODOF    LSQM              \
-  MULTFACT NCEP     \
-  NLINSOL  NSMP     NUMERIC  OCT      \
-  OCTCT2   ODEPAL   ODERTRIC PADE     \
-  PAN2EXPR          PFO      PFOQ     \
-  PICOERCE PMASSFS  PMFS     PMPREDFS \
-  PSETPK   QUAT     QUATCT2  RADFF    \
-  RDEEF    RDEEFS   RDIV     RSETCAT  \
-  RSETCAT- RULE     RULESET  SIMPAN   \
-  SOLVESER SUMFS    SUTS     \
-  TOOLSIGN TRIGMNIP TRMANIP  UPXSSING UTSODE   UTSODETL \
-  UTS2     WUTSET   
+  ALGMFACT ALGPKG   ALGSC    CRFP     CTRIGMNP \
+  DERHAM   DFSFUN   DRAWCURV ELFUTS   EXPRODE  \
+  EXPRTUBE EXPR2    FLOATCP  FRNAAF2    \
+  GAUSSFAC GCNAALG  GENUPS   GTSET    GPOLSET   \
+  INFPROD0 INPRODFF INPRODPF JORDAN    \
+  NLINSOL  ODERTRIC KOVACIC  LIE      LODOF    LSQM     \
+  NCEP     NSMP     NUMERIC  QUAT     OCT      \
+  OCTCT2   PAN2EXPR PFOQ     PICOERCE PMFS     \
+  PSETPK   QUATCT2  RSETCAT  RSETCAT- RULESET  SIMPAN  \
+  DRAWHACK SOLVESER SUMFS    SUTS     WUTSET   
 
 oa_algebra_layer_20_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_20))
@@ -1199,13 +1145,9 @@ oa_algebra_layer_20_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_20)))
 
 oa_algebra_layer_21 = \
-  DEFINTEF DFINTTLS DEFINTRF \
-  EFULS             EXPR2UPS \
-  FDIV     FSCINT   FSINT    FS2EXPXP \
-  GSERIES  HELLFDIV INVLAPLA IR2F     \
-  IRRF2F   LAPLACE  LIMITPS  LODEEF   \
-  NODE1    ODECONST ODEINT   REP      \
-  SOLVERAD SULS     SUPXS   
+  DFINTTLS DEFINTEF IRRF2F   DEFINTRF GSERIES EXPR2UPS  INVLAPLA \
+  LAPLACE  ODEINT   ODECONST LODEEF   ODEEF   NODE1      \
+  SOLVERAD REP      SULS     SUPXS   
 
 oa_algebra_layer_21_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_21))
@@ -1215,12 +1157,9 @@ oa_algebra_layer_21_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_21)))
 
 oa_algebra_layer_22 = \
-           COMBF    FSPRMELT \
-  INBFF    LODO     LODO1    LODO2    \
-  NTSCAT   REGSET   RGCHAIN  RSETGCD  \
-  RSDCMPK  SFRTCAT  SIGNEF   SNTSCAT  \
-  SOLVETRA SRDCMPK  SREGSET  STTF     \
-           ZDSOLVE
+  NTSCAT   QCMPACK  RSETGCD  RSDCMPK  REGSET   RGCHAIN  \
+  SFRTCAT  SNTSCAT  SOLVETRA SFQCMPK  SFRGCD   SRDCMPK  \
+  SREGSET  NORMPK   LEXTRIPK IRURPK   ZDSOLVE
 
 oa_algebra_layer_22_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_22))
@@ -1230,9 +1169,7 @@ oa_algebra_layer_22_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_22)))
 
 oa_algebra_layer_23 = \
-  CPIMA    IRURPK   LAZM3PK  LEXTRIPK \
-  NORMPK   QCMPACK  RURPK    SFRGCD   \
-  SFQCMPK  INTRVL   ODEEF    DOMAIN   CATEGORY
+  LAZM3PK  RURPK    INTRVL     CATEGORY
 
 oa_algebra_layer_23_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_23))
@@ -1242,18 +1179,18 @@ oa_algebra_layer_23_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_23)))
 
 oa_algebra_layer_24 = \
-	RINTERP	 ASTCAT   ASTCAT-  SASTCAT  HEADAST  \
+	RINTERP	 ASTCAT   ASTCAT-  SASTCAT  PARAMAST HEADAST  \
 	LITERAL           TYPEAST  IMPTAST  MAPPAST  ATTRAST  \
 	JOINAST  IFAST    RPTAST   WHILEAST INAST    CLLCTAST \
 	LSTAST   EXITAST  RETAST   SEGAST   PRTDAST  CRCEAST   \
-	LETAST   RDUCEAST COLONAST ADDAST   CAPSLAST \
+	LETAST   RDUCEAST COLONAST ADDAST   CAPSLAST SUCHTAST \
 	CASEAST  HASAST   ISAST    CATAST   WHEREAST COMMAAST \
-	QQUTAST  DEFAST   MACROAST SPADXPT  SPADAST  PARAMAST \
+	QQUTAST  DEFAST   MACROAST SPADXPT  SPADAST  SIGAST \
 	INBFILE  OUTBFILE IOBFILE  RGBCMDL  RGBCSPC  STEPAST  \
-        IP4ADDR  NETCLT   INETCLTS                   \
-	IRFORM   COMPILER MSYSCMD  PRINT   OUT      \
-	ITFORM   ELABOR   TALGOP   YDIAGRAM LINELT   DBASIS   \
-	LINFORM  LINBASIS JVMOP    JVMCFACC JVMFDACC JVMMDACC \
+        IP4ADDR  NETCLT   INETCLTS ITFORM   RSTRCAST SEQAST   \
+	IRFORM   ELABOR   COMPILER MSYSCMD  PRINT      \
+	TALGOP   YDIAGRAM LINFORM  LINBASIS DBASIS LINELT     \
+        JVMOP    JVMCFACC JVMFDACC JVMMDACC \
 	JVMCSTTG
 
 oa_algebra_layer_24_nrlibs = \
@@ -1980,6 +1917,33 @@ strap-0/COMPLEX.$(FASLEXT): strap-0/COMPCAT.$(FASLEXT)
 strap-0/COMPCAT.$(FASLEXT): strap-0/COMRING.$(FASLEXT) 
 strap-0/MSET.$(FASLEXT): strap-0/MSETAGG.$(FASLEXT)
 strap-0/MSETAGG.$(FASLEXT): strap-0/MDAGG.$(FASLEXT)
+strap-0/AN.$(FASLEXT): strap-0/ACF.$(FASLEXT)
+strap-0/SEGBIND.$(FASLEXT): strap-0/RNGBIND.$(FASLEXT) \
+	strap-0/SEG.$(FASLEXT)
+strap-0/EXPR.$(FASLEXT): strap-0/FS.$(FASLEXT) \
+	strap-0/ACFS.$(FASLEXT) strap-0/COMBOPC.$(FASLEXT) \
+	strap-0/LFCAT.$(FASLEXT) strap-0/SPFCAT.$(FASLEXT)
+strap-0/ACFS.$(FASLEXT): strap-0/ACF.$(FASLEXT)
+strap-0/IFAMON.$(FASLEXT): strap-0/FAMONC.$(FASLEXT)
+strap-0/HDP.$(FASLEXT): strap-0/DIRPCAT.$(FASLEXT)
+strap-0/DMP.$(FASLEXT): strap-0/GDMP.$(FASLEXT)
+strap-0/LFCAT.$(FASLEXT): strap-0/PRIMCAT.$(FASLEXT)
+strap-0/INTRVL.$(FASLEXT): strap-0/INTCAT.$(FASLEXT)
+strap-0/FS2UPS.$(FASLEXT): strap-0/UPSCAT.$(FASLEXT) \
+	strap-0/PTRANFN.$(FASLEXT)
+strap-0/UPSCAT.$(FASLEXT): strap-0/PSCAT.$(FASLEXT)
+strap-0/UPXS.$(FASLEXT): strap-0/UPXSCAT.$(FASLEXT) strap-0/UPXSCCA.$(FASLEXT)
+strap-0/EFUPXS.$(FASLEXT): strap-0/ULSCAT.$(FASLEXT)
+strap-0/ULS.$(FASLEXT): strap-0/ULSCCAT.$(FASLEXT)
+strap-0/EFULS.$(FASLEXT): strap-0/UTSCAT.$(FASLEXT)
+strap-0/POINT.$(FASLEXT): strap-0/PTCAT.$(FASLEXT)
+strap-0/SPACE3.$(FASLEXT): strap-0/SPACEC.$(FASLEXT)
+strap-0/LODO.$(FASLEXT): strap-0/LODOCAT.$(FASLEXT)
+strap-0/LODOCAT.$(FASLEXT): strap-0/OREPCAT.$(FASLEXT)
+strap-0/SASTCAT.$(FASLEXT): strap-0/ASTCAT.$(FASLEXT)
+strap-0/ASTCAT.$(FASLEXT): strap-0/HOMOTOP.$(FASLEXT)
+strap-0/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT)
+strap-0/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT)
 
 # Bootstrap stage 1 dependencies.
 # At this stage, we attempt to compile domains essential for completing
@@ -2578,6 +2542,92 @@ strap-1/COMPCAT.$(FASLEXT): strap-0/CINTSLPE.$(FASLEXT) \
 strap-1/MONOGEN.$(FASLEXT): strap-0/CPIMA.$(FASLEXT)
 strap-1/ALIST.$(FASLEXT): strap-1/ALAGG.$(FASLEXT)
 
+strap-1/MPRFF.$(FASLEXT): strap-0/MFINFACT.$(FASLEXT)
+strap-1/INNMFACT.$(FASLEXT): strap-0/LEADCDET.$(FASLEXT) \
+	strap-0/AN.$(FASLEXT)
+strap-1/GENUFACT.$(FASLEXT): strap-0/OUT.$(FASLEXT) \
+	strap-0/RATFACT.$(FASLEXT) strap-0/COMPFACT.$(FASLEXT) \
+	strap-0/ALGFACT.$(FASLEXT) strap-0/UP.$(FASLEXT) \
+	strap-0/SAEFACT.$(FASLEXT) strap-0/SAERFFC.$(FASLEXT)
+strap-1/EMR.$(FASLEXT): strap-0/MODRING.$(FASLEXT)
+strap-1/MFINFACT.$(FASLEXT): strap-0/MPC2.$(FASLEXT)
+strap-1/ACF.$(FASLEXT): strap-0/NTPOLFN.$(FASLEXT) strap-0/PDECOMP.$(FASLEXT)
+strap-1/FS.$(FASLEXT): strap-0/MKUCFUNC.$(FASLEXT) strap-1/ES.$(FASLEXT) \
+	strap-0/LIST2MAP.$(FASLEXT) strap-0/INFORM1.$(FASLEXT) \
+	strap-0/POLYCATQ.$(FASLEXT)
+strap-1/LF.$(FASLEXT): strap-0/SEGBIND.$(FASLEXT)
+strap-1/LFCAT.$(FASLEXT): strap-1/PRIMCAT.$(FASLEXT)
+strap-1/ALGMANIP.$(FASLEXT): strap-1/POLYROOT.$(FASLEXT) \
+	strap-1/POLYCATQ.$(FASLEXT) strap-1/FS.$(FASLEXT)
+strap-1/POLYROOT.$(FASLEXT): strap-0/FACTFUNC.$(FASLEXT)
+strap-1/AN.$(FASLEXT): strap-1/IAN.$(FASLEXT)
+strap-1/IAN.$(FASLEXT): strap-0/EXPR.$(FASLEXT) strap-0/EXPR2.$(FASLEXT)
+strap-1/EXPR2.$(FASLEXT): strap-0/FS2.$(FASLEXT) strap-0/ES2.$(FASLEXT)
+strap-1/MKUCFUNC.$(FASLEXT): strap-0/MKFUNC.$(FASLEXT)
+strap-1/FAGROUP.$(FASLEXT): strap-1/FAMONC.$(FASLEXT) \
+	strap-0/IFAMON.$(FASLEXT)
+strap-1/CMPLXRT.$(FASLEXT): strap-0/INFSP.$(FASLEXT)
+strap-1/POLTOPOL.$(FASLEXT): strap-1/OVAR.$(FASLEXT) \
+	strap-1/HDMP.$(FASLEXT) strap-0/MPC3.$(FASLEXT) \
+	strap-0/DMP.$(FASLEXT) strap-0/DIRPROD.$(FASLEXT)
+strap-1/HDMP.$(FASLEXT): strap-1/GDMP.$(FASLEXT) strap-0/HDP.$(FASLEXT)
+strap-1/GDMP.$(FASLEXT): strap-1/DIRPCAT.$(FASLEXT)
+strap-1/GROEBSOL.$(FASLEXT): strap-0/GB.$(FASLEXT) \
+	strap-1/GBINTERN.$(FASLEXT) strap-1/LGROBP.$(FASLEXT) \
+	strap-1/GENMFACT.$(FASLEXT)
+strap-1/GENMFACT.$(FASLEXT): strap-0/MPCPF.$(FASLEXT)
+strap-1/COMBF.$(FASLEXT): strap-0/SEGBIND.$(FASLEXT)
+strap-1/ACFS.$(FASLEXT): strap-1/ACF.$(FASLEXT)
+strap-1/MPCPF.$(FASLEXT): strap-1/PUSHVAR.$(FASLEXT) \
+	strap-0/GENMFACT.$(FASLEXT)
+strap-1/SIGNEF.$(FASLEXT): strap-0/TOOLSIGN.$(FASLEXT) \
+	strap-0/SIGNRF.$(FASLEXT) strap-0/LIMITPS.$(FASLEXT) \
+	strap-0/TRIGMNIP.$(FASLEXT) strap-0/ORDCOMP.$(FASLEXT) \
+	strap-0/INTRVL.$(FASLEXT)
+strap-1/SIGNRF.$(FASLEXT): strap-0/INPSIGN.$(FASLEXT) \
+	strap-0/TOOLSIGN.$(FASLEXT) strap-0/ORDCOMP.$(FASLEXT)
+strap-1/LIMITPS.$(FASLEXT): strap-0/EFSTRUC.$(FASLEXT) \
+	strap-0/FS2UPS.$(FASLEXT) strap-0/UPXS.$(FASLEXT) \
+	strap-0/EFUPXS.$(FASLEXT) strap-0/ULS.$(FASLEXT) \
+	strap-0/EFULS.$(FASLEXT) strap-0/UTS.$(FASLEXT) \
+	strap-0/FS2EXPXP.$(FASLEXT) strap-0/EXPEXPAN.$(FASLEXT) \
+	strap-0/SIGNEF.$(FASLEXT)
+strap-1/TRIGMNIP.$(FASLEXT): strap-0/ITRIGMNP.$(FASLEXT)
+strap-1/ULS.$(FASLEXT): strap-0/VARIABLE.$(FASLEXT) \
+	strap-0/ULSCONS.$(FASLEXT)
+strap-1/UTS.$(FASLEXT): strap-1/ITAYLOR.$(FASLEXT) \
+	strap-0/FSINT.$(FASLEXT)
+strap-1/ITAYLOR.$(FASLEXT): strap-0/STTAYLOR.$(FASLEXT)
+strap-1/STTAYLOR.$(FASLEXT): strap-0/YSTREAM.$(FASLEXT)
+strap-1/FSINT.$(FASLEXT): strap-0/INTTOOLS.$(FASLEXT) \
+	strap-0/INTEF.$(FASLEXT) strap-0/IR2F.$(FASLEXT) \
+	strap-0/TRMANIP.$(FASLEXT) strap-0/IR2.$(FASLEXT) \
+	strap-0/FSCINT.$(FASLEXT) strap-0/IR.$(FASLEXT)
+strap-1/UP.$(FASLEXT): strap-0/VARIABLE.$(FASLEXT)
+strap-1/RULE.$(FASLEXT): strap-0/APPRULE.$(FASLEXT) \
+	strap-0/PMASSFS.$(FASLEXT)
+strap-1/PTPACK.$(FASLEXT): strap-0/POINT.$(FASLEXT)
+strap-1/PLOTTOOL.$(FASLEXT): strap-0/GRDEF.$(FASLEXT) \
+	strap-1/PLOT.$(FASLEXT) strap-1/CLIP.$(FASLEXT) \
+	strap-1/DROPT0.$(FASLEXT) strap-1/DROPT1.$(FASLEXT) \
+	strap-0/VIEW.$(FASLEXT)
+
+strap-1/DROPT0.$(FASLEXT): strap-1/DROPT1.$(FASLEXT)
+strap-1/DROPT1.$(FASLEXT): strap-1/DROPT.$(FASLEXT)
+strap-1/DROPT.$(FASLEXT): strap-0/SPACE3.$(FASLEXT)
+strap-1/ODEEF.$(FASLEXT): strap-0/NODE1.$(FASLEXT) \
+	strap-0/LODO.$(FASLEXT) strap-0/ODESYS.$(FASLEXT) \
+	strap-0/LODEEF.$(FASLEXT)
+strap-1/ASTCAT.$(FASLEXT): strap-0/SYNTAX.$(FASLEXT) \
+	strap-0/HOMOTOP.$(FASLEXT)
+strap-1/IMPTAST.$(FASLEXT): strap-0/TYPEAST.$(FASLEXT)
+strap-1/DEFAST.$(FASLEXT): strap-0/HEADAST.$(FASLEXT) \
+	strap-0/SPADAST.$(FASLEXT) strap-0/SIG.$(FASLEXT)
+strap-1/CATAST.$(FASLEXT): strap-0/CTORKIND.$(FASLEXT)
+strap-1/HEADAST.$(FASLEXT): strap-0/PARAMAST.$(FASLEXT)
+strap-1/ITFORM.$(FASLEXT): strap-0/IRFORM.$(FASLEXT)
+strap-1/LINBASIS.$(FASLEXT): strap-0/DBASIS.$(FASLEXT)
+
 # Bootstrap stage 2 dependencies.
 # At this stage we recompile everything from stage 1, including
 # a few more domains.
@@ -2986,6 +3036,162 @@ strap-2/DFSFUN.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) \
 
 strap-2/POLY.$(FASLEXT): strap-2/UDPO.$(FASLEXT)
 
+strap-2/MULTFACT.$(FASLEXT): strap-1/MRATFAC.$(FASLEXT) \
+	strap-1/MPRFF.$(FASLEXT) strap-1/INNMFACT.$(FASLEXT) \
+	strap-1/GENUFACT.$(FASLEXT)
+
+strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT)
+
+strap-2/COMPCAT.$(FASLEXT): strap-1/CINTSLPE.$(FASLEXT) \
+	strap-1/COMPLPAT.$(FASLEXT) strap-1/CPMATCH.$(FASLEXT)
+strap-2/GENEEZ.$(FASLEXT): strap-1/EMR.$(FASLEXT)
+strap-2/MPRFF.$(FASLEXT): strap-1/MFINFACT.$(FASLEXT)
+strap-2/ACFS.$(FASLEXT): strap-2/ACF.$(FASLEXT) strap-1/FS.$(FASLEXT)
+strap-2/ACF.$(FASLEXT): strap-2/NTPOLFN.$(FASLEXT) \
+	strap-2/PDECOMP.$(FASLEXT)
+strap-2/NTPOLFN.$(FASLEXT): strap-2/PNTHEORY.$(FASLEXT)
+strap-2/PNTHEORY.$(FASLEXT): strap-1/INTHEORY.$(FASLEXT)
+strap-2/EXPR.$(FASLEXT): strap-1/COMBOPC.$(FASLEXT) \
+	strap-1/LFCAT.$(FASLEXT) strap-1/SPFCAT.$(FASLEXT) \
+	strap-1/KERNEL2.$(FASLEXT) strap-1/ALGMANIP.$(FASLEXT) \
+	strap-1/AF.$(FASLEXT) strap-1/EF.$(FASLEXT) \
+	strap-1/FSPECF.$(FASLEXT) strap-1/COMBF.$(FASLEXT) \
+	strap-1/SEGBIND.$(FASLEXT) strap-1/POLYCATQ.$(FASLEXT) \
+	strap-1/SUPFRACF.$(FASLEXT) strap-1/AN.$(FASLEXT) \
+	strap-1/EXPR2.$(FASLEXT) strap-1/ES2.$(FASLEXT) \
+	strap-1/MKUCFUNC.$(FASLEXT) strap-2/PMFS.$(FASLEXT) \
+	strap-1/LIST2MAP.$(FASLEXT) strap-1/FAGROUP.$(FASLEXT) \
+	strap-1/ACFS.$(FASLEXT) strap-1/LF.$(FASLEXT)
+strap-2/EXPR2.$(FASLEXT): strap-2/EXPR.$(FASLEXT) strap-1/FS2.$(FASLEXT)
+strap-2/PMFS.$(FASLEXT): strap-2/PMKERNEL.$(FASLEXT)
+strap-2/INFSP.$(FASLEXT): strap-1/POLY2.$(FASLEXT) \
+	strap-1/CMPLXRT.$(FASLEXT) strap-1/REAL0.$(FASLEXT) \
+	strap-1/SUBRESP.$(FASLEXT) strap-1/POLTOPOL.$(FASLEXT) \
+	strap-1/DMP.$(FASLEXT) strap-1/DIRPROD.$(FASLEXT) \
+	strap-1/GROEBSOL.$(FASLEXT)
+
+strap-2/GENMFACT.$(FASLEXT): strap-1/MPCPF.$(FASLEXT)
+strap-2/TOOLSIGN.$(FASLEXT): strap-1/SIGNEF.$(FASLEXT)
+strap-2/SIGNEF.$(FASLEXT): strap-1/SIGNRF.$(FASLEXT) \
+	strap-1/LIMITPS.$(FASLEXT) strap-1/TRIGMNIP.$(FASLEXT) \
+	strap-1/ORDCOMP.$(FASLEXT) strap-2/INTRVL.$(FASLEXT) \
+	strap-1/TOOLSIGN.$(FASLEXT)
+strap-2/INTRVL.$(FASLEXT): strap-2/INTCAT.$(FASLEXT)
+strap-2/UPXS.$(FASLEXT): strap-2/UPXSCCA.$(FASLEXT) \
+	strap-1/ULS.$(FASLEXT) strap-1/ULSCCAT.$(FASLEXT) \
+	strap-1/VARIABLE.$(FASLEXT) strap-1/UTS.$(FASLEXT) \
+	strap-1/UPXSCONS.$(FASLEXT)
+strap-2/UPXSCCA.$(FASLEXT): strap-2/UPXSCAT.$(FASLEXT)
+strap-2/UPXSCAT.$(FASLEXT): strap-2/UPSCAT.$(FASLEXT) \
+	strap-2/ULSCAT.$(FASLEXT)
+strap-2/UPSCAT.$(FASLEXT): strap-2/PSCAT.$(FASLEXT)
+strap-2/UTS.$(FASLEXT): strap-2/UTSCAT.$(FASLEXT) \
+	strap-1/VARIABLE.$(FASLEXT) strap-1/ITAYLOR.$(FASLEXT)
+strap-2/UTSCAT.$(FASLEXT): strap-1/STTAYLOR.$(FASLEXT) \
+	strap-1/STTF.$(FASLEXT) strap-1/STTFNC.$(FASLEXT) \
+	strap-1/UP.$(FASLEXT) strap-1/FSINT.$(FASLEXT) \
+	strap-1/UPSCAT.$(FASLEXT) strap-1/PSCAT.$(FASLEXT)
+strap-2/APPRULE.$(FASLEXT): strap-1/RULE.$(FASLEXT)
+strap-2/PLOT.$(FASLEXT): strap-1/PPCURVE.$(FASLEXT) \
+	strap-1/PTPACK.$(FASLEXT) strap-1/POINT.$(FASLEXT)
+strap-2/GRIMAGE.$(FASLEXT): strap-1/COLOR.$(FASLEXT) \
+	strap-1/PALETTE.$(FASLEXT) \
+	strap-1/VIEWDEF.$(FASLEXT) \
+	strap-1/PLOTTOOL.$(FASLEXT) \
+	strap-1/COORDSYS.$(FASLEXT) \
+	strap-1/PTCAT.$(FASLEXT)
+strap-2/NODE1.$(FASLEXT): strap-1/ODEINT.$(FASLEXT) \
+	strap-1/ODEEF.$(FASLEXT)
+strap-2/SPADAST.$(FASLEXT): strap-2/SASTCAT.$(FASLEXT) \
+	strap-2/SPADXPT.$(FASLEXT) \
+	strap-2/TYPEAST.$(FASLEXT) \
+	strap-2/IMPTAST.$(FASLEXT) \
+	strap-2/DEFAST.$(FASLEXT) \
+	strap-2/MACROAST.$(FASLEXT) \
+	strap-2/WHEREAST.$(FASLEXT) \
+	strap-2/CATAST.$(FASLEXT) \
+	strap-2/JOINAST.$(FASLEXT) \
+	strap-2/CAPSLAST.$(FASLEXT) \
+	strap-2/SIGAST.$(FASLEXT) \
+	strap-2/ATTRAST.$(FASLEXT) \
+	strap-2/MAPPAST.$(FASLEXT) \
+	strap-2/IFAST.$(FASLEXT) \
+	strap-2/RPTAST.$(FASLEXT) \
+	strap-2/WHILEAST.$(FASLEXT) \
+	strap-2/INAST.$(FASLEXT) \
+	strap-2/STEPAST.$(FASLEXT) \
+	strap-2/CLLCTAST.$(FASLEXT) \
+	strap-2/LSTAST.$(FASLEXT) \
+	strap-2/EXITAST.$(FASLEXT) \
+	strap-2/RETAST.$(FASLEXT) \
+	strap-2/CRCEAST.$(FASLEXT) \
+	strap-2/PRTDAST.$(FASLEXT) \
+	strap-2/RSTRCAST.$(FASLEXT) \
+	strap-2/SEGAST.$(FASLEXT) \
+	strap-2/SEQAST.$(FASLEXT) \
+	strap-2/LETAST.$(FASLEXT) \
+	strap-2/SUCHTAST.$(FASLEXT) \
+	strap-2/COLONAST.$(FASLEXT) \
+	strap-2/ADDAST.$(FASLEXT) \
+	strap-2/CASEAST.$(FASLEXT) \
+	strap-2/HASAST.$(FASLEXT) \
+	strap-2/ISAST.$(FASLEXT) \
+	strap-2/CATAST.$(FASLEXT) \
+	strap-2/WHEREAST.$(FASLEXT) \
+	strap-2/COMMAAST.$(FASLEXT) \
+	strap-2/QQUTAST.$(FASLEXT) \
+	strap-2/MACROAST.$(FASLEXT)
+strap-2/DEFAST.$(FASLEXT): strap-1/HEADAST.$(FASLEXT) \
+	strap-1/SIG.$(FASLEXT)
+strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \
+	strap-0/SPADXPT.$(FASLEXT) \
+	strap-0/TYPEAST.$(FASLEXT) \
+	strap-0/IMPTAST.$(FASLEXT) \
+	strap-0/DEFAST.$(FASLEXT) \
+	strap-0/MACROAST.$(FASLEXT) \
+	strap-0/WHEREAST.$(FASLEXT) \
+	strap-0/CATAST.$(FASLEXT) \
+	strap-0/JOINAST.$(FASLEXT) \
+	strap-0/CAPSLAST.$(FASLEXT) \
+	strap-0/SIGAST.$(FASLEXT) \
+	strap-0/ATTRAST.$(FASLEXT) \
+	strap-0/MAPPAST.$(FASLEXT) \
+	strap-0/IFAST.$(FASLEXT) \
+	strap-0/RPTAST.$(FASLEXT) \
+	strap-0/WHILEAST.$(FASLEXT) \
+	strap-0/INAST.$(FASLEXT) \
+	strap-0/STEPAST.$(FASLEXT) \
+	strap-0/CLLCTAST.$(FASLEXT) \
+	strap-0/LSTAST.$(FASLEXT) \
+	strap-0/EXITAST.$(FASLEXT) \
+	strap-0/RETAST.$(FASLEXT) \
+	strap-0/CRCEAST.$(FASLEXT) \
+	strap-0/PRTDAST.$(FASLEXT) \
+	strap-0/RSTRCAST.$(FASLEXT) \
+	strap-0/SEGAST.$(FASLEXT) \
+	strap-0/SEQAST.$(FASLEXT) \
+	strap-0/LETAST.$(FASLEXT) \
+	strap-0/SUCHTAST.$(FASLEXT) \
+	strap-0/COLONAST.$(FASLEXT) \
+	strap-0/ADDAST.$(FASLEXT) \
+	strap-0/CASEAST.$(FASLEXT) \
+	strap-0/HASAST.$(FASLEXT) \
+	strap-0/ISAST.$(FASLEXT) \
+	strap-0/CATAST.$(FASLEXT) \
+	strap-0/WHEREAST.$(FASLEXT) \
+	strap-0/COMMAAST.$(FASLEXT) \
+	strap-0/QQUTAST.$(FASLEXT) \
+	strap-0/MACROAST.$(FASLEXT)
+
+strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT)
+strap-2/SASTCAT.$(FASLEXT): strap-2/HOMOTOP.$(FASLEXT) \
+	strap-1/ASTCAT.$(FASLEXT) strap-1/SYNTAX.$(FASLEXT)
+
+strap-2/CATAST.$(FASLEXT): strap-1/CTORKIND.$(FASLEXT)
+strap-2/TYPEAST.$(FASLEXT): strap-1/SPADAST.$(FASLEXT)
+strap-2/IRFORM.$(FASLEXT): strap-1/ITFORM.$(FASLEXT)
+strap-2/LINELT.$(FASLEXT): strap-1/LINBASIS.$(FASLEXT)
+
 #
 #
 
@@ -3371,25 +3577,6 @@ $(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 $(OUT)/OUTFORM.$(FASLEXT): strap-2/NUMFMT.$(FASLEXT)
 $(OUT)/FLAGG.$(FASLEXT): strap-2/FLASORT.$(FASLEXT)
 
-$(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)
-$(OUT)/DOMTMPLT.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) $(OUT)/OAMONS.$(FASLEXT)
-$(OUT)/SET.$(FASLEXT): $(OUT)/FARRAY.$(FASLEXT)
-$(OUT)/FARRAY.$(FASLEXT): $(OUT)/IFARRAY.$(FASLEXT)
-
-$(OUT)/MONAD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/SCOPE.$(FASLEXT): $(OUT)/BINDING.$(FASLEXT)
-$(OUT)/COMMONOP.$(FASLEXT): $(OUT)/BOP.$(FASLEXT)
-$(OUT)/FCTRDATA.$(FASLEXT): $(OUT)/DOMTMPLT.$(FASLEXT)
-
-$(OUT)/ENV.$(FASLEXT): $(OUT)/SCOPE.$(FASLEXT)
-$(OUT)/COMM.$(FASLEXT): $(OUT)/OSI.$(FASLEXT)
-$(OUT)/PALETTE.$(FASLEXT): $(OUT)/COLOR.$(FASLEXT)
-
-$(OUT)/KERNEL.$(FASLEXT): $(OUT)/KERNEL2.$(FASLEXT)
-$(OUT)/DVARCAT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
-$(OUT)/IDPAM.$(FASLEXT): $(OUT)/IDPO.$(FASLEXT)
-
 $(OUT)/PATMATCH.$(FASLEXT): strap-2/POLY.$(FASLEXT)
 
 $(OUT)/SMP.$(FASLEXT): strap-2/PGCD.$(FASLEXT)
@@ -3399,82 +3586,51 @@ $(OUT)/LINDEP.$(FASLEXT): strap-2/LSMP.$(FASLEXT) \
 
 $(OUT)/POLY.$(FASLEXT): strap-2/INDE.$(FASLEXT)
 
-$(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
-$(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/HEADAST.$(FASLEXT): $(OUT)/PARAMAST.$(FASLEXT)
-$(OUT)/SPADXPT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
-$(OUT)/ATTRAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/TYPEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/IMPTAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/MAPPAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/SIGAST.$(FASLEXT): $(OUT)/SIG.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
-$(OUT)/JOINAST.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT)
-$(OUT)/IFAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RPTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/WHILEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/INAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/STEPAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) \
-		$(OUT)/IDENT.$(FASLEXT) $(OUT)/MAYBE.$(FASLEXT)
-$(OUT)/CLLCTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/LSTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/EXITAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RETAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SEGAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SEQAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/PRTDAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CRCEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT)
-$(OUT)/RSTRCAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/LETAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/RDUCEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SUCHTAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/COLONAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/ADDAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CAPSLAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CASEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/HASAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/ISAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/CATAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/WHEREAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/COMMAAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/QQUTAST.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/DEFAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT) $(OUT)/SPADAST.$(FASLEXT)
-$(OUT)/MACROAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
-$(OUT)/SPADAST.$(FASLEXT): $(OUT)/SIGAST.$(FASLEXT) \
-	$(OUT)/RSTRCAST.$(FASLEXT) $(OUT)/SEQAST.$(FASLEXT) \
-	$(OUT)/SUCHTAST.$(FASLEXT)
-
-$(OUT)/INBFILE.$(FASLEXT): $(OUT)/FNAME.$(FASLEXT) \
-	$(OUT)/INBCON.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/OUTBFILE.$(FASLEXT): $(OUT)/FNAME.$(FASLEXT) \
-	$(OUT)/OUTBCON.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
-$(OUT)/IOBFILE.$(FASLEXT): $(OUT)/INBFILE.$(FASLEXT) \
-	$(OUT)/OUTBFILE.$(FASLEXT)
-
-$(OUT)/CTOR.$(FASLEXT): $(OUT)/CTORKIND.$(FASLEXT) \
-	$(OUT)/IDENT.$(FASLEXT)
-
-$(OUT)/NETCLT.$(FASLEXT): $(OUT)/IOBCON.$(FASLEXT)
-$(OUT)/INETCLTS.$(FASLEXT): $(OUT)/NETCLT.$(FASLEXT)
-
-$(OUT)/IRFORM.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT)
-$(OUT)/COMPILER.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) $(OUT)/ENV.$(FASLEXT) \
-	$(OUT)/ELABOR.$(FASLEXT)
-$(OUT)/ITFORM.$(FASLEXT): $(OUT)/IRFORM.$(FASLEXT)
-$(OUT)/ELABOR.$(FASLEXT): $(OUT)/ITFORM.$(FASLEXT) $(OUT)/ENV.$(FASLEXT) \
-	$(OUT)/IRFORM.$(FASLEXT)
-
-$(OUT)/LINBASIS.$(FASLEXT): $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/OVAR.$(FASLEXT)
-$(OUT)/LINELT.$(FASLEXT): $(OUT)/VSPACE.$(FASLEXT) $(OUT)/FM.$(FASLEXT) \
-	$(OUT)/LINBASIS.$(FASLEXT)
-$(OUT)/DBASIS.$(FASLEXT): $(OUT)/ORDFIN.$(FASLEXT) $(OUT)/KVTFROM.$(FASLEXT)
-$(OUT)/LINFORM.$(FASLEXT): $(OUT)/DBASIS.$(FASLEXT) \
-	$(OUT)/VSPACE.$(FASLEXT) $(OUT)/LINELT.$(FASLEXT)
-
-$(OUT)/JVMOP.$(FASLEXT): $(OUT)/JVMBCODE.$(FASLEXT)
-$(OUT)/JVMCFACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
-$(OUT)/JVMFDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
-$(OUT)/JVMMDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
+# FIXME: Investigate circularity
+$(OUT)/CPIMA.$(FASLEXT): strap-2/MONOGEN.$(FASLEXT) \
+	strap-2/UPOLYC2.$(FASLEXT)
+
+# FIXME: Investigate circularity
+$(OUT)/CINTSLPE.$(FASLEXT): strap-2/COMPCAT.$(FASLEXT)
+$(OUT)/GHENSEL.$(FASLEXT): strap-2/GENEEZ.$(FASLEXT)
+
+# FIXME: Investigate circularity
+$(OUT)/COMPCAT.$(FASLEXT): strap-2/COMPLEX.$(FASLEXT)
+
+$(OUT)/POLYCATQ.$(FASLEXT): strap-2/SUP2.$(FASLEXT)
+$(OUT)/IAN.$(FASLEXT): strap-2/EXPR.$(FASLEXT) strap-2/AN.$(FASLEXT) \
+	strap-2/EXPR2.$(FASLEXT)
+$(OUT)/AF.$(FASLEXT): strap-2/ACF.$(FASLEXT)
+$(OUT)/SUPFRACF.$(FASLEXT): strap-2/MULTFACT.$(FASLEXT)
+
+# FIXME: Investigate cyle.
+$(OUT)/MRATFAC.$(FASLEXT): strap-2/MULTFACT.$(FASLEXT)
+$(OUT)/MULTFACT.$(FASLEXT): strap-2/MPRFF.$(FASLEXT)
+$(OUT)/EXPR.$(FASLEXT): strap-2/ACFS.$(FASLEXT)
+
+# FIXME:
+$(OUT)/CMPLXRT.$(FASLEXT): strap-2/INFSP.$(FASLEXT)
+$(OUT)/MPCPF.$(FASLEXT): strap-2/GENMFACT.$(FASLEXT)
+$(OUT)/SIGNEF.$(FASLEXT): strap-2/TOOLSIGN.$(FASLEXT)
+$(OUT)/FS2UPS.$(FASLEXT): strap-2/SIGNEF.$(FASLEXT)
+$(OUT)/LIMITPS.$(FASLEXT): strap-2/UPXS.$(FASLEXT) \
+	strap-2/TOOLSIGN.$(FASLEXT)
+$(OUT)/ODERAT.$(FASLEXT): strap-2/UTS.$(FASLEXT)
+$(OUT)/RULE.$(FASLEXT): strap-2/APPRULE.$(FASLEXT)
+$(OUT)/EXPUPXS.$(FASLEXT): strap-2/UPXS.$(FASLEXT)
+
+#FIXME:
+$(OUT)/GRDEF.$(FASLEXT): strap-2/PLOT.$(FASLEXT)
+$(OUT)/VIEW.$(FASLEXT): strap-2/GRIMAGE.$(FASLEXT)
+$(OUT)/VIEW2D.$(FASLEXT): strap-2/GRIMAGE.$(FASLEXT)
+
+# FIXME:
+$(OUT)/ODEEF.$(FASLEXT): strap-2/NODE1.$(FASLEXT)
+
+$(OUT)/TYPEAST.$(FASLEXT): strap-2/SPADAST.$(FASLEXT)
+$(OUT)/ITFORM.$(FASLEXT): strap-2/IRFORM.$(FASLEXT)
+$(OUT)/LINFORM.$(FASLEXT): strap-2/LINELT.$(FASLEXT) \
+	strap-2/DBASIS.$(FASLEXT)
 
 .PHONY: all-algebra all-algstrap