More algebra dependencies.

3 files changed, 238 insertions, 64 deletions

diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index b8573bb1..e6f5a1f4 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -1041,9 +1041,9 @@ strap-2/FAMR.$(FASLEXT): strap-2/AMR.$(FASLEXT) \
 strap-2/POLYCAT.$(FASLEXT): strap-2/PDRING.$(FASLEXT) \
 	strap-2/FAMR.$(FASLEXT) strap-2/EVALAB.$(FASLEXT) \
 	strap-2/RETRACT.$(FASLEXT) strap-2/FLINEXP.$(FASLEXT) \
-	strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \
-	strap-2/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
-	strap-2/INFORM.$(FASLEXT)
+	strap-1/VECTOR.$(FASLEXT) strap-1/MATRIX.$(FASLEXT) \
+	strap-1/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-1/INFORM.$(FASLEXT)
 strap-2/UPOLYC.$(FASLEXT): strap-2/POLYCAT.$(FASLEXT) \
 	strap-2/ELTAB.$(FASLEXT) strap-2/DIFRING.$(FASLEXT) \
 	strap-2/DIFEXT.$(FASLEXT) strap-2/STEP.$(FASLEXT) \
@@ -1186,11 +1186,17 @@ strap-2/EQ.$(FASLEXT): strap-2/FUNCTOR.$(FASLEXT) strap-2/SETCAT.$(FASLEXT) \
 	strap-2/FIELD.$(FASLEXT) strap-2/VSPACE.$(FASLEXT) \
 	strap-2/ES.$(FASLEXT) strap-2/GROUP.$(FASLEXT)
 
+strap-2/VSPACE.$(FASLEXT): strap-2/FIELD.$(FASLEXT) strap-2/MODULE.$(FASLEXT)
+
+strap-2/GROUP.$(FASLEXT): strap-2/MONOID.$(FASLEXT)
+
 strap-2/ES.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
 	strap-2/IEVALAB.$(FASLEXT) strap-2/EVALAB.$(FASLEXT) \
 	strap-2/RING.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
 	strap-2/CACHSET.$(FASLEXT)
 
+strap-2/CACHSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
+
 strap-2/BTAGG.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \
 	strap-1/BOOLE.$(FASLEXT) strap-1/LOGIC.$(FASLEXT) \
 	strap-1/A1AGG.$(FASLEXT)
@@ -1203,6 +1209,14 @@ strap-2/PATTERN.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
 	strap-2/RETRACT.$(FASLEXT) strap-1/BOP.$(FASLEXT) \
 	strap-1/NNI.$(FASLEXT) strap-1/ABELMON.$(FASLEXT)
 
+strap-2/FR.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) strap-2/INTDOM.$(FASLEXT) \
+	strap-2/DIFEXT.$(FASLEXT) strap-2/ALGEBRA.$(FASLEXT) \
+	strap-2/FEVALAB.$(FASLEXT) strap-2/FRETRCT.$(FASLEXT) \
+	strap-2/FUNCTOR.$(FASLEXT) strap-1/LIST.$(FASLEXT) \
+	strap-1/INT.$(FASLEXT) strap-1/NNI.$(FASLEXT) \
+	strap-1/INFORM.$(FASLEXT) strap-1/INS.$(FASLEXT) \
+	strap-1/REAL.$(FASLEXT) strap-1/IEVALAB.$(FASLEXT)
+
 #
 #
 
@@ -1442,8 +1456,6 @@ $(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/RTVALUE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/SYSPTR.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 
-$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
-$(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT)
 
 $(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT)
@@ -1520,7 +1532,7 @@ $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
 $(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/INTDOM.$(FASLEXT): $(OUT)/COMRING.$(FASLEXT) $(OUT)/ALGEBRA.$(FASLEXT) \
-	$(OUT)/ENTIRER.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT)
+	$(OUT)/ENTIRER.$(FASLEXT) strap-2/FIELD.$(FASLEXT)
 $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT)
 $(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT)
 $(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) $(OUT)/ES.$(FASLEXT)
@@ -1528,7 +1540,7 @@ $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \
 	$(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \
 	strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
 	$(OUT)/MAYBE.$(FASLEXT)
-$(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
+$(OUT)/CACHSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT)
 $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT)
 $(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT)
@@ -1540,36 +1552,110 @@ $(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \
 $(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \
 	strap-2/PATTERN.$(FASLEXT)
 
-$(OUT)/GROUP.$(FASLEXT): $(OUT)/GROUP.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \
+$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \
 	strap-2/PI.$(FASLEXT) strap-2/INT.$(FASLEXT)
 
+$(OUT)/ORDFIN.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/FINITE.$(FASLEXT)
+
+$(OUT)/RADCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \
+	strap-2/FRAC.$(FASLEXT) strap-2/INT.$(FASLEXT)
+
+$(OUT)/OSGROUP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT)
+
+$(OUT)/LINEXP.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/LMODULE.$(FASLEXT)
+
+$(OUT)/RNS.$(FASLEXT): $(OUT)/FIELD.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RADCAT.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \
+	$(OUT)/CHARZ.$(FASLEXT)
+
+$(OUT)/FPS.$(FASLEXT): $(OUT)/RNS.$(FASLEXT)
+
+$(OUT)/POLYCAT.$(FASLEXT): $(OUT)/PDRING.$(FASLEXT) \
+	$(OUT)/FAMR.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT) \
+	strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \
+	strap-2/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-2/INFORM.$(FASLEXT)
+
+$(OUT)/QFCAT.$(FASLEXT): $(OUT)/ALGEBRA.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) \
+	$(OUT)/FEVALAB.$(FASLEXT) $(OUT)/DIFEXT.$(FASLEXT) \
+	$(OUT)/FLINEXP.$(FASLEXT) $(OUT)/PATAB.$(FASLEXT) \
+	$(OUT)/FPATMAB.$(FASLEXT) $(OUT)/ORDSET.$(FASLEXT) \
+	$(OUT)/OINTDOM.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
+	$(OUT)/CHARNZ.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \
+	$(OUT)/PFECAT.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT) 
+
+$(OUT)/PDRING.$(FASLEXT): $(OUT)/PDSPC.$(FASLEXT)
+$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
+$(OUT)/PFECAT.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT)
+
+$(OUT)/FAMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \
+	$(OUT)/AMR.$(FASLEXT) $(OUT)/FRETRCT.$(FASLEXT)
+
+$(OUT)/AMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \
+	$(OUT)/BMODULE.$(FASLEXT) $(OUT)/FUNCTOR.$(FASLEXT) \
+	$(OUT)/FIELD.$(FASLEXT) $(OUT)/COMRING.$(FASLEXT) \
+	$(OUT)/ALGEBRA.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
+	$(OUT)/CHARNZ.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT)
+
+$(OUT)/FRETRCT.$(FASLEXT): $(OUT)/RETRACT.$(FASLEXT)
+
+$(OUT)/FLINEXP.$(FASLEXT): $(OUT)/LINEXP.$(FASLEXT) \
+	strap-2/MATRIX.$(FASLEXT)
+
+$(OUT)/FPATMAB.$(FASLEXT): $(OUT)/PATMAB.$(FASLEXT)
+
+$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \
+	strap-2/NNI.$(FASLEXT)
+
+$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) \
+	strap-2/NNI.$(FASLEXT)
+
+$(OUT)/DFLOAT.$(FASLEXT): $(OUT)/FPS.$(FASLEXT) \
+	$(OUT)/DIFRING.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT)
+
+$(OUT)/TRANFUN.$(FASLEXT): strap-2/TRIGCAT.$(FASLEXT) \
+	strap-2/ATRIG.$(FASLEXT) strap-2/HYPCAT.$(FASLEXT) \
+	strap-2/AHYP.$(FASLEXT) strap-2/ELEMFUN.$(FASLEXT)
+
+$(OUT)/SYMBOL.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/KONVERT.$(FASLEXT) \
+	$(OUT)/PATMAB.$(FASLEXT) strap-2/VOID.$(FASLEXT) \
+	strap-2/BOOLEAN.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
+	strap-2/PRIMARR.$(FASLEXT) strap-2/REF.$(FASLEXT) \
+	strap-2/STRING.$(FASLEXT)
 
 oa_algebra_layer_0 = \
   TYPE     BINOPC   BINOP    IDEMOPC  SGPOPC   SGPOP    \
   MONOPC   FUNCTOR  \
   BASTYPE  BASTYPE- SETCAT   SETCAT-  SGROUP   SGROUP-  \
-  LLINSET  RLINSET  LINSET   ABELSG   ABELSG-  \
+  LLINSET  RLINSET  LINSET   ABELSG   ABELSG-  CHARNZ   \
   ABELGRP  ABELGRP- ABELMON  ABELMON- ORDTYPE  ORDTYPE- \
-  RMODULE  ALGEBRA  ALGEBRA-    \
+  RMODULE  ALGEBRA  ALGEBRA- FRETRCT  FRETRCT-    \
   FINITE   FINITE-  MONOID   MONOID-  GROUP    GROUP-   \
-  RING     RING-    OINTDOM   \
-  BMODULE  STEP     LMODULE  \
+  RING     RING-    OINTDOM  AMR      AMR-      \
+  BMODULE  STEP     LMODULE  PFECAT   PFECAT-           \
   AHYP     CFCAT    ELTAB    KOERCE   KONVERT  \
   KRCFROM  KVTFROM  IEVALAB  IEVALAB- EVALAB   EVALAB-  \
-  RETRACT  RETRACT- VOID     REPSQ    REPDB    \
-  PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP   \
-  ORDSET   OASGP    DIFRING  SRING    OSGROUP  \
+  RETRACT  RETRACT- REPSQ    REPDB    FAMR     FAMR-    \
+  PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP  DIFEXT \
+  ORDSET   OASGP    DIFRING  SRING    OSGROUP  PDRING   \
   MODULE   MODULE-  PID      OAGROUP  OAGROUP- OCAMON   \
   OAMON    OAMON-   DIOID    INTDOM   INTDOM-  CACHSET  \
   RNG      RNG-     ORDFIN   OAMONS   CABMON   COMRING  \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-     \
   FIELD    FIELD-   VECTCAT  VECTCAT- RADCAT   RADCAT-  \
-  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- ORDRING  \
+  ENTIRER  ENTIRER- ORDRING  FLINEXP  FLINEXP- \
   DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
-  PDDOM    PDDOM-   PDSPC    PDSPC-   \
+  PDDOM    PDDOM-   PDSPC    PDSPC-   FPATMAB  \
   DSEXT    DSEXT-   ORDSTRCT          \
-  BOOLE    BOOLE-   SRING    MAYBE    \
+  BOOLE    BOOLE-   SRING    MAYBE    TRANFUN  TRANFUN- \
   INS      INS-     DIVRING  DIVRING- EUCDOM   EUCDOM-  \
   FPS      FPS-     RNS      RNS-     PATAB    \
   POLYCAT  POLYCAT- QFCAT    QFCAT-   FEVALAB  FEVALAB-  \
@@ -1582,6 +1668,7 @@ oa_algebra_layer_0_objects = \
 	$(addprefix $(OUT)/, \
            $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) 
 
+$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
 $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
 $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT)
 $(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
@@ -1654,8 +1741,8 @@ $(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT)
 $(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 
 oa_algebra_layer_1 = \
-  ITUPLE    IDPT    ITFUN2   SEGCAT    \
-  FILECAT  SMAGG    \
+  ITUPLE    IDPT    ITFUN2   SEGCAT   VOID      \
+  FILECAT  SMAGG    MKBCFUNC MKRECORD MKUCFUNC \
   PPCURVE  PSCURVE  RESLATC            \
   IDENT    OUTFORM  BINDING           BOOLEAN            \
   DROPT1   PLOT1    IARRAY1  \
@@ -1739,15 +1826,14 @@ oa_algebra_layer_4_objects = \
 
 $(OUT)/KERNEL.$(FASLEXT): $(OUT)/KERNEL2.$(FASLEXT)
 $(OUT)/DVARCAT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
-$(OUT)/PDRING.$(FASLEXT): $(OUT)/PDSPC.$(FASLEXT)
 $(OUT)/IDPAM.$(FASLEXT): $(OUT)/IDPO.$(FASLEXT)
 
 oa_algebra_layer_5 = \
-           CHARNZ            DVARCAT  DVARCAT- ELEMFUN  \
-  ELEMFUN- FCOMP    FPATMAB  IDPAM    IDPO     \
+                       DVARCAT  DVARCAT- ELEMFUN  \
+  ELEMFUN- FCOMP    IDPAM    IDPO     \
   INCRMAPS KERNEL2           MODMONOM MONADWU  MONADWU- \
   MRF2     NARNG    NARNG-   NSUP2    ODVAR    OPQUERY  \
-           ORDMON   PATMATCH PERMCAT  PDRING            \
+           ORDMON   PATMATCH PERMCAT  \
   SDVAR    SUP2     TRIGCAT  TRIGCAT- UP2      \
   ELABEXPR KERNEL
 
@@ -1762,13 +1848,12 @@ $(OUT)/PROPFRML.$(FASLEXT): $(OUT)/KERNEL.$(FASLEXT)
 $(OUT)/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/BYTE.$(FASLEXT)
 $(OUT)/PROPFUN1.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
 $(OUT)/PROPFUN2.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
-$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
 $(OUT)/BYTE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 $(OUT)/SYSNNI.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT)
 
 oa_algebra_layer_6 = \
   PROPFRML PROPFUN1 AUTOMOR  CHARPOL  \
-  DIFEXT            ES1      ES2     GRMOD    GRMOD-   \
+              ES1      ES2     GRMOD    GRMOD-   \
   HYPCAT   HYPCAT-           MODRING NASRING  NASRING- \
   SORTPAK  ZMOD     PROPFUN2                           \
   KTVLOGIC                   BYTE    SYSINT   SYSNNI
@@ -1817,8 +1902,8 @@ $(OUT)/IDPOAMS.$(FASLEXT): $(OUT)/IDPOAM.$(FASLEXT)
 $(OUT)/IDPAG.$(FASLEXT): $(OUT)/IDPAM.$(FASLEXT)
 
 oa_algebra_layer_9 = \
-  AMR      AMR-     DLP      EAB      \
-  FAGROUP  FAMONOID FLINEXP  FLINEXP- FRETRCT  FRETRCT- \
+  DLP      EAB      \
+  FAGROUP  FAMONOID \
   FSERIES  FT       IDPAG    IDPOAMS  INFINITY LA       \
   OMLO     ORTHPOL  PRODUCT  PADICCT  \
                     RATRET   RADUTIL   \
@@ -1854,7 +1939,7 @@ $(OUT)/PFR.$(FASLEXT): $(OUT)/FR.$(FASLEXT)
 oa_algebra_layer_10 = \
   BPADIC   ANY      LWORD    FR \
   SEXOF    CRAPACK  DEQUEUE  DLIST    \
-  FAMR     FAMR-    FLASORT  \
+  FLASORT  \
   FLAGG2   FGROUP   FM       FM1      \
   FPC      FPC-     FMONOID  INDE     \
   IPADIC   IROOT    IR2       \
@@ -1871,7 +1956,7 @@ oa_algebra_layer_10 = \
   PSCAT    PSCAT-   QFORM    QUEUE    \
   SQMATRIX SEG      SEG2     MTSCAT   \
   STACK    STTAYLOR TABLBUMP TABLEAU  \
-  TOPSP    TRANFUN  TRANFUN- TUBE     \
+  TOPSP    TUBE     \
   UDPO     UNISEG   VIEW     VSPACE   \
   VSPACE-  XPOLYC   XPR      BTAGG    BTAGG-  \
   FUNDESC  SMATCAT  SMATCAT- \
@@ -1939,7 +2024,7 @@ oa_algebra_layer_13 = \
   FNLA     GRAY     HB       IRSN     \
   MHROWRED NUMODE   NUMQUAD  MESH     \
   ODESYS   ODETOOLS ORDFUNS  PERMAN   \
-  PFECAT   PFECAT-           PSEUDLIN \
+  PSEUDLIN \
   PTPACK   REP2     SETMN    PLOTTOOL          \
   SYMFUNC  VECTOR2  VECTOR   CHAR     XPBWPOLY \
   INBCON   INBCON-  OUTBCON  OUTBCON- LEXP    
@@ -2212,6 +2297,9 @@ oa_algebra_layer_23_nrlibs = \
 oa_algebra_layer_23_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_23)))
+
+$(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT)
+
 oa_algebra_layer_24 =  \
 	RINTERP	 ASTCAT   ASTCAT-  SASTCAT  HEADAST  \
 	LITERAL           TYPEAST  IMPTAST  MAPPAST  ATTRAST  \
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 6ea9201d..27580997 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -710,28 +710,28 @@ oa_algebra_layer_0 = \
   TYPE     BINOPC   BINOP    IDEMOPC  SGPOPC   SGPOP    \
   MONOPC   FUNCTOR  \
   BASTYPE  BASTYPE- SETCAT   SETCAT-  SGROUP   SGROUP-  \
-  LLINSET  RLINSET  LINSET   ABELSG   ABELSG-  \
+  LLINSET  RLINSET  LINSET   ABELSG   ABELSG-  CHARNZ   \
   ABELGRP  ABELGRP- ABELMON  ABELMON- ORDTYPE  ORDTYPE- \
-  RMODULE  ALGEBRA  ALGEBRA-    \
+  RMODULE  ALGEBRA  ALGEBRA- FRETRCT  FRETRCT-    \
   FINITE   FINITE-  MONOID   MONOID-  GROUP    GROUP-   \
-  RING     RING-    OINTDOM   \
-  BMODULE  STEP     LMODULE  \
+  RING     RING-    OINTDOM  AMR      AMR-      \
+  BMODULE  STEP     LMODULE  PFECAT   PFECAT-           \
   AHYP     CFCAT    ELTAB    KOERCE   KONVERT  \
   KRCFROM  KVTFROM  IEVALAB  IEVALAB- EVALAB   EVALAB-  \
-  RETRACT  RETRACT- VOID     REPSQ    REPDB    \
-  PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP   \
-  ORDSET   OASGP    DIFRING  SRING    OSGROUP  \
+  RETRACT  RETRACT- REPSQ    REPDB    FAMR     FAMR-    \
+  PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP  DIFEXT \
+  ORDSET   OASGP    DIFRING  SRING    OSGROUP  PDRING   \
   MODULE   MODULE-  PID      OAGROUP  OAGROUP- OCAMON   \
   OAMON    OAMON-   DIOID    INTDOM   INTDOM-  CACHSET  \
   RNG      RNG-     ORDFIN   OAMONS   CABMON   COMRING  \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-     \
   FIELD    FIELD-   VECTCAT  VECTCAT- RADCAT   RADCAT-  \
-  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- ORDRING  \
+  ENTIRER  ENTIRER- ORDRING  FLINEXP  FLINEXP- \
   DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
-  PDDOM    PDDOM-   PDSPC    PDSPC-   \
+  PDDOM    PDDOM-   PDSPC    PDSPC-   FPATMAB  \
   DSEXT    DSEXT-   ORDSTRCT          \
-  BOOLE    BOOLE-   SRING    MAYBE    \
+  BOOLE    BOOLE-   SRING    MAYBE    TRANFUN  TRANFUN- \
   INS      INS-     DIVRING  DIVRING- EUCDOM   EUCDOM-  \
   FPS      FPS-     RNS      RNS-     PATAB    \
   POLYCAT  POLYCAT- QFCAT    QFCAT-   FEVALAB  FEVALAB-  \
@@ -745,8 +745,8 @@ oa_algebra_layer_0_objects = \
            $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) 
 
 oa_algebra_layer_1 = \
-  ITUPLE    IDPT    ITFUN2   SEGCAT    \
-  FILECAT  SMAGG    \
+  ITUPLE    IDPT    ITFUN2   SEGCAT   VOID      \
+  FILECAT  SMAGG    MKBCFUNC MKRECORD MKUCFUNC \
   PPCURVE  PSCURVE  RESLATC            \
   IDENT    OUTFORM  BINDING           BOOLEAN            \
   DROPT1   PLOT1    IARRAY1  \
@@ -815,11 +815,11 @@ oa_algebra_layer_4_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_4)))
 
 oa_algebra_layer_5 = \
-           CHARNZ            DVARCAT  DVARCAT- ELEMFUN  \
-  ELEMFUN- FCOMP    FPATMAB  IDPAM    IDPO     \
+                       DVARCAT  DVARCAT- ELEMFUN  \
+  ELEMFUN- FCOMP    IDPAM    IDPO     \
   INCRMAPS KERNEL2           MODMONOM MONADWU  MONADWU- \
   MRF2     NARNG    NARNG-   NSUP2    ODVAR    OPQUERY  \
-           ORDMON   PATMATCH PERMCAT  PDRING            \
+           ORDMON   PATMATCH PERMCAT  \
   SDVAR    SUP2     TRIGCAT  TRIGCAT- UP2      \
   ELABEXPR KERNEL
 
@@ -832,7 +832,7 @@ oa_algebra_layer_5_objects = \
 
 oa_algebra_layer_6 = \
   PROPFRML PROPFUN1 AUTOMOR  CHARPOL  \
-  DIFEXT            ES1      ES2     GRMOD    GRMOD-   \
+              ES1      ES2     GRMOD    GRMOD-   \
   HYPCAT   HYPCAT-           MODRING NASRING  NASRING- \
   SORTPAK  ZMOD     PROPFUN2                           \
   KTVLOGIC                   BYTE    SYSINT   SYSNNI
@@ -871,8 +871,8 @@ oa_algebra_layer_8_objects = \
 	   $(addsuffix .$(FASLEXT),$(oa_algebra_layer_8)))
 
 oa_algebra_layer_9 = \
-  AMR      AMR-     DLP      EAB      \
-  FAGROUP  FAMONOID FLINEXP  FLINEXP- FRETRCT  FRETRCT- \
+  DLP      EAB      \
+  FAGROUP  FAMONOID \
   FSERIES  FT       IDPAG    IDPOAMS  INFINITY LA       \
   OMLO     ORTHPOL  PRODUCT  PADICCT  \
                     RATRET   RADUTIL   \
@@ -889,7 +889,7 @@ oa_algebra_layer_9_objects = \
 oa_algebra_layer_10 = \
   BPADIC   ANY      LWORD    FR \
   SEXOF    CRAPACK  DEQUEUE  DLIST    \
-  FAMR     FAMR-    FLASORT  \
+  FLASORT  \
   FLAGG2   FGROUP   FM       FM1      \
   FPC      FPC-     FMONOID  INDE     \
   IPADIC   IROOT    IR2       \
@@ -906,7 +906,7 @@ oa_algebra_layer_10 = \
   PSCAT    PSCAT-   QFORM    QUEUE    \
   SQMATRIX SEG      SEG2     MTSCAT   \
   STACK    STTAYLOR TABLBUMP TABLEAU  \
-  TOPSP    TRANFUN  TRANFUN- TUBE     \
+  TOPSP    TUBE     \
   UDPO     UNISEG   VIEW     VSPACE   \
   VSPACE-  XPOLYC   XPR      BTAGG    BTAGG-  \
   FUNDESC  SMATCAT  SMATCAT- \
@@ -964,7 +964,7 @@ oa_algebra_layer_13 = \
   FNLA     GRAY     HB       IRSN     \
   MHROWRED NUMODE   NUMQUAD  MESH     \
   ODESYS   ODETOOLS ORDFUNS  PERMAN   \
-  PFECAT   PFECAT-           PSEUDLIN \
+  PSEUDLIN \
   PTPACK   REP2     SETMN    PLOTTOOL          \
   SYMFUNC  VECTOR2  VECTOR   CHAR     XPBWPOLY \
   INBCON   INBCON-  OUTBCON  OUTBCON- LEXP    
@@ -2553,9 +2553,9 @@ strap-2/FAMR.$(FASLEXT): strap-2/AMR.$(FASLEXT) \
 strap-2/POLYCAT.$(FASLEXT): strap-2/PDRING.$(FASLEXT) \
 	strap-2/FAMR.$(FASLEXT) strap-2/EVALAB.$(FASLEXT) \
 	strap-2/RETRACT.$(FASLEXT) strap-2/FLINEXP.$(FASLEXT) \
-	strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \
-	strap-2/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
-	strap-2/INFORM.$(FASLEXT)
+	strap-1/VECTOR.$(FASLEXT) strap-1/MATRIX.$(FASLEXT) \
+	strap-1/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-1/INFORM.$(FASLEXT)
 strap-2/UPOLYC.$(FASLEXT): strap-2/POLYCAT.$(FASLEXT) \
 	strap-2/ELTAB.$(FASLEXT) strap-2/DIFRING.$(FASLEXT) \
 	strap-2/DIFEXT.$(FASLEXT) strap-2/STEP.$(FASLEXT) \
@@ -2698,11 +2698,17 @@ strap-2/EQ.$(FASLEXT): strap-2/FUNCTOR.$(FASLEXT) strap-2/SETCAT.$(FASLEXT) \
 	strap-2/FIELD.$(FASLEXT) strap-2/VSPACE.$(FASLEXT) \
 	strap-2/ES.$(FASLEXT) strap-2/GROUP.$(FASLEXT)
 
+strap-2/VSPACE.$(FASLEXT): strap-2/FIELD.$(FASLEXT) strap-2/MODULE.$(FASLEXT)
+
+strap-2/GROUP.$(FASLEXT): strap-2/MONOID.$(FASLEXT)
+
 strap-2/ES.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
 	strap-2/IEVALAB.$(FASLEXT) strap-2/EVALAB.$(FASLEXT) \
 	strap-2/RING.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
 	strap-2/CACHSET.$(FASLEXT)
 
+strap-2/CACHSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
+
 strap-2/BTAGG.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \
 	strap-1/BOOLE.$(FASLEXT) strap-1/LOGIC.$(FASLEXT) \
 	strap-1/A1AGG.$(FASLEXT)
@@ -2715,6 +2721,14 @@ strap-2/PATTERN.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
 	strap-2/RETRACT.$(FASLEXT) strap-1/BOP.$(FASLEXT) \
 	strap-1/NNI.$(FASLEXT) strap-1/ABELMON.$(FASLEXT)
 
+strap-2/FR.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) strap-2/INTDOM.$(FASLEXT) \
+	strap-2/DIFEXT.$(FASLEXT) strap-2/ALGEBRA.$(FASLEXT) \
+	strap-2/FEVALAB.$(FASLEXT) strap-2/FRETRCT.$(FASLEXT) \
+	strap-2/FUNCTOR.$(FASLEXT) strap-1/LIST.$(FASLEXT) \
+	strap-1/INT.$(FASLEXT) strap-1/NNI.$(FASLEXT) \
+	strap-1/INFORM.$(FASLEXT) strap-1/INS.$(FASLEXT) \
+	strap-1/REAL.$(FASLEXT) strap-1/IEVALAB.$(FASLEXT)
+
 #
 #
 
@@ -2822,9 +2836,6 @@ $(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/RTVALUE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/SYSPTR.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 
-$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
-$(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT)
-
 $(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT)
 $(OUT)/DIFFMOD.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
@@ -2900,7 +2911,7 @@ $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
 $(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
 $(OUT)/INTDOM.$(FASLEXT): $(OUT)/COMRING.$(FASLEXT) $(OUT)/ALGEBRA.$(FASLEXT) \
-	$(OUT)/ENTIRER.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT)
+	$(OUT)/ENTIRER.$(FASLEXT) strap-2/FIELD.$(FASLEXT)
 $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT)
 $(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT)
 $(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) $(OUT)/ES.$(FASLEXT)
@@ -2908,7 +2919,7 @@ $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \
 	$(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \
 	strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
 	$(OUT)/MAYBE.$(FASLEXT)
-$(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
+$(OUT)/CACHSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT)
 $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT)
 $(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT)
@@ -2920,9 +2931,85 @@ $(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \
 $(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \
 	strap-2/PATTERN.$(FASLEXT)
 
-$(OUT)/GROUP.$(FASLEXT): $(OUT)/GROUP.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \
+$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \
 	strap-2/PI.$(FASLEXT) strap-2/INT.$(FASLEXT)
 
+$(OUT)/ORDFIN.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/FINITE.$(FASLEXT)
+
+$(OUT)/RADCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \
+	strap-2/FRAC.$(FASLEXT) strap-2/INT.$(FASLEXT)
+
+$(OUT)/OSGROUP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT)
+
+$(OUT)/LINEXP.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/LMODULE.$(FASLEXT)
+
+$(OUT)/RNS.$(FASLEXT): $(OUT)/FIELD.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RADCAT.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \
+	$(OUT)/CHARZ.$(FASLEXT)
+
+$(OUT)/FPS.$(FASLEXT): $(OUT)/RNS.$(FASLEXT)
+
+$(OUT)/POLYCAT.$(FASLEXT): $(OUT)/PDRING.$(FASLEXT) \
+	$(OUT)/FAMR.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT) \
+	strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \
+	strap-2/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-2/INFORM.$(FASLEXT)
+
+$(OUT)/QFCAT.$(FASLEXT): $(OUT)/ALGEBRA.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) \
+	$(OUT)/FEVALAB.$(FASLEXT) $(OUT)/DIFEXT.$(FASLEXT) \
+	$(OUT)/FLINEXP.$(FASLEXT) $(OUT)/PATAB.$(FASLEXT) \
+	$(OUT)/FPATMAB.$(FASLEXT) $(OUT)/ORDSET.$(FASLEXT) \
+	$(OUT)/OINTDOM.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
+	$(OUT)/CHARNZ.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \
+	$(OUT)/PFECAT.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT) 
+
+$(OUT)/PDRING.$(FASLEXT): $(OUT)/PDSPC.$(FASLEXT)
+$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
+$(OUT)/PFECAT.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT)
+
+$(OUT)/FAMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \
+	$(OUT)/AMR.$(FASLEXT) $(OUT)/FRETRCT.$(FASLEXT)
+
+$(OUT)/AMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \
+	$(OUT)/BMODULE.$(FASLEXT) $(OUT)/FUNCTOR.$(FASLEXT) \
+	$(OUT)/FIELD.$(FASLEXT) $(OUT)/COMRING.$(FASLEXT) \
+	$(OUT)/ALGEBRA.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
+	$(OUT)/CHARNZ.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT)
+
+$(OUT)/FRETRCT.$(FASLEXT): $(OUT)/RETRACT.$(FASLEXT)
+
+$(OUT)/FLINEXP.$(FASLEXT): $(OUT)/LINEXP.$(FASLEXT) \
+	strap-2/MATRIX.$(FASLEXT)
+
+$(OUT)/FPATMAB.$(FASLEXT): $(OUT)/PATMAB.$(FASLEXT)
+
+$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \
+	strap-2/NNI.$(FASLEXT)
+
+$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) \
+	strap-2/NNI.$(FASLEXT)
+
+$(OUT)/DFLOAT.$(FASLEXT): $(OUT)/FPS.$(FASLEXT) \
+	$(OUT)/DIFRING.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT)
+
+$(OUT)/TRANFUN.$(FASLEXT): strap-2/TRIGCAT.$(FASLEXT) \
+	strap-2/ATRIG.$(FASLEXT) strap-2/HYPCAT.$(FASLEXT) \
+	strap-2/AHYP.$(FASLEXT) strap-2/ELEMFUN.$(FASLEXT)
+
+$(OUT)/SYMBOL.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) \
+	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) \
+	$(OUT)/RETRACT.$(FASLEXT) $(OUT)/KONVERT.$(FASLEXT) \
+	$(OUT)/PATMAB.$(FASLEXT) strap-2/VOID.$(FASLEXT) \
+	strap-2/BOOLEAN.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
+	strap-2/PRIMARR.$(FASLEXT) strap-2/REF.$(FASLEXT) \
+	strap-2/STRING.$(FASLEXT)
+
+$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
 $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
 $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT)
 $(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
@@ -3009,14 +3096,12 @@ $(OUT)/PALETTE.$(FASLEXT): $(OUT)/COLOR.$(FASLEXT)
 
 $(OUT)/KERNEL.$(FASLEXT): $(OUT)/KERNEL2.$(FASLEXT)
 $(OUT)/DVARCAT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
-$(OUT)/PDRING.$(FASLEXT): $(OUT)/PDSPC.$(FASLEXT)
 $(OUT)/IDPAM.$(FASLEXT): $(OUT)/IDPO.$(FASLEXT)
 
 $(OUT)/PROPFRML.$(FASLEXT): $(OUT)/KERNEL.$(FASLEXT)
 $(OUT)/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/BYTE.$(FASLEXT)
 $(OUT)/PROPFUN1.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
 $(OUT)/PROPFUN2.$(FASLEXT): $(OUT)/PROPFRML.$(FASLEXT)
-$(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT)
 $(OUT)/BYTE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 $(OUT)/SYSNNI.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT)
 
@@ -3086,6 +3171,8 @@ $(OUT)/SUPXS.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT)
 
 $(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 
+$(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT)
+
 $(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
 $(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
 $(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index f8c394ee..2711ff4e 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -1231,7 +1231,6 @@ Group(): Category == Monoid with
 ++   canonicalsClosed\tab{20}the product of two canonicals is itself canonical
 
 IntegralDomain(): Category ==
---  Join(CommutativeRing, Algebra(%:CommutativeRing), EntireRing) with
   Join(CommutativeRing, Algebra(%), EntireRing) with
     --operations
       exquo: (%,%) -> Union(%,"failed")