diff --git a/LOG b/LOG
index ab412cfea5..7c5dcb94e4 100644
--- a/LOG
+++ b/LOG
@@ -1949,3 +1949,48 @@
     primdata.ss
 - console I/O on Windows now supports Unicode characters in the BMP
     expeditor.c, new-io.c, release_notes.stex
+- the collector now releases bignum temporaries in the collector
+  rather than relocating them so we don't keep around huge bignum
+  temporaries forever.
+     gc.c
+- removed the presumably useless vector-handling code from load()
+  which used to be required to handle fasl groups.
+     scheme.c
+- object files are no longer compressed as a whole, and the parameter
+  compile-compressed is no longer defined.  instead, the individual
+  fasl objects within an object file are compressed whenever the
+  new parameter fasl-compressed is set to its default value, #t.
+  this allows the fasl reader to seek past portions of an object
+  file that are not of interest, i.e., visit-only code and data
+  when "revisiting" an object file and revisit-only code and data
+  when "visiting" an object file.  the compressed portions are
+  compressed using the format and level specified by the compress-format
+  and compress-level parameters.  the C-coded fasl reader and
+  boot-file loader no longer handle compressed files; these are
+  handled, less efficiently, by the Scheme entry point (fasl-read).
+  a warning exception is raised the first time a program attempts
+  to create or read a compressed fasl file.
+    7.ss, s/Mf-base, back.ss, bytevector.ss, cmacros.ss, compile.ss,
+    fasl-helpers.ss, fasl.ss, primdata.ss, strip.ss, syntax.ss,
+    externs.h, fasl.c, gc.c, scheme.c, thread.c,
+    mats/6.ms, mats/7.ms, mats/bytevector.ms, mats/misc.ms, patch*,
+    root-experr*,
+    intro.stex, use.stex, io.stex, system.stex,
+    release_notes.stex
+- added begin wrappers around many of the Scheme source files that
+  contained multiple expressions to cut down the number of top-level
+  fasl objects and increase compressibility.  also removed the
+  string filenames for debugging at the start of each file that had
+  one---these are best inserted universally by a modified compile-file
+  during a debugging session when desired.  also removed unnecessary
+  top-level placeholder definitions for the assignments that follow.
+    4.ss, 5_1.ss, 5_2.ss, 5_3.ss, 5_7.ss, 6.ss, 7.ss, bytevector.ss,
+    cafe.ss, cback.ss, compile.ss, cp0.ss, cpcommonize.ss, cpletrec.ss,
+    cpnanopass.ss, cprep.ss, cpvalid.ss, date.ss, engine.ss, enum.ss,
+    env.ss, event.ss, exceptions.ss, expeditor.ss, fasl.ss, foreign.ss,
+    format.ss, front.ss, ftype.ss, inspect.ss, interpret.ss, io.ss,
+    library.ss, mathprims.ss, newhash.ss, pdhtml.ss, pretty.ss,
+    prims.ss, primvars.ss, print.ss, read.ss, record.ss, reloc.ss,
+    strnum.ss, syntax.ss, trace.ss
+- updated bullyx patches
+    patch*
diff --git a/c/externs.h b/c/externs.h
index 50f0f5a54a..fa180d1f0a 100644
--- a/c/externs.h
+++ b/c/externs.h
@@ -97,10 +97,9 @@ extern ptr S_weak_cons PROTO((ptr car, ptr cdr));
 
 /* fasl.c */
 extern void S_fasl_init PROTO((void));
-ptr S_fasl_read PROTO((ptr file, IBOOL gzflag, IFASLCODE situation, ptr path));
+ptr S_fasl_read PROTO((INT fd, IFASLCODE situation, ptr path));
 ptr S_bv_fasl_read PROTO((ptr bv, ptr path));
-/* S_boot_read's f argument is really gzFile, but zlib.h is not included everywhere */
-ptr S_boot_read PROTO((glzFile file, const char *path));
+ptr S_boot_read PROTO((INT fd, const char *path));
 char *S_format_scheme_version PROTO((uptr n));
 char *S_lookup_machine_type PROTO((uptr n));
 extern void S_set_code_obj PROTO((char *who, IFASLCODE typ, ptr p, iptr n,
diff --git a/c/fasl.c b/c/fasl.c
index 0472d6948e..0a875d5972 100644
--- a/c/fasl.c
+++ b/c/fasl.c
@@ -18,15 +18,19 @@
  *
  * <fasl-file> -> <fasl-group>*
  *
- * <fasl-group> -> <fasl header><fasl-object>*
+ * <fasl-group> -> <fasl-header><fasl-object>*
  *
  * <fasl-header> -> {header}\0\0\0chez<uptr version><uptr machine-type>(<bootfile-name> ...)
  *
  * <bootfile-name> -> <octet char>*
  *
- * <fasl-object> -> <situation>{fasl-size}<uptr size><fasl> # size is the size in bytes of the following <fasl>
+ * <fasl-object> -> <situation><uptr size><pcfasl> # size is the size in bytes of <pcfasl>
  *
- * <situation> -> {visit}{revisit}{visit-revisit}
+ * <situation> -> {visit} | {revisit} | {visit-revisit}
+ *
+ * <pcfasl> -> <compressed><uptr uncompressed-size><compressed fasl> | {uncompressed}<fasl>
+ * 
+ * <compressed> -> {gzip} | {lz4}
  *
  * <fasl> -> {pair}<uptr n><fasl elt1>...<fasl eltn><fasl last-cdr>
  *
@@ -190,16 +194,15 @@
 #include NAN_INCLUDE
 #endif
 
-#define UFFO_TYPE_GZ 1
 #define UFFO_TYPE_FD 2
 #define UFFO_TYPE_BV 3
 
-/* we do our own buffering size gzgetc is slow */
+#define PREPARE_BYTEVECTOR(bv,n) {if (bv == Sfalse || Sbytevector_length(bv) < (n)) bv = S_bytevector(n);}
+
 typedef struct unbufFaslFileObj {
   ptr path;
   INT type;
   INT fd;
-  glzFile file;
 } *unbufFaslFile;
 
 typedef struct faslFileObj {
@@ -213,7 +216,7 @@ typedef struct faslFileObj {
 /* locally defined functions */
 static INT uf_read PROTO((unbufFaslFile uf, octet *s, iptr n));
 static octet uf_bytein PROTO((unbufFaslFile uf));
-static uptr uf_uptrin PROTO((unbufFaslFile uf));
+static uptr uf_uptrin PROTO((unbufFaslFile uf, INT *bytes_consumed));
 static ptr fasl_entry PROTO((ptr tc, IFASLCODE situation, unbufFaslFile uf));
 static ptr bv_fasl_entry PROTO((ptr tc, ptr bv, unbufFaslFile uf));
 static void fillFaslFile PROTO((faslFile f));
@@ -289,20 +292,15 @@ void S_fasl_init() {
 #endif
 }
 
-ptr S_fasl_read(ptr file, IBOOL gzflag, IFASLCODE situation, ptr path) {
+ptr S_fasl_read(INT fd, IFASLCODE situation, ptr path) {
   ptr tc = get_thread_context();
   ptr x; struct unbufFaslFileObj uffo;
 
  /* acquire mutex in case we modify code pages */
   tc_mutex_acquire()
   uffo.path = path;
-  if (gzflag) {
-    uffo.type = UFFO_TYPE_GZ;
-    uffo.file = S_gzxfile_gzfile(file);
-  } else {
-    uffo.type = UFFO_TYPE_FD;
-    uffo.fd = GET_FD(file);
-  }
+  uffo.type = UFFO_TYPE_FD;
+  uffo.fd = fd;
   x = fasl_entry(tc, situation, &uffo);
   tc_mutex_release()
   return x;
@@ -321,18 +319,16 @@ ptr S_bv_fasl_read(ptr bv, ptr path) {
   return x;
 }
 
-ptr S_boot_read(glzFile file, const char *path) {
+ptr S_boot_read(INT fd, const char *path) {
   ptr tc = get_thread_context();
   struct unbufFaslFileObj uffo;
 
   uffo.path = Sstring_utf8(path, -1);
-  uffo.type = UFFO_TYPE_GZ;
-  uffo.file = file;
+  uffo.type = UFFO_TYPE_FD;
+  uffo.fd = fd;
   return fasl_entry(tc, fasl_type_visit_revisit, &uffo);
 }
 
-#define GZ_IO_SIZE_T unsigned int
-
 #ifdef WIN32
 #define IO_SIZE_T unsigned int
 #else /* WIN32 */
@@ -340,28 +336,15 @@ ptr S_boot_read(glzFile file, const char *path) {
 #endif /* WIN32 */
 
 static INT uf_read(unbufFaslFile uf, octet *s, iptr n) {
-  iptr k; INT errnum;
+  iptr k;
   while (n > 0) {
     uptr nx = n;
 
 #if (iptr_bits > 32)
-  if ((WIN32 || gzflag) && (unsigned int)nx != nx) nx = 0xffffffff;
+  if (WIN32 && (unsigned int)nx != nx) nx = 0xffffffff;
 #endif
 
     switch (uf->type) {
-      case UFFO_TYPE_GZ:
-        k = S_glzread(uf->file, s, (GZ_IO_SIZE_T)nx);
-        if (k > 0)
-          n -= k;
-        else if (k == 0)
-          return -1;
-        else {
-          S_glzerror(uf->file, &errnum);
-          S_glzclearerr(uf->file);
-          if (errnum != Z_ERRNO || errno != EINTR)
-            S_error1("", "error reading from ~a", uf->path);
-        }
-        break;
       case UFFO_TYPE_FD:
         k = READ(uf->fd, s, (IO_SIZE_T)nx);
         if (k > 0)
@@ -382,11 +365,6 @@ static INT uf_read(unbufFaslFile uf, octet *s, iptr n) {
 
 static void uf_skipbytes(unbufFaslFile uf, iptr n) {
   switch (uf->type) {
-    case UFFO_TYPE_GZ:
-       if (S_glzseek(uf->file, (long)n, SEEK_CUR) == -1) {
-         S_error1("", "error seeking ~a", uf->path);
-       }
-       break;
     case UFFO_TYPE_FD:
        if (LSEEK(uf->fd, n, SEEK_CUR) == -1) {
          S_error1("", "error seeking ~a", uf->path);
@@ -402,12 +380,14 @@ static octet uf_bytein(unbufFaslFile uf) {
   return buf[0];
 }
 
-static uptr uf_uptrin(unbufFaslFile uf) {
+static uptr uf_uptrin(unbufFaslFile uf, INT *bytes_consumed) {
   uptr n, m; octet k;
 
+  if (bytes_consumed) *bytes_consumed = 1;
   k = uf_bytein(uf);
   n = k >> 1;
   while (k & 1) {
+    if (bytes_consumed) *bytes_consumed += 1;
     k = uf_bytein(uf);
     m = n << 7;
     if (m >> 7 != n) toolarge(uf->path);
@@ -439,6 +419,8 @@ char *S_lookup_machine_type(uptr n) {
 static ptr fasl_entry(ptr tc, IFASLCODE situation, unbufFaslFile uf) {
   ptr x; ptr strbuf = S_G.null_string;
   octet tybuf[1]; IFASLCODE ty; iptr size;
+  /* gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28) co-locates buf and x if we put the declaration of buf down where we use it */
+  octet buf[SBUFSIZ];
 
   for (;;) {
     if (uf_read(uf, tybuf, 1) < 0) return Seof_object; 
@@ -457,10 +439,10 @@ static ptr fasl_entry(ptr tc, IFASLCODE situation, unbufFaslFile uf) {
           uf_bytein(uf) != 'z')
         S_error1("", "malformed fasl-object header (missing magic word) found in ~a", uf->path);
     
-      if ((n = uf_uptrin(uf)) != scheme_version)
+      if ((n = uf_uptrin(uf, (INT *)0)) != scheme_version)
         S_error2("", "incompatible fasl-object version ~a found in ~a", S_string(S_format_scheme_version(n), -1), uf->path);
     
-      if ((n = uf_uptrin(uf)) != machine_type_any && n != machine_type)
+      if ((n = uf_uptrin(uf, (INT *)0)) != machine_type_any && n != machine_type)
         S_error2("", "incompatible fasl-object machine-type ~a found in ~a", S_string(S_lookup_machine_type(n), -1), uf->path);
     
       if (uf_bytein(uf) != '(')
@@ -482,18 +464,45 @@ static ptr fasl_entry(ptr tc, IFASLCODE situation, unbufFaslFile uf) {
         return (ptr)0;
     }
   
-    if (uf_bytein(uf) != fasl_type_fasl_size)
-      S_error1("", "malformed fasl-object header (missing fasl-size) found in ~a", uf->path);
-  
-    size = uf_uptrin(uf);
+    size = uf_uptrin(uf, (INT *)0);
   
     if (ty == situation || situation == fasl_type_visit_revisit || ty == fasl_type_visit_revisit) {
-      struct faslFileObj ffo; octet buf[SBUFSIZ];
+      struct faslFileObj ffo;
 
-      ffo.size = size;
-      ffo.buf = buf;
-      ffo.next = ffo.end = ffo.buf;
-      ffo.uf = uf;
+      ty = uf_bytein(uf);
+      switch (ty) {
+        case fasl_type_gzip:
+        case fasl_type_lz4: {
+          ptr result; INT bytes_consumed;
+          iptr dest_size = uf_uptrin(uf, &bytes_consumed);
+          iptr src_size = size - (1 + bytes_consumed); /* adjust for u8 compression type and uptr dest_size */
+
+          PREPARE_BYTEVECTOR(SRCBV(tc), src_size);
+          PREPARE_BYTEVECTOR(DSTBV(tc), dest_size);
+          if (uf_read(uf, &BVIT(SRCBV(tc),0), src_size) < 0)
+            S_error1("", "unexpected eof in fasl file ~a", uf->path);
+          result = S_bytevector_uncompress(DSTBV(tc), 0, dest_size, SRCBV(tc), 0, src_size,
+                      (ty == fasl_type_gzip ? COMPRESS_GZIP : COMPRESS_LZ4));
+          if (result != FIX(dest_size)) {
+            if (Sstringp(result)) S_error2("fasl-read", "~@?", result, SRCBV(tc));
+            S_error3("fasl-read", "uncompressed size ~s for ~s is smaller than expected size ~s", result, SRCBV(tc), FIX(dest_size));
+          }
+          ffo.size = dest_size;
+          ffo.next = ffo.buf = &BVIT(DSTBV(tc),0);
+          ffo.end = &BVIT(DSTBV(tc),dest_size);
+          ffo.uf = uf;
+          break;
+        }
+        case fasl_type_uncompressed: {
+          ffo.size = size - 1; /* adjust for u8 compression type */
+          ffo.next = ffo.end = ffo.buf = buf;
+          ffo.uf = uf;
+          break;
+        }
+        default:
+          S_error2("", "malformed fasl-object header (missing possibly-compressed, got ~s) found in ~a", FIX(ty), uf->path);
+          return (ptr)0;
+      }
       faslin(tc, &x, S_G.null_vector, &strbuf, &ffo);
       S_flush_instruction_cache(tc);
       return x;
diff --git a/c/gc.c b/c/gc.c
index 3dba4976f1..ed4e3648a2 100644
--- a/c/gc.c
+++ b/c/gc.c
@@ -1485,11 +1485,7 @@ static void sweep_thread(p) ptr p; {
     relocate(&WINDERS(tc))
     relocate_return_addr(&FRAME(tc,0))
     sweep_stack((uptr)SCHEMESTACK(tc), (uptr)SFP(tc), (uptr)FRAME(tc,0));
-    relocate(&U(tc))
-    relocate(&V(tc))
-    relocate(&W(tc))
-    relocate(&X(tc))
-    relocate(&Y(tc))
+    U(tc) = V(tc) = W(tc) = X(tc) = Y(tc) = 0;
     /* immediate SOMETHINGPENDING(tc) */
     /* immediate TIMERTICKS */
     /* immediate DISABLE_COUNT */
@@ -1528,6 +1524,7 @@ static void sweep_thread(p) ptr p; {
     for (i = 0 ; i < virtual_register_count ; i += 1) {
       relocate(&VIRTREG(tc, i));
     }
+    DSTBV(tc) = SRCBV(tc) = Sfalse;
   }
 }
 
diff --git a/c/scheme.c b/c/scheme.c
index 5203c3362f..d6a5afba89 100644
--- a/c/scheme.c
+++ b/c/scheme.c
@@ -19,12 +19,18 @@
 #include <setjmp.h>
 #include <limits.h>
 #ifdef WIN32
+#include <io.h>
 #include <time.h>
 #else
 #include <sys/time.h>
 #endif
+#include <fcntl.h>
 #include <stddef.h>
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif /* O_BINARY */
+
 static INT boot_count;
 static IBOOL verbose;
 
@@ -556,7 +562,7 @@ static IBOOL next_path(path, name, ext, sp, dsp) char *path; const char *name, *
 /* BOOT FILES */
 
 typedef struct {
-  glzFile file;
+  INT fd;
   char path[PATH_MAX];
 } boot_desc;
 
@@ -564,8 +570,9 @@ typedef struct {
 static boot_desc bd[MAX_BOOT_FILES];
 
 /* locally defined functions */
-static uptr zget_uptr PROTO((glzFile file, uptr *pn));
-static INT zgetstr PROTO((glzFile file, char *s, iptr max));
+static char get_u8 PROTO((INT fd));
+static uptr get_uptr PROTO((INT fd, uptr *pn));
+static INT get_string PROTO((INT fd, char *s, iptr max, INT *c));
 static IBOOL find_boot PROTO((const char *name, const char *ext, int fd, IBOOL errorp));
 static void load PROTO((ptr tc, iptr n, IBOOL base));
 static void check_boot_file_state PROTO((const char *who));
@@ -575,12 +582,7 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
   uptr n = 0;
   INT c;
   const char *path;
-#ifdef WIN32
-  wchar_t *expandedpath;
-#else
   char *expandedpath;
-#endif
-  glzFile file;
 
   if ((fd != -1) || S_fixedpathp(name)) {
     if (strlen(name) >= PATH_MAX) {
@@ -590,22 +592,13 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
 
     path = name;
 
-    if (fd != -1) {
-      file = S_glzdopen_input(fd);
-    } else {
-#ifdef WIN32
-      expandedpath = S_malloc_wide_pathname(path);
-      file = S_glzopen_input_w(expandedpath);
-#else
+    if (fd == -1) {
       expandedpath = S_malloc_pathname(path);
-      file = S_glzopen_input(expandedpath);
-#endif
-      /* assumption (seemingly true based on a glance at the source code):
-         S_glzopen_input doesn't squirrel away a pointer to expandedpath. */
+      fd = OPEN(expandedpath, O_BINARY|O_RDONLY, 0);
       free(expandedpath);
     }
 
-    if (!file) {
+    if (fd == -1) {
       if (errorp) {
         fprintf(stderr, "cannot open boot file %s\n", path);
         S_abnormal_exit();
@@ -617,22 +610,22 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
     if (verbose) fprintf(stderr, "trying %s...opened\n", path);
 
    /* check for magic number */
-    if (S_glzgetc(file) != fasl_type_header ||
-        S_glzgetc(file) != 0 ||
-        S_glzgetc(file) != 0 ||
-        S_glzgetc(file) != 0 ||
-        S_glzgetc(file) != 'c' ||
-        S_glzgetc(file) != 'h' ||
-        S_glzgetc(file) != 'e' ||
-        S_glzgetc(file) != 'z') {
+    if (get_u8(fd) != fasl_type_header ||
+        get_u8(fd) != 0 ||
+        get_u8(fd) != 0 ||
+        get_u8(fd) != 0 ||
+        get_u8(fd) != 'c' ||
+        get_u8(fd) != 'h' ||
+        get_u8(fd) != 'e' ||
+        get_u8(fd) != 'z') {
       fprintf(stderr, "malformed fasl-object header in %s\n", path);
       S_abnormal_exit();
     }
 
    /* check version */
-    if (zget_uptr(file, &n) != 0) {
+    if (get_uptr(fd, &n) != 0) {
       fprintf(stderr, "unexpected end of file on %s\n", path);
-      S_glzclose(file);
+      CLOSE(fd);
       S_abnormal_exit();
     }
 
@@ -640,21 +633,21 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
       fprintf(stderr, "%s is for Version %s; ", path, S_format_scheme_version(n));
      /* use separate fprintf since S_format_scheme_version returns static string */
       fprintf(stderr, "need Version %s\n", S_format_scheme_version(scheme_version));
-      S_glzclose(file);
+      CLOSE(fd);
       S_abnormal_exit();
     }
 
    /* check machine type */
-    if (zget_uptr(file, &n) != 0) {
+    if (get_uptr(fd, &n) != 0) {
       fprintf(stderr, "unexpected end of file on %s\n", path);
-      S_glzclose(file);
+      CLOSE(fd);
       S_abnormal_exit();
     }
 
     if (n != machine_type) {
       fprintf(stderr, "%s is for machine-type %s; need machine-type %s\n", path,
               S_lookup_machine_type(n), S_lookup_machine_type(machine_type));
-      S_glzclose(file);
+      CLOSE(fd);
       S_abnormal_exit();
     }
   } else {
@@ -675,17 +668,10 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
         }
       }
 
-#ifdef WIN32
-      expandedpath = S_malloc_wide_pathname(path);
-      file = S_glzopen_input_w(expandedpath);
-#else
       expandedpath = S_malloc_pathname(path);
-      file = S_glzopen_input(expandedpath);
-#endif
-      /* assumption (seemingly true based on a glance at the source code):
-         S_glzopen_input doesn't squirrel away a pointer to expandedpath. */
+      fd = OPEN(expandedpath, O_BINARY|O_RDONLY, 0);
       free(expandedpath);
-      if (!file) {
+      if (fd == -1) {
         if (verbose) fprintf(stderr, "trying %s...cannot open\n", path);
         continue;
       }
@@ -693,23 +679,23 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
       if (verbose) fprintf(stderr, "trying %s...opened\n", path);
 
      /* check for magic number */
-      if (S_glzgetc(file) != fasl_type_header ||
-          S_glzgetc(file) != 0 ||
-          S_glzgetc(file) != 0 ||
-          S_glzgetc(file) != 0 ||
-          S_glzgetc(file) != 'c' ||
-          S_glzgetc(file) != 'h' ||
-          S_glzgetc(file) != 'e' ||
-          S_glzgetc(file) != 'z') {
+      if (get_u8(fd) != fasl_type_header ||
+          get_u8(fd) != 0 ||
+          get_u8(fd) != 0 ||
+          get_u8(fd) != 0 ||
+          get_u8(fd) != 'c' ||
+          get_u8(fd) != 'h' ||
+          get_u8(fd) != 'e' ||
+          get_u8(fd) != 'z') {
         if (verbose) fprintf(stderr, "malformed fasl-object header in %s\n", path);
-        S_glzclose(file);
+        CLOSE(fd);
         continue;
       }
 
      /* check version */
-      if (zget_uptr(file, &n) != 0) {
+      if (get_uptr(fd, &n) != 0) {
         if (verbose) fprintf(stderr, "unexpected end of file on %s\n", path);
-        S_glzclose(file);
+        CLOSE(fd);
         continue;
       }
 
@@ -719,14 +705,14 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
          /* use separate fprintf since S_format_scheme_version returns static string */
           fprintf(stderr, "need Version %s\n", S_format_scheme_version(scheme_version));
         }
-        S_glzclose(file);
+        CLOSE(fd);
         continue;
       }
 
      /* check machine type */
-      if (zget_uptr(file, &n) != 0) {
+      if (get_uptr(fd, &n) != 0) {
         if (verbose) fprintf(stderr, "unexpected end of file on %s\n", path);
-        S_glzclose(file);
+        CLOSE(fd);
         continue;
       }
 
@@ -734,7 +720,7 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
         if (verbose)
           fprintf(stderr, "%s is for machine-type %s; need machine-type %s\n", path,
                   S_lookup_machine_type(n), S_lookup_machine_type(machine_type));
-        S_glzclose(file);
+        CLOSE(fd);
         continue;
       }
 
@@ -744,58 +730,61 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
 
   if (verbose) fprintf(stderr, "version and machine type check\n");
 
-  if (S_glzgetc(file) != '(') {  /* ) */
+  if (get_u8(fd) != '(') {  /* ) */
     fprintf(stderr, "malformed boot file %s\n", path);
-    S_glzclose(file);
+    CLOSE(fd);
     S_abnormal_exit();
   }
 
   /* ( */
-  if ((c = S_glzgetc(file)) == ')') {
+  if ((c = get_u8(fd)) == ')') {
     if (boot_count != 0) {
       fprintf(stderr, "base boot file %s must come before other boot files\n", path);
-      S_glzclose(file);
+      CLOSE(fd);
       S_abnormal_exit();
     }
   } else {
     if (boot_count == 0) {
       for (;;) {
-        S_glzungetc(c, file);
        /* try to load heap or boot file this boot file requires */
-        if (zgetstr(file, buf, PATH_MAX) != 0) {
+        if (get_string(fd, buf, PATH_MAX, &c) != 0) {
           fprintf(stderr, "unexpected end of file on %s\n", path);
-          S_glzclose(file);
+          CLOSE(fd);
           S_abnormal_exit();
         }
         if (find_boot(buf, ".boot", -1, 0)) break;
-        if ((c = S_glzgetc(file)) == ')') {
+        if (c == ')') {
           char *sep; char *wastebuf[8];
-          fprintf(stderr, "cannot find subordinate boot file ");
-          S_glzrewind(file);
-          (void) S_glzread(file, wastebuf, 8); /* magic number */
-          (void) zget_uptr(file, &n); /* version */
-          (void) zget_uptr(file, &n); /* machine type */
-          (void) S_glzgetc(file);        /* open paren */
-          for (sep = ""; ; sep = "or ") {
-            if ((c = S_glzgetc(file)) == ')') break;
-            S_glzungetc(c, file);
-            (void) zgetstr(file, buf, PATH_MAX);
+          fprintf(stderr, "cannot find subordinate boot file");
+          if (LSEEK(fd, 0, SEEK_SET) != 0 || READ(fd, wastebuf, 8) != 8) { /* attempt to rewind and read magic number */
+            fprintf(stderr, "---retry with verbose flag for more information\n");
+            CLOSE(fd);
+            S_abnormal_exit();
+          }
+          (void) get_uptr(fd, &n); /* version */
+          (void) get_uptr(fd, &n); /* machine type */
+          (void) get_u8(fd);        /* open paren */
+          c = get_u8(fd);
+          for (sep = " "; ; sep = "or ") {
+            if (c == ')') break;
+            (void) get_string(fd, buf, PATH_MAX, &c);
             fprintf(stderr, "%s%s.boot ", sep, buf);
           }
           fprintf(stderr, "required by %s\n", path);
-          S_glzclose(file);
+          CLOSE(fd);
           S_abnormal_exit();
         }
       }
     }
 
    /* skip to end of header */
-    while ((c = S_glzgetc(file)) != ')') {
+    while (c != ')') {
       if (c < 0) {
         fprintf(stderr, "malformed boot file %s\n", path);
-        S_glzclose(file);
+        CLOSE(fd);
         S_abnormal_exit();
       }
+      c = get_u8(fd);
     }
   }
 
@@ -804,21 +793,27 @@ static IBOOL find_boot(name, ext, fd, errorp) const char *name, *ext; int fd; IB
     S_abnormal_exit();
   }
 
-  bd[boot_count].file = file;
+  bd[boot_count].fd = fd;
   strcpy(bd[boot_count].path, path);
   boot_count += 1;
 
   return 1;
 }
 
-static uptr zget_uptr(glzFile file, uptr *pn) {
+static char get_u8(INT fd) {
+  char buf[1];
+  if (READ(fd, &buf, 1) != 1) return -1;
+  return buf[0];
+}
+
+static uptr get_uptr(INT fd, uptr *pn) {
   uptr n, m; int c; octet k;
 
-  if ((c = S_glzgetc(file)) < 0) return -1;
+  if ((c = get_u8(fd)) < 0) return -1;
   k = (octet)c;
   n = k >> 1;
   while (k & 1) {
-    if ((c = S_glzgetc(file)) < 0) return -1;
+    if ((c = get_u8(fd)) < 0) return -1;
     k = (octet)c;
     m = n << 7;
     if (m >> 7 != n) return -1;
@@ -828,19 +823,17 @@ static uptr zget_uptr(glzFile file, uptr *pn) {
   return 0;
 }
 
-static INT zgetstr(file, s, max) glzFile file; char *s; iptr max; {
-  ICHAR c;
-
+static INT get_string(fd, s, max, c) INT fd; char *s; iptr max; INT *c; {
   while (max-- > 0) {
-    if ((c = S_glzgetc(file)) < 0) return -1;
-    if (c == ' ' || c == ')') {
-      if (c == ')') S_glzungetc(c, file);
+    if (*c < 0) return -1;
+    if (*c == ' ' || *c == ')') {
+      if (*c == ' ') *c = get_u8(fd);
       *s = 0;
       return 0;
     }
-    *s++ = c;
+    *s++ = *c;
+    *c = get_u8(fd);
   }
-
   return -1;
 }
 
@@ -861,27 +854,27 @@ static void load(tc, n, base) ptr tc; iptr n; IBOOL base; {
   ptr x; iptr i;
 
   if (base) {
-    S_G.error_invoke_code_object = S_boot_read(bd[n].file, bd[n].path);
+    S_G.error_invoke_code_object = S_boot_read(bd[n].fd, bd[n].path);
     if (!Scodep(S_G.error_invoke_code_object)) {
       (void) fprintf(stderr, "first object on boot file not code object\n");
       S_abnormal_exit();
     }
 
-    S_G.invoke_code_object = S_boot_read(bd[n].file, bd[n].path);
+    S_G.invoke_code_object = S_boot_read(bd[n].fd, bd[n].path);
     if (!Scodep(S_G.invoke_code_object)) {
       (void) fprintf(stderr, "second object on boot file not code object\n");
       S_abnormal_exit();
     }
-    S_G.base_rtd = S_boot_read(bd[n].file, bd[n].path);
+    S_G.base_rtd = S_boot_read(bd[n].fd, bd[n].path);
     if (!Srecordp(S_G.base_rtd)) {
       S_abnormal_exit();
     }
   }
 
   i = 0;
-  while (i++ < LOADSKIP && S_boot_read(bd[n].file, bd[n].path) != Seof_object);
+  while (i++ < LOADSKIP && S_boot_read(bd[n].fd, bd[n].path) != Seof_object);
 
-  while ((x = S_boot_read(bd[n].file, bd[n].path)) != Seof_object) {
+  while ((x = S_boot_read(bd[n].fd, bd[n].path)) != Seof_object) {
     if (loadecho) {
       printf("%ld: ", (long)i);
       fflush(stdout);
@@ -893,16 +886,6 @@ static void load(tc, n, base) ptr tc; iptr n; IBOOL base; {
       S_initframe(tc, 1);
       S_put_arg(tc, 1, x);
       x = boot_call(tc, S_G.load_binary, 1);
-    } else if (Svectorp(x)) {
-      iptr j, n;
-      n = Svector_length(x);
-      for (j = 0; j < n; j += 1) {
-        ptr y = Svector_ref(x, j);
-        if (Sprocedurep(y)) {
-          S_initframe(tc, 0);
-          INITVECTIT(x, j) = boot_call(tc, y, 0);
-        }
-      }
     }
     if (loadecho) {
       S_prin1(x);
@@ -913,7 +896,7 @@ static void load(tc, n, base) ptr tc; iptr n; IBOOL base; {
   }
 
   S_G.load_binary = Sfalse;
-  S_glzclose(bd[n].file);
+  CLOSE(bd[n].fd);
 }
 
 /***************************************************************************/
diff --git a/c/thread.c b/c/thread.c
index ae96e1f69f..46e8ad49fb 100644
--- a/c/thread.c
+++ b/c/thread.c
@@ -105,6 +105,8 @@ ptr S_create_thread_object(who, p_tc) const char *who; ptr p_tc; {
     VIRTREG(tc, i) = FIX(0);
   }
 
+  DSTBV(tc) = SRCBV(tc) = Sfalse;
+
  /* S_thread had better not do thread-local allocation */
   thread = S_thread(tc);
 
diff --git a/csug/intro.stex b/csug/intro.stex
index dc921120f2..7f0e1b22cb 100644
--- a/csug/intro.stex
+++ b/csug/intro.stex
@@ -97,7 +97,8 @@ Daniel, George Davidson, Matthew Flatt, Aziz Ghuloum, Bob Hieb, Andy Keep, and O
 contributed substantially to the development of {\ChezScheme}.
 {\ChezScheme}'s expression editor is based on a command-line editor for
 Scheme developed from 1989 through 1994 by C.~David Boyer.
-File compression is performed with the use of the zlib compression library
+File compression is performed with the use of the lz4 compression
+library developed by Yann Collet or the zlib compression library
 developed by Jean-loup Gailly and Mark Adler.
 Implementations of the list and vector sorting routines are based on
 Olin Shiver's opportunistic merge-sort algorithm and implementation.
diff --git a/csug/io.stex b/csug/io.stex
index db638736db..4678fab109 100644
--- a/csug/io.stex
+++ b/csug/io.stex
@@ -3390,6 +3390,15 @@ An exception is raised with condition-type \scheme{&assertion} if
 \var{obj} or any portion of \var{obj} has no external fasl representation,
 e.g., if \var{obj} is or contains a procedure.
 
+The fasl representation of \var{obj} is compressed if the parameter
+\scheme{fasl-compressed}, described below, is set to \scheme{#t},
+its default value.
+For this reason, \var{binary-output-port} generally should not be opened
+with the compressed option.
+A warning is issued (an exception with condition type \scheme{&warning}
+is raised) on the first attempt to write fasl objects to or read
+fasl objects from a compressed file.
+
 \schemedisplay
 (define bop (open-file-output-port "tmp.fsl"))
 (fasl-write '(a b c) bop)
@@ -3430,6 +3439,14 @@ corresponding to source code within an \scheme{eval-when} form with
 situation \scheme{load} or situations \scheme{visit} and \scheme{revisit})
 are never skipped.
 
+\scheme{fasl-read} automatically decompresses the representation
+of each fasl object written in compressed format by \scheme{fasl-write}.
+Thus, \var{binary-input-port} generally should not be opened with
+the compressed option.
+A warning is issued (an exception with condition type \scheme{&warning}
+is raised) on the first attempt to write fasl objects to or read
+fasl objects from a compressed file.
+
 \schemedisplay
 (define bop (open-file-output-port "tmp.fsl"))
 (fasl-write '(a b c) bop)
@@ -3441,6 +3458,23 @@ are never skipped.
 (close-port bip)
 \endschemedisplay
 
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{fasl-compressed}{\categorythreadparameter}{fasl-compressed}
+\listlibraries
+\endentryheader
+
+\noindent
+When this parameter is set to its default value, \scheme{#t},
+\scheme{fasl-write} compresses the representation of each object
+as it writes it, often resulting in substantially smaller output
+but possibly taking more time to write and read.
+The compression format and level are determined by the
+\index{\scheme{compress-format}}\scheme{compress-format}
+and
+\index{\scheme{compress-level}}\scheme{compress-level}
+parameters.
+
 
 %----------------------------------------------------------------------------
 \entryheader
diff --git a/csug/system.stex b/csug/system.stex
index 0529cfbcc1..b456a9e20f 100644
--- a/csug/system.stex
+++ b/csug/system.stex
@@ -1247,11 +1247,6 @@ to 3 just while the remainder of file is compiled.
 \scheme{compile-script} is like \scheme{compile-file} but differs in
 that it copies the leading \scheme{#!} line from the
 source-file script into the object file.
-When the \scheme{#!} line is present it is uncompressed in the output
-file even when the parameter
-\index{\scheme{compile-compressed}}\scheme{compile-compressed} is
-set to \scheme{#t}, causing the remainder of the file to be compressed.
-This allows it to be interpreted properly by the operating system.
 
 \scheme{compile-script} permits compiled script files to be created from
 source script to reduce script load time.
@@ -1514,9 +1509,6 @@ If \var{covop} is supplied, \scheme{compile-port} sends coverage information to
 The ports are closed automatically after compilation under the assumption
 the program that opens the ports and invokes \scheme{compile-port}
 will take care of closing the ports.
-Output will be compressed only if an output port is already set up to be
-compressed, e.g., if it was opened with the \scheme{compressed}
-file option.
 
 %----------------------------------------------------------------------------
 \entryheader
@@ -1552,9 +1544,6 @@ If \var{covop} is present, \var{compile-to-port} sends coverage information to
 The ports are not closed automatically after compilation under the assumption
 the program that opens the port and invokes \scheme{compile-to-port}
 will take care of closing the port.
-Output will be compressed only if an output port is already set up to be
-compressed, e.g., if it was opened with the \scheme{compressed}
-file option.
 
 When \var{obj-list} contains a single list-structured element whose
 first-element is the symbol \scheme{top-level-program},
@@ -2590,25 +2579,6 @@ name by replacing the object-file extension (normally \scheme{.so})
 with \scheme{.wpo}, or adding the extension \scheme{.wpo} if the
 object filename has no extension or has the extension \scheme{.wpo}.
 
-%----------------------------------------------------------------------------
-\entryheader
-\formdef{compile-compressed}{\categorythreadparameter}{compile-compressed}
-\listlibraries
-\endentryheader
-
-\noindent
-When this parameter is \scheme{#t}, the default, \scheme{compile-file},
-\scheme{compile-library}, \scheme{compile-script},
-\scheme{compile-program}, \scheme{compile-to-file},
-\scheme{compile-whole-program}, and \scheme{strip-fasl-file} compress
-the object files they create.
-The compression format and level are determined by the
-\index{\scheme{compress-format}}\scheme{compress-format}
-and
-\index{\scheme{compress-level}}\scheme{compress-level}
-parameters.
-
-
 %----------------------------------------------------------------------------
 \entryheader
 \formdef{compile-file-message}{\categorythreadparameter}{compile-file-message}
@@ -3194,10 +3164,9 @@ set of tests.
 One covin file is created for each object file, with the object-file
 extension replaced by the extension \scheme{.covin}.
 Each covin file contains the printed representation of a source table
-(Section~\ref{SECTSYNTAXSOURCETABLES}), compressed when the parameter
-\scheme{compile-compressed} is true, mapping each profiled source
-expression found during the compilation of the corresponding source
-file to a count of zero.
+(Section~\ref{SECTSYNTAXSOURCETABLES}), compressed using the compression
+format and level specified by \scheme{compress-format} and
+\scheme{compress-level}.
 This information can be read via
 \index{\scheme{get-source-table!}}\scheme{get-source-table!} and used
 as a universe of source expressions to identify source expressions
diff --git a/csug/use.stex b/csug/use.stex
index 521f96ab4d..fe8a9a54f9 100644
--- a/csug/use.stex
+++ b/csug/use.stex
@@ -1011,11 +1011,9 @@ command.
 \endschemedisplay
 
 Scripts may be compiled using \index{\scheme{compile-script}}\scheme{compile-script}, which is like
-\scheme{compile-file} but differs in two ways:
-(1) it copies the leading \scheme{#!} line from the source-file script
-into the object file, and (2) when the \scheme{#!} line is present,
-it disables the default compression of the resulting file, which would
-otherwise prevent it from being recognized as a script file.
+\scheme{compile-file} but differs in that it
+copies the leading \scheme{#!} line from the source-file script
+into the object file.
 
 If {\PetiteChezScheme} is installed, but not {\ChezScheme},
 \scheme{/usr/bin/scheme} may be
diff --git a/mats/6.ms b/mats/6.ms
index 235c8d86fd..102f84bef5 100644
--- a/mats/6.ms
+++ b/mats/6.ms
@@ -887,6 +887,26 @@
  )
 
 (mat fasl
+  (error?
+    (separate-eval '(let ([op (open-file-output-port "testfile.ss" (file-options compressed replace))])
+                      (fasl-write 3 op))))
+  (error?
+    (separate-eval '(let ([ip (open-file-input-port "testfile.ss" (file-options compressed))])
+                      (fasl-read ip))))
+  (equal?
+    (separate-eval '(with-exception-handler
+                      (lambda (c) (unless (warning? c) (raise-continuable c)))
+                      (lambda ()
+                        (let ([op (open-file-output-port "testfile.ss" (file-options compressed replace))])
+                          (fasl-write 3 op)))))
+    "")
+  (equal?
+    (separate-eval `(with-exception-handler
+                      (lambda (c) (unless (warning? c) (raise-continuable c)))
+                      (lambda ()
+                        (let ([ip (open-file-input-port "testfile.ss" (file-options compressed))])
+                          (fasl-read ip)))))
+    "3\n")
   (pretty-equal?
     (begin
       (call-with-port
@@ -926,10 +946,10 @@
           (open-file-input-port "testfile.ss")
           (get-stuff fasl-read))
         (call-with-port
-          (open-file-input-port "testfile.ss" (file-options compressed))
+          (open-file-input-port "testfile.ss" (file-options #;compressed))
           (get-stuff fasl-read))
         (call-with-port
-          (open-file-input-port "testfile.ss" (file-options compressed))
+          (open-file-input-port "testfile.ss" (file-options #;compressed))
           (get-stuff (lambda (p)
                        (when (eof-object? (lookahead-u8 p)) (printf "done\n"))
                        (fasl-read p))))
diff --git a/mats/7.ms b/mats/7.ms
index 076944170b..073eb89b4c 100644
--- a/mats/7.ms
+++ b/mats/7.ms
@@ -47,7 +47,7 @@
      (set! aaaaa 0)
      (load "testfile.so")
      (eqv? aaaaa 7))
-   (parameterize ([compile-compressed #f])
+   (parameterize ([fasl-compressed #f])
      (printf "***** expect \"compile-file\" message:~%")
      (compile-file "testfile")
      (set! aaaaa 0)
@@ -62,7 +62,7 @@
      (load "testfile.so")
      (eqv? aaaaa -7))
    (let ((ip (open-input-string "(let ((x -3) (y -4)) (set! aaaaa (+ x y)))"))
-         (op (open-file-output-port "testfile.so" (file-options replace compressed))))
+         (op (open-file-output-port "testfile.so" (file-options replace #;compressed))))
      (compile-port ip op)
      (close-input-port ip)
      (close-port op)
@@ -98,7 +98,7 @@
       'replace)
     #t)
   (equal?
-    (call-with-port (open-file-output-port "testfile.so" (file-options replace compressed))
+    (call-with-port (open-file-output-port "testfile.so" (file-options replace #;compressed))
       (lambda (op)
         (parameterize ([compile-imported-libraries #t])
           (compile-to-port
@@ -861,19 +861,19 @@
       '(printf "qq => ~a\n" qq))
     (delete-file "testfile-mc-2a.so")
     (delete-file "testfile-mc-2.so")
-    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [compile-compressed #f]) (maybe-compile-program x))) 'mc-2))
+    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [fasl-compressed #f]) (maybe-compile-program x))) 'mc-2))
     #t)
   (begin
     (let ([p (open-file-input/output-port "testfile-mc-2a.so" (file-options no-create no-fail no-truncate))])
       (set-port-length! p 73)
       (close-port p))
-    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [compile-compressed #f] [import-notify #t]) (maybe-compile-program x))) 'mc-2))
+    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [fasl-compressed #f] [import-notify #t]) (maybe-compile-program x))) 'mc-2))
     #t)
   (begin
     (let ([p (open-file-input/output-port "testfile-mc-2.so" (file-options no-create no-fail no-truncate))])
       (set-port-length! p 87)
       (close-port p))
-    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [compile-compressed #f] [import-notify #t]) (maybe-compile-program x))) 'mc-2))
+    (display-string (separate-compile '(lambda (x) (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [fasl-compressed #f] [import-notify #t]) (maybe-compile-program x))) 'mc-2))
     #t)
   ; make sure maybe-compile-file handles missing include files gracefully
   (begin
@@ -1174,10 +1174,10 @@
     (separate-compile
       `(lambda (x)
          (call-with-port
-           (open-file-output-port (format "~a.so" x) (file-options compressed replace))
+           (open-file-output-port (format "~a.so" x) (file-options #;compressed replace))
            (lambda (op)
              (call-with-port
-               (open-file-output-port (format "~a.host" x) (file-options compressed replace))
+               (open-file-output-port (format "~a.host" x) (file-options #;compressed replace))
                (lambda (hostop)
                  (compile-to-port
                    '((library (testfile-hop1)
@@ -5191,12 +5191,12 @@ evaluating module init
     (let ()
       (define fake-concatenate-object-files
         (lambda (outfn infn . infn*)
-          (call-with-port (open-file-output-port outfn (file-options compressed replace))
+          (call-with-port (open-file-output-port outfn (file-options #;compressed replace))
             (lambda (op)
               (for-each
                 (lambda (infn)
                   (put-bytevector op
-                    (call-with-port (open-file-input-port infn (file-options compressed)) get-bytevector-all)))
+                    (call-with-port (open-file-input-port infn (file-options #;compressed)) get-bytevector-all)))
                 (cons infn infn*))))))
       (fake-concatenate-object-files "testfile-cof1fooP.so" "testfile-cof1foo.so" "testfile-cof1P.so")
       (fake-concatenate-object-files "testfile-cof1barB.so" "testfile-cof1bar.so" "testfile-cof1B.so"))
diff --git a/mats/bytevector.ms b/mats/bytevector.ms
index ea574b7610..6b2d82f4fc 100644
--- a/mats/bytevector.ms
+++ b/mats/bytevector.ms
@@ -11283,8 +11283,9 @@
     (error? (bytevector-uncompress "hello"))
     (begin
       (define (round-trip-bytevector-compress bv)
-        (equal? (bytevector-uncompress (bytevector-compress bv))
-                bv))
+        (and
+          (equal? (#%$bytevector-uncompress (#%$bytevector-compress bv 0) (bytevector-length bv) 0) bv)
+          (equal? (bytevector-uncompress (bytevector-compress bv)) bv)))
       (round-trip-bytevector-compress (string->utf8 "hello")))
     (round-trip-bytevector-compress '#vu8())
     (round-trip-bytevector-compress (apply bytevector
@@ -11293,6 +11294,8 @@
                                                  '()
                                                  (cons (bitwise-and i 255)
                                                        (loop (+ i 1)))))))
+    (round-trip-bytevector-compress 
+      (call-with-port (open-file-input-port "prettytest.ss") get-bytevector-all))
     (error?
      ;; Need at least 8 bytes for result size
      (bytevector-uncompress '#vu8()))
diff --git a/mats/misc.ms b/mats/misc.ms
index 5cf012d31f..f1c6158773 100644
--- a/mats/misc.ms
+++ b/mats/misc.ms
@@ -1587,6 +1587,9 @@
         (pretty-print '(pretty-print (not (((inspect/object sff-1a-x) 'code) 'source))))
         (pretty-print '(pretty-print (= (length (profile-dump)) preexisting-entries))))
       'replace)
+    (delete-file "testfile-sff-1a.so")
+    (delete-file "testfile-sff-1b.so")
+    (delete-file "testfile-sff-1c.so")
     (separate-compile
       '(lambda (x)
          (parameterize ([generate-inspector-information #t]
diff --git a/mats/patch-compile-0-f-f-t b/mats/patch-compile-0-f-f-t
index 4d92329593..99ad606307 100644
--- a/mats/patch-compile-0-f-f-t
+++ b/mats/patch-compile-0-f-f-t
@@ -1,7 +1,7 @@
-*** errors-compile-0-f-f-f	2019-08-29 13:04:56.353541282 -0400
---- errors-compile-0-f-f-t	2019-08-29 13:13:37.159245573 -0400
+*** errors-compile-0-f-f-f	2020-02-28 00:39:54.092147000 -0500
+--- errors-compile-0-f-f-t	2020-02-28 00:49:23.793545013 -0500
 ***************
-*** 3699,3705 ****
+*** 3887,3893 ****
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
@@ -9,7 +9,7 @@
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
   misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3699,3705 ----
+--- 3887,3893 ----
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
@@ -18,7 +18,7 @@
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
   misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
 ***************
-*** 7182,7192 ****
+*** 7426,7436 ****
   7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
@@ -30,7 +30,7 @@
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 7182,7192 ----
+--- 7426,7436 ----
   7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
@@ -43,7 +43,7 @@
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
 ***************
-*** 8625,8637 ****
+*** 8890,8902 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -57,7 +57,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8625,8637 ----
+--- 8890,8902 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
diff --git a/mats/patch-compile-0-f-t-f b/mats/patch-compile-0-f-t-f
index d48e8c4c9c..2f99034ab9 100644
--- a/mats/patch-compile-0-f-t-f
+++ b/mats/patch-compile-0-f-t-f
@@ -1,5 +1,5 @@
-*** errors-compile-0-f-f-f	2020-02-11 17:27:14.000000000 -0800
---- errors-compile-0-f-t-f	2020-02-11 16:54:20.000000000 -0800
+*** errors-compile-0-f-f-f	2020-02-28 19:40:51.000000000 -0800
+--- errors-compile-0-f-t-f	2020-02-28 19:05:59.000000000 -0800
 ***************
 *** 178,184 ****
   3.mo:Expected error in mat dipa-letrec: "attempt to reference undefined variable a".
@@ -58,7 +58,7 @@
   3.mo:Expected error in mat mrvs: "attempt to apply non-procedure 17".
   3.mo:Expected error in mat mrvs: "returned two values to single value return context".
 ***************
-*** 3873,3879 ****
+*** 3929,3935 ****
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -66,7 +66,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
---- 3873,3879 ----
+--- 3929,3935 ----
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -75,7 +75,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
 ***************
-*** 7378,7385 ****
+*** 7436,7443 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -84,7 +84,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 7378,7385 ----
+--- 7436,7443 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -94,7 +94,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 7387,7401 ****
+*** 7445,7459 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -110,7 +110,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 7387,7401 ----
+--- 7445,7459 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -127,7 +127,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7408,7433 ****
+*** 7466,7491 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -154,7 +154,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7408,7433 ----
+--- 7466,7491 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -182,7 +182,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7558,7596 ****
+*** 7616,7654 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -222,7 +222,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7558,7596 ----
+--- 7616,7654 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -263,7 +263,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7605,7661 ****
+*** 7663,7719 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
@@ -321,7 +321,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
---- 7605,7661 ----
+--- 7663,7719 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
diff --git a/mats/patch-compile-0-t-f-f b/mats/patch-compile-0-t-f-f
index d00f8155b5..6d5c4efe7e 100644
--- a/mats/patch-compile-0-t-f-f
+++ b/mats/patch-compile-0-t-f-f
@@ -1,5 +1,5 @@
-*** errors-compile-0-f-f-f	2020-02-11 17:27:14.000000000 -0800
---- errors-compile-0-t-f-f	2020-02-11 17:02:13.000000000 -0800
+*** errors-compile-0-f-f-f	2020-02-28 19:40:51.000000000 -0800
+--- errors-compile-0-t-f-f	2020-02-28 19:14:24.000000000 -0800
 ***************
 *** 146,152 ****
   3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
@@ -3719,7 +3719,7 @@
   bytevector.mo:Expected error in mat bytevector=?: "bytevector=?: "a" is not a bytevector".
   bytevector.mo:Expected error in mat tspl/csug-examples: "invalid endianness "spam"".
 ***************
-*** 3767,3787 ****
+*** 3823,3843 ****
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: invalid data in source bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: bytevector #vu8(255 255 255 255 255 255 ...) claims invalid uncompressed size <int>".
   profile.mo:Expected error in mat compile-profile: "compile-profile: invalid mode src [must be #f, #t, source, or block]".
@@ -3741,7 +3741,7 @@
   profile.mo:Expected error in mat compile-profile: "profile-dump-data: #t is not a string".
   profile.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump 17".
   profile.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump (17)".
---- 3767,3787 ----
+--- 3823,3843 ----
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: invalid data in source bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: bytevector #vu8(255 255 255 255 255 255 ...) claims invalid uncompressed size <int>".
   profile.mo:Expected error in mat compile-profile: "compile-profile: invalid mode src [must be #f, #t, source, or block]".
@@ -3764,7 +3764,7 @@
   profile.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump 17".
   profile.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump (17)".
 ***************
-*** 3803,3814 ****
+*** 3859,3870 ****
   profile.mo:Expected error in mat profile-form: "profile subform is not a source object 3".
   misc.mo:Expected error in mat compiler1: "variable i-am-not-bound is not bound".
   misc.mo:Expected error in mat compiler1: "attempt to apply non-procedure oops".
@@ -3777,7 +3777,7 @@
   misc.mo:Expected error in mat compiler3: "incorrect argument count in call (consumer 1 2) at line 3, char 19 of testfile.ss".
   misc.mo:Expected error in mat compiler3: "incorrect argument count in call (consumer 1 2)".
   misc.mo:Expected error in mat compiler3: "variable goto is not bound".
---- 3803,3814 ----
+--- 3859,3870 ----
   profile.mo:Expected error in mat profile-form: "profile subform is not a source object 3".
   misc.mo:Expected error in mat compiler1: "variable i-am-not-bound is not bound".
   misc.mo:Expected error in mat compiler1: "attempt to apply non-procedure oops".
@@ -3791,7 +3791,7 @@
   misc.mo:Expected error in mat compiler3: "incorrect argument count in call (consumer 1 2)".
   misc.mo:Expected error in mat compiler3: "variable goto is not bound".
 ***************
-*** 3896,3902 ****
+*** 3952,3958 ****
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: failed for probably-does-not-exist: no such file or directory".
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: failed for probably-does-not-exist: no such file or directory".
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: record comparison failed while comparing testfile-fatfib1.so and testfile-fatfib3.so within fasl entry 4".
@@ -3799,7 +3799,7 @@
   misc.mo:Expected error in mat cost-center: "with-cost-center: foo is not a cost center".
   misc.mo:Expected error in mat cost-center: "with-cost-center: bar is not a procedure".
   misc.mo:Expected error in mat cost-center: "cost-center-instruction-count: 5 is not a cost center".
---- 3896,3902 ----
+--- 3952,3958 ----
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: failed for probably-does-not-exist: no such file or directory".
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: failed for probably-does-not-exist: no such file or directory".
   misc.mo:Expected error in mat $fasl-file-equal?: "$fasl-file-equal?: record comparison failed while comparing testfile-fatfib1.so and testfile-fatfib3.so within fasl entry 4".
@@ -3808,7 +3808,7 @@
   misc.mo:Expected error in mat cost-center: "with-cost-center: bar is not a procedure".
   misc.mo:Expected error in mat cost-center: "cost-center-instruction-count: 5 is not a cost center".
 ***************
-*** 3950,3957 ****
+*** 4006,4013 ****
   misc.mo:Expected error in mat apropos: "apropos: 3 is not a symbol or string".
   misc.mo:Expected error in mat apropos: "apropos: (hit me) is not a symbol or string".
   misc.mo:Expected error in mat apropos: "apropos-list: b is not an environment".
@@ -3817,7 +3817,7 @@
   misc.mo:Expected error in mat apropos: "variable $apropos-unbound1 is not bound".
   misc.mo:Expected error in mat apropos: "variable $apropos-unbound2 is not bound".
   misc.mo:Expected error in mat simplify-if: "textual-port?: a is not a port".
---- 3950,3957 ----
+--- 4006,4013 ----
   misc.mo:Expected error in mat apropos: "apropos: 3 is not a symbol or string".
   misc.mo:Expected error in mat apropos: "apropos: (hit me) is not a symbol or string".
   misc.mo:Expected error in mat apropos: "apropos-list: b is not an environment".
@@ -3827,7 +3827,7 @@
   misc.mo:Expected error in mat apropos: "variable $apropos-unbound2 is not bound".
   misc.mo:Expected error in mat simplify-if: "textual-port?: a is not a port".
 ***************
-*** 3979,3987 ****
+*** 4035,4043 ****
   cp0.mo:Expected error in mat cp0-regression: "condition: #f is not a condition".
   cp0.mo:Expected error in mat cp0-regression: "apply: 0 is not a proper list".
   cp0.mo:Expected error in mat cp0-regression: "apply: 2 is not a proper list".
@@ -3837,7 +3837,7 @@
   cp0.mo:Expected error in mat expand-output: "expand-output: #t is not a textual output port or #f".
   cp0.mo:Expected error in mat expand-output: "expand-output: #<binary output port bytevector> is not a textual output port or #f".
   cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #t is not a textual output port or #f".
---- 3979,3987 ----
+--- 4035,4043 ----
   cp0.mo:Expected error in mat cp0-regression: "condition: #f is not a condition".
   cp0.mo:Expected error in mat cp0-regression: "apply: 0 is not a proper list".
   cp0.mo:Expected error in mat cp0-regression: "apply: 2 is not a proper list".
@@ -3848,7 +3848,7 @@
   cp0.mo:Expected error in mat expand-output: "expand-output: #<binary output port bytevector> is not a textual output port or #f".
   cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #t is not a textual output port or #f".
 ***************
-*** 4045,4053 ****
+*** 4101,4109 ****
   5_6.mo:Expected error in mat list->fxvector: "list->fxvector: (1 2 . 3) is not a proper list".
   5_6.mo:Expected error in mat list->fxvector: "list->fxvector: (1 2 3 2 3 2 ...) is circular".
   5_6.mo:Expected error in mat fxvector->list: "fxvector->list: (a b c) is not an fxvector".
@@ -3858,7 +3858,7 @@
   5_6.mo:Expected error in mat vector-map: "vector-map: #() is not a procedure".
   5_6.mo:Expected error in mat vector-map: "vector-map: #() is not a procedure".
   5_6.mo:Expected error in mat vector-map: "vector-map: #() is not a procedure".
---- 4045,4053 ----
+--- 4101,4109 ----
   5_6.mo:Expected error in mat list->fxvector: "list->fxvector: (1 2 . 3) is not a proper list".
   5_6.mo:Expected error in mat list->fxvector: "list->fxvector: (1 2 3 2 3 2 ...) is circular".
   5_6.mo:Expected error in mat fxvector->list: "fxvector->list: (a b c) is not an fxvector".
@@ -3869,7 +3869,7 @@
   5_6.mo:Expected error in mat vector-map: "vector-map: #() is not a procedure".
   5_6.mo:Expected error in mat vector-map: "vector-map: #() is not a procedure".
 ***************
-*** 4062,4070 ****
+*** 4118,4126 ****
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #() and #(x) differ".
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #(y) and #() differ".
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #(y) and #() differ".
@@ -3879,7 +3879,7 @@
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: #() is not a procedure".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: #() is not a procedure".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: #() is not a procedure".
---- 4062,4070 ----
+--- 4118,4126 ----
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #() and #(x) differ".
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #(y) and #() differ".
   5_6.mo:Expected error in mat vector-map: "vector-map: lengths of input vectors #(y) and #() differ".
@@ -3890,7 +3890,7 @@
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: #() is not a procedure".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: #() is not a procedure".
 ***************
-*** 4079,4096 ****
+*** 4135,4152 ****
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #() and #(x) differ".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #(y) and #() differ".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #(y) and #() differ".
@@ -3909,7 +3909,7 @@
   5_6.mo:Expected error in mat vector-sort!: "vector-sort!: 3 is not a mutable vector".
   5_6.mo:Expected error in mat vector-sort!: "vector-sort!: (1 2 3) is not a mutable vector".
   5_6.mo:Expected error in mat vector-sort!: "vector-sort!: #(a b c) is not a procedure".
---- 4079,4096 ----
+--- 4135,4152 ----
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #() and #(x) differ".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #(y) and #() differ".
   5_6.mo:Expected error in mat vector-for-each: "vector-for-each: lengths of input vectors #(y) and #() differ".
@@ -3929,7 +3929,7 @@
   5_6.mo:Expected error in mat vector-sort!: "vector-sort!: (1 2 3) is not a mutable vector".
   5_6.mo:Expected error in mat vector-sort!: "vector-sort!: #(a b c) is not a procedure".
 ***************
-*** 4101,4109 ****
+*** 4157,4165 ****
   5_6.mo:Expected error in mat vector->immutable-vector: "vector-sort!: #(1 2 3) is not a mutable vector".
   5_6.mo:Expected error in mat fxvector->immutable-fxvector: "fxvector-set!: #vfx(1 2 3) is not a mutable fxvector".
   5_6.mo:Expected error in mat fxvector->immutable-fxvector: "fxvector-fill!: #vfx(1 2 3) is not a mutable fxvector".
@@ -3939,7 +3939,7 @@
   5_6.mo:Expected error in mat vector-cas!: "vector-cas!: 1 is not a mutable vector".
   5_6.mo:Expected error in mat vector-cas!: "vector-cas!: #(4 5 3) is not a mutable vector".
   5_6.mo:Expected error in mat vector-cas!: "vector-cas!: #(4 5 3) is not a valid index for #(4 5 3)".
---- 4101,4109 ----
+--- 4157,4165 ----
   5_6.mo:Expected error in mat vector->immutable-vector: "vector-sort!: #(1 2 3) is not a mutable vector".
   5_6.mo:Expected error in mat fxvector->immutable-fxvector: "fxvector-set!: #vfx(1 2 3) is not a mutable fxvector".
   5_6.mo:Expected error in mat fxvector->immutable-fxvector: "fxvector-fill!: #vfx(1 2 3) is not a mutable fxvector".
@@ -3950,7 +3950,7 @@
   5_6.mo:Expected error in mat vector-cas!: "vector-cas!: #(4 5 3) is not a mutable vector".
   5_6.mo:Expected error in mat vector-cas!: "vector-cas!: #(4 5 3) is not a valid index for #(4 5 3)".
 ***************
-*** 4132,4139 ****
+*** 4188,4195 ****
   5_7.mo:Expected error in mat putprop-getprop: "getprop: 3 is not a symbol".
   5_7.mo:Expected error in mat putprop-getprop: "putprop: "hi" is not a symbol".
   5_7.mo:Expected error in mat putprop-getprop: "property-list: (a b c) is not a symbol".
@@ -3959,7 +3959,7 @@
   5_8.mo:Expected error in mat box-cas!: "box-cas!: 1 is not a mutable box".
   5_8.mo:Expected error in mat box-cas!: "box-cas!: #&1 is not a mutable box".
   6.mo:Expected error in mat port-operations: "open-input-file: failed for nonexistent file: no such file or directory".
---- 4132,4139 ----
+--- 4188,4195 ----
   5_7.mo:Expected error in mat putprop-getprop: "getprop: 3 is not a symbol".
   5_7.mo:Expected error in mat putprop-getprop: "putprop: "hi" is not a symbol".
   5_7.mo:Expected error in mat putprop-getprop: "property-list: (a b c) is not a symbol".
@@ -3969,7 +3969,7 @@
   5_8.mo:Expected error in mat box-cas!: "box-cas!: #&1 is not a mutable box".
   6.mo:Expected error in mat port-operations: "open-input-file: failed for nonexistent file: no such file or directory".
 ***************
-*** 4171,4192 ****
+*** 4227,4248 ****
   6.mo:Expected error in mat port-operations: "clear-output-port: not permitted on closed port #<output port testfile.ss>".
   6.mo:Expected error in mat port-operations: "current-output-port: a is not a textual output port".
   6.mo:Expected error in mat port-operations: "current-input-port: a is not a textual input port".
@@ -3992,7 +3992,7 @@
   6.mo:Expected error in mat port-operations1: "open-input-output-file: furball is not a string".
   6.mo:Expected error in mat port-operations1: "open-input-output-file: failed for /probably/not/a/good/path: no such file or directory".
   6.mo:Expected error in mat port-operations1: "open-input-output-file: invalid option compressed".
---- 4171,4192 ----
+--- 4227,4248 ----
   6.mo:Expected error in mat port-operations: "clear-output-port: not permitted on closed port #<output port testfile.ss>".
   6.mo:Expected error in mat port-operations: "current-output-port: a is not a textual output port".
   6.mo:Expected error in mat port-operations: "current-input-port: a is not a textual input port".
@@ -4016,7 +4016,7 @@
   6.mo:Expected error in mat port-operations1: "open-input-output-file: failed for /probably/not/a/good/path: no such file or directory".
   6.mo:Expected error in mat port-operations1: "open-input-output-file: invalid option compressed".
 ***************
-*** 4195,4201 ****
+*** 4251,4257 ****
   6.mo:Expected error in mat port-operations1: "truncate-file: all-the-way is not a valid length".
   6.mo:Expected error in mat port-operations1: "truncate-file: #<input port testfile.ss> is not an output port".
   6.mo:Expected error in mat port-operations1: "truncate-file: animal-crackers is not an output port".
@@ -4024,7 +4024,7 @@
   6.mo:Expected error in mat port-operations1: "truncate-file: not permitted on closed port #<input/output port testfile.ss>".
   6.mo:Expected error in mat port-operations1: "get-output-string: #<input port string> is not a string output port".
   6.mo:Expected error in mat port-operations1: "get-output-string: #<output port testfile.ss> is not a string output port".
---- 4195,4201 ----
+--- 4251,4257 ----
   6.mo:Expected error in mat port-operations1: "truncate-file: all-the-way is not a valid length".
   6.mo:Expected error in mat port-operations1: "truncate-file: #<input port testfile.ss> is not an output port".
   6.mo:Expected error in mat port-operations1: "truncate-file: animal-crackers is not an output port".
@@ -4033,7 +4033,7 @@
   6.mo:Expected error in mat port-operations1: "get-output-string: #<input port string> is not a string output port".
   6.mo:Expected error in mat port-operations1: "get-output-string: #<output port testfile.ss> is not a string output port".
 ***************
-*** 4212,4219 ****
+*** 4268,4275 ****
   6.mo:Expected error in mat string-port-file-position: "file-position: -1 is not a valid position".
   6.mo:Expected error in mat fresh-line: "fresh-line: 3 is not a textual output port".
   6.mo:Expected error in mat fresh-line: "fresh-line: #<input port string> is not a textual output port".
@@ -4041,8 +4041,8 @@
 ! 6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
   6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
-  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
---- 4212,4219 ----
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+--- 4268,4275 ----
   6.mo:Expected error in mat string-port-file-position: "file-position: -1 is not a valid position".
   6.mo:Expected error in mat fresh-line: "fresh-line: 3 is not a textual output port".
   6.mo:Expected error in mat fresh-line: "fresh-line: #<input port string> is not a textual output port".
@@ -4050,9 +4050,9 @@
 ! 6.mo:Expected error in mat pretty-print: "incorrect number of arguments to #<procedure pretty-format>".
   6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
-  6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 ***************
-*** 6697,6728 ****
+*** 6755,6786 ****
   io.mo:Expected error in mat port-operations: "put-u8: not permitted on closed port #<binary output port testfile.ss>".
   io.mo:Expected error in mat port-operations: "put-bytevector: not permitted on closed port #<binary output port testfile.ss>".
   io.mo:Expected error in mat port-operations: "flush-output-port: not permitted on closed port #<binary output port testfile.ss>".
@@ -4085,7 +4085,7 @@
   io.mo:Expected error in mat port-operations1: "open-file-input/output-port: failed for /probably/not/a/good/path: no such file or directory".
   io.mo:Expected error in mat port-operations1: "invalid file option uncompressed".
   io.mo:Expected error in mat port-operations1: "invalid file option truncate".
---- 6697,6728 ----
+--- 6755,6786 ----
   io.mo:Expected error in mat port-operations: "put-u8: not permitted on closed port #<binary output port testfile.ss>".
   io.mo:Expected error in mat port-operations: "put-bytevector: not permitted on closed port #<binary output port testfile.ss>".
   io.mo:Expected error in mat port-operations: "flush-output-port: not permitted on closed port #<binary output port testfile.ss>".
@@ -4119,7 +4119,7 @@
   io.mo:Expected error in mat port-operations1: "invalid file option uncompressed".
   io.mo:Expected error in mat port-operations1: "invalid file option truncate".
 ***************
-*** 6733,6739 ****
+*** 6791,6797 ****
   io.mo:Expected error in mat port-operations1: "set-port-length!: all-the-way is not a valid length".
   io.mo:Expected error in mat port-operations1: "truncate-port: #<binary input port testfile.ss> is not an output port".
   io.mo:Expected error in mat port-operations1: "truncate-port: animal-crackers is not an output port".
@@ -4127,7 +4127,7 @@
   io.mo:Expected error in mat port-operations1: "truncate-port: not permitted on closed port #<binary input/output port testfile.ss>".
   io.mo:Expected error in mat port-operations3: "file-port?: "not a port" is not a port".
   io.mo:Expected error in mat port-operations3: "port-file-descriptor: oops is not a port".
---- 6733,6739 ----
+--- 6791,6797 ----
   io.mo:Expected error in mat port-operations1: "set-port-length!: all-the-way is not a valid length".
   io.mo:Expected error in mat port-operations1: "truncate-port: #<binary input port testfile.ss> is not an output port".
   io.mo:Expected error in mat port-operations1: "truncate-port: animal-crackers is not an output port".
@@ -4136,7 +4136,7 @@
   io.mo:Expected error in mat port-operations3: "file-port?: "not a port" is not a port".
   io.mo:Expected error in mat port-operations3: "port-file-descriptor: oops is not a port".
 ***************
-*** 6916,6928 ****
+*** 6974,6986 ****
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: #vu8(1 2 3) is not a valid size for #<binary output port bytevector>".
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: -1 is not a valid size for #<binary output port bytevector>".
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: 6 is not a valid size for #<binary output port bytevector>".
@@ -4150,7 +4150,7 @@
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: shoe is not a positive fixnum".
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: 0 is not a positive fixnum".
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: -15 is not a positive fixnum".
---- 6916,6928 ----
+--- 6974,6986 ----
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: #vu8(1 2 3) is not a valid size for #<binary output port bytevector>".
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: -1 is not a valid size for #<binary output port bytevector>".
   io.mo:Expected error in mat low-level-port-operations: "set-binary-port-output-size!: 6 is not a valid size for #<binary output port bytevector>".
@@ -4165,7 +4165,7 @@
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: 0 is not a positive fixnum".
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: -15 is not a positive fixnum".
 ***************
-*** 6948,6963 ****
+*** 7006,7021 ****
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
   io.mo:Expected error in mat compression: "port-file-compressed!: #<output port string> is not a file port".
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
@@ -4182,7 +4182,7 @@
   io.mo:Expected error in mat custom-binary-ports: "unget-u8: cannot unget 255 on #<binary input port foo>".
   io.mo:Expected error in mat custom-binary-ports: "put-u8: #<binary input port foo> is not a binary output port".
   io.mo:Expected error in mat custom-binary-ports: "port-length: #<binary input port foo> does not support operation".
---- 6948,6963 ----
+--- 7006,7021 ----
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
   io.mo:Expected error in mat compression: "port-file-compressed!: #<output port string> is not a file port".
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
@@ -4200,7 +4200,7 @@
   io.mo:Expected error in mat custom-binary-ports: "put-u8: #<binary input port foo> is not a binary output port".
   io.mo:Expected error in mat custom-binary-ports: "port-length: #<binary input port foo> does not support operation".
 ***************
-*** 7029,7044 ****
+*** 7087,7102 ****
   io.mo:Expected error in mat current-ports: "console-output-port: #<input port string> is not a textual output port".
   io.mo:Expected error in mat current-ports: "console-error-port: #<input port string> is not a textual output port".
   io.mo:Expected error in mat current-transcoder: "current-transcoder: #<output port string> is not a transcoder".
@@ -4217,7 +4217,7 @@
   io.mo:Expected error in mat utf-16-codec: "utf-16-codec: invalid endianness #f".
   io.mo:Expected error in mat to-fold-or-not-to-fold: "get-datum: invalid character name #\newLine at char 0 of #<input port string>".
   io.mo:Expected error in mat to-fold-or-not-to-fold: "get-datum: invalid character name #\newLine at char 15 of #<input port string>".
---- 7029,7044 ----
+--- 7087,7102 ----
   io.mo:Expected error in mat current-ports: "console-output-port: #<input port string> is not a textual output port".
   io.mo:Expected error in mat current-ports: "console-error-port: #<input port string> is not a textual output port".
   io.mo:Expected error in mat current-transcoder: "current-transcoder: #<output port string> is not a transcoder".
@@ -4235,7 +4235,7 @@
   io.mo:Expected error in mat to-fold-or-not-to-fold: "get-datum: invalid character name #\newLine at char 0 of #<input port string>".
   io.mo:Expected error in mat to-fold-or-not-to-fold: "get-datum: invalid character name #\newLine at char 15 of #<input port string>".
 ***************
-*** 7210,7216 ****
+*** 7268,7274 ****
   7.mo:Expected error in mat eval-when: "invalid syntax visit-x".
   7.mo:Expected error in mat eval-when: "invalid syntax revisit-x".
   7.mo:Expected error in mat compile-whole-program: "compile-whole-program: failed for nosuchfile.wpo: no such file or directory".
@@ -4243,7 +4243,7 @@
   7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception in environment: attempt to import invisible library (testfile-wpo-lib)
   7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-a4) not found
   7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-c4) not found
---- 7210,7216 ----
+--- 7268,7274 ----
   7.mo:Expected error in mat eval-when: "invalid syntax visit-x".
   7.mo:Expected error in mat eval-when: "invalid syntax revisit-x".
   7.mo:Expected error in mat compile-whole-program: "compile-whole-program: failed for nosuchfile.wpo: no such file or directory".
@@ -4252,7 +4252,7 @@
   7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-a4) not found
   7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-c4) not found
 ***************
-*** 7276,7302 ****
+*** 7334,7360 ****
   7.mo:Expected error in mat concatenate-object-files: "separate-eval: Exception in verify-loadability: cannot find object file for library (testfile-cof1A)
   7.mo:Expected error in mat concatenate-object-files: "separate-eval: Exception in verify-loadability: cannot find object file for library (testfile-cof1B)
   7.mo:Expected error in mat top-level-value-functions: "top-level-bound?: "hello" is not a symbol".
@@ -4280,7 +4280,7 @@
   7.mo:Expected error in mat top-level-value-functions: "define-top-level-value: hello is not an environment".
   7.mo:Expected error in mat top-level-value-functions: "define-top-level-value: #<environment *scheme*> is not a symbol".
   7.mo:Expected error in mat top-level-value-functions: "variable i-am-not-bound-i-hope is not bound".
---- 7276,7302 ----
+--- 7334,7360 ----
   7.mo:Expected error in mat concatenate-object-files: "separate-eval: Exception in verify-loadability: cannot find object file for library (testfile-cof1A)
   7.mo:Expected error in mat concatenate-object-files: "separate-eval: Exception in verify-loadability: cannot find object file for library (testfile-cof1B)
   7.mo:Expected error in mat top-level-value-functions: "top-level-bound?: "hello" is not a symbol".
@@ -4309,7 +4309,7 @@
   7.mo:Expected error in mat top-level-value-functions: "define-top-level-value: #<environment *scheme*> is not a symbol".
   7.mo:Expected error in mat top-level-value-functions: "variable i-am-not-bound-i-hope is not bound".
 ***************
-*** 7701,7811 ****
+*** 7759,7869 ****
   hash.mo:Expected error in mat old-hash-table: "hash-table-for-each: ((a . b)) is not an eq hashtable".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments to #<procedure>".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments to #<procedure>".
@@ -4421,7 +4421,7 @@
   hash.mo:Expected error in mat hashtable-arguments: "hashtable-ephemeron?: (hash . table) is not a hashtable".
   hash.mo:Expected error in mat hash-return-value: "hashtable-ref: invalid hash-function #<procedure> return value "oops" for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-ref: invalid hash-function #<procedure> return value 3.5 for any".
---- 7701,7811 ----
+--- 7759,7869 ----
   hash.mo:Expected error in mat old-hash-table: "hash-table-for-each: ((a . b)) is not an eq hashtable".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments to #<procedure>".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments to #<procedure>".
@@ -4534,7 +4534,7 @@
   hash.mo:Expected error in mat hash-return-value: "hashtable-ref: invalid hash-function #<procedure> return value "oops" for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-ref: invalid hash-function #<procedure> return value 3.5 for any".
 ***************
-*** 7825,7931 ****
+*** 7883,7989 ****
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value "oops" for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value 3.5 for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value 1+2i for any".
@@ -4642,7 +4642,7 @@
   hash.mo:Expected error in mat eqv-hashtable-arguments: "make-ephemeron-eqv-hashtable: invalid size argument -1".
   hash.mo:Expected error in mat eqv-hashtable-arguments: "make-ephemeron-eqv-hashtable: invalid size argument #t".
   hash.mo:Expected error in mat eqv-hashtable-arguments: "make-ephemeron-eqv-hashtable: invalid size argument #f".
---- 7825,7931 ----
+--- 7883,7989 ----
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value "oops" for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value 3.5 for any".
   hash.mo:Expected error in mat hash-return-value: "hashtable-delete!: invalid hash-function #<procedure> return value 1+2i for any".
@@ -4751,7 +4751,7 @@
   hash.mo:Expected error in mat eqv-hashtable-arguments: "make-ephemeron-eqv-hashtable: invalid size argument #t".
   hash.mo:Expected error in mat eqv-hashtable-arguments: "make-ephemeron-eqv-hashtable: invalid size argument #f".
 ***************
-*** 7933,7948 ****
+*** 7991,8006 ****
   hash.mo:Expected error in mat generic-hashtable: "hashtable-delete!: #<hashtable> is not mutable".
   hash.mo:Expected error in mat generic-hashtable: "hashtable-update!: #<hashtable> is not mutable".
   hash.mo:Expected error in mat generic-hashtable: "hashtable-update!: #<hashtable> is not mutable".
@@ -4768,7 +4768,7 @@
   hash.mo:Expected error in mat hash-functions: "string-ci-hash: hello is not a string".
   hash.mo:Expected error in mat fasl-other-hashtable: "fasl-write: invalid fasl object #<eqv hashtable>".
   hash.mo:Expected error in mat fasl-other-hashtable: "fasl-write: invalid fasl object #<hashtable>".
---- 7933,7948 ----
+--- 7991,8006 ----
   hash.mo:Expected error in mat generic-hashtable: "hashtable-delete!: #<hashtable> is not mutable".
   hash.mo:Expected error in mat generic-hashtable: "hashtable-update!: #<hashtable> is not mutable".
   hash.mo:Expected error in mat generic-hashtable: "hashtable-update!: #<hashtable> is not mutable".
@@ -4786,7 +4786,7 @@
   hash.mo:Expected error in mat fasl-other-hashtable: "fasl-write: invalid fasl object #<eqv hashtable>".
   hash.mo:Expected error in mat fasl-other-hashtable: "fasl-write: invalid fasl object #<hashtable>".
 ***************
-*** 8058,8065 ****
+*** 8116,8123 ****
   8.mo:Expected error in mat with-syntax: "invalid syntax a".
   8.mo:Expected error in mat with-syntax: "duplicate pattern variable x in (x x)".
   8.mo:Expected error in mat with-syntax: "duplicate pattern variable x in (x x)".
@@ -4795,7 +4795,7 @@
   8.mo:Expected error in mat generate-temporaries: "generate-temporaries: improper list structure (a b . c)".
   8.mo:Expected error in mat generate-temporaries: "generate-temporaries: cyclic list structure (a b c b c b ...)".
   8.mo:Expected error in mat syntax->list: "syntax->list: invalid argument #<syntax a>".
---- 8058,8065 ----
+--- 8116,8123 ----
   8.mo:Expected error in mat with-syntax: "invalid syntax a".
   8.mo:Expected error in mat with-syntax: "duplicate pattern variable x in (x x)".
   8.mo:Expected error in mat with-syntax: "duplicate pattern variable x in (x x)".
@@ -4805,7 +4805,7 @@
   8.mo:Expected error in mat generate-temporaries: "generate-temporaries: cyclic list structure (a b c b c b ...)".
   8.mo:Expected error in mat syntax->list: "syntax->list: invalid argument #<syntax a>".
 ***************
-*** 8676,8691 ****
+*** 8734,8749 ****
   8.mo:Expected error in mat rnrs-eval: "attempt to assign unbound identifier foo".
   8.mo:Expected error in mat rnrs-eval: "invalid definition in immutable environment (define cons (quote #<procedure vector>))".
   8.mo:Expected error in mat top-level-syntax-functions: "top-level-syntax: "hello" is not a symbol".
@@ -4822,7 +4822,7 @@
   8.mo:Expected error in mat top-level-syntax-functions: "define-top-level-syntax: hello is not an environment".
   8.mo:Expected error in mat top-level-syntax-functions: "define-top-level-syntax: #<environment *scheme*> is not a symbol".
   8.mo:Expected error in mat top-level-syntax-functions: "define-top-level-syntax: cannot modify immutable environment #<environment *scheme*>".
---- 8676,8691 ----
+--- 8734,8749 ----
   8.mo:Expected error in mat rnrs-eval: "attempt to assign unbound identifier foo".
   8.mo:Expected error in mat rnrs-eval: "invalid definition in immutable environment (define cons (quote #<procedure vector>))".
   8.mo:Expected error in mat top-level-syntax-functions: "top-level-syntax: "hello" is not a symbol".
@@ -4840,7 +4840,7 @@
   8.mo:Expected error in mat top-level-syntax-functions: "define-top-level-syntax: #<environment *scheme*> is not a symbol".
   8.mo:Expected error in mat top-level-syntax-functions: "define-top-level-syntax: cannot modify immutable environment #<environment *scheme*>".
 ***************
-*** 8784,8806 ****
+*** 8842,8864 ****
   fx.mo:Expected error in mat fx=?: "fx=?: (a) is not a fixnum".
   fx.mo:Expected error in mat fx=?: "fx=?: <int> is not a fixnum".
   fx.mo:Expected error in mat fx=?: "fx=?: <-int> is not a fixnum".
@@ -4864,7 +4864,7 @@
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "$fxu<: <-int> is not a fixnum".
---- 8784,8806 ----
+--- 8842,8864 ----
   fx.mo:Expected error in mat fx=?: "fx=?: (a) is not a fixnum".
   fx.mo:Expected error in mat fx=?: "fx=?: <int> is not a fixnum".
   fx.mo:Expected error in mat fx=?: "fx=?: <-int> is not a fixnum".
@@ -4889,7 +4889,7 @@
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "$fxu<: <-int> is not a fixnum".
 ***************
-*** 8832,8844 ****
+*** 8890,8902 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -4903,7 +4903,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8832,8844 ----
+--- 8890,8902 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -4918,7 +4918,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 8888,8900 ****
+*** 8946,8958 ****
   fx.mo:Expected error in mat fx1+: "fx1+: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx1+: "fx1+: <int> is not a fixnum".
   fx.mo:Expected error in mat fx1+: "fx1+: a is not a fixnum".
@@ -4932,7 +4932,7 @@
   fx.mo:Expected error in mat fxmax: "fxmax: a is not a fixnum".
   fx.mo:Expected error in mat fxmax: "fxmax: <int> is not a fixnum".
   fx.mo:Expected error in mat fxmax: "fxmax: <-int> is not a fixnum".
---- 8888,8900 ----
+--- 8946,8958 ----
   fx.mo:Expected error in mat fx1+: "fx1+: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx1+: "fx1+: <int> is not a fixnum".
   fx.mo:Expected error in mat fx1+: "fx1+: a is not a fixnum".
@@ -4947,7 +4947,7 @@
   fx.mo:Expected error in mat fxmax: "fxmax: <int> is not a fixnum".
   fx.mo:Expected error in mat fxmax: "fxmax: <-int> is not a fixnum".
 ***************
-*** 8992,9001 ****
+*** 9050,9059 ****
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments <int> and 10".
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments -4097 and <int>".
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments <-int> and 1".
@@ -4958,7 +4958,7 @@
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: 35.0 is not a fixnum".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: 5.0 is not a valid start index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: 8.0 is not a valid end index".
---- 8992,9001 ----
+--- 9050,9059 ----
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments <int> and 10".
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments -4097 and <int>".
   fx.mo:Expected error in mat fxarithmetic-shift: "fxarithmetic-shift: fixnum overflow with arguments <-int> and 1".
@@ -4970,7 +4970,7 @@
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: 5.0 is not a valid start index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: 8.0 is not a valid end index".
 ***************
-*** 9009,9042 ****
+*** 9067,9100 ****
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid end index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid start index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid end index".
@@ -5005,7 +5005,7 @@
   fx.mo:Expected error in mat fxif: "fxif: a is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: 3.4 is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: (a) is not a fixnum".
---- 9009,9042 ----
+--- 9067,9100 ----
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid end index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid start index".
   fx.mo:Expected error in mat fxbit-field: "fxbit-field: <int> is not a valid end index".
@@ -5041,7 +5041,7 @@
   fx.mo:Expected error in mat fxif: "fxif: 3.4 is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: (a) is not a fixnum".
 ***************
-*** 9046,9089 ****
+*** 9104,9147 ****
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
@@ -5086,7 +5086,7 @@
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: 3.4 is not a fixnum".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: "3" is not a fixnum".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: <int> is not a fixnum".
---- 9046,9089 ----
+--- 9104,9147 ----
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
   fx.mo:Expected error in mat fxif: "fxif: <-int> is not a fixnum".
@@ -5132,7 +5132,7 @@
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: "3" is not a fixnum".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: <int> is not a fixnum".
 ***************
-*** 9092,9102 ****
+*** 9150,9160 ****
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index -1".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index <int>".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index <int>".
@@ -5144,7 +5144,7 @@
   fx.mo:Expected error in mat fxcopy-bit-field: "fxcopy-bit-field: "3" is not a fixnum".
   fx.mo:Expected error in mat fxcopy-bit-field: "fxcopy-bit-field: 3.4 is not a valid start index".
   fx.mo:Expected error in mat fxcopy-bit-field: "fxcopy-bit-field: 3/4 is not a valid end index".
---- 9092,9102 ----
+--- 9150,9160 ----
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index -1".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index <int>".
   fx.mo:Expected error in mat fxcopy-bit: "fxcopy-bit: invalid bit index <int>".
@@ -5157,7 +5157,7 @@
   fx.mo:Expected error in mat fxcopy-bit-field: "fxcopy-bit-field: 3.4 is not a valid start index".
   fx.mo:Expected error in mat fxcopy-bit-field: "fxcopy-bit-field: 3/4 is not a valid end index".
 ***************
-*** 9156,9165 ****
+*** 9214,9223 ****
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: (a) is not a fixnum".
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: undefined for 0".
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: undefined for 0".
@@ -5168,7 +5168,7 @@
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: 1.0 is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: 3.0 is not a fixnum".
---- 9156,9165 ----
+--- 9214,9223 ----
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: (a) is not a fixnum".
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: undefined for 0".
   fx.mo:Expected error in mat fxdiv0-and-mod0: "fxmod0: undefined for 0".
@@ -5180,7 +5180,7 @@
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: 3.0 is not a fixnum".
 ***************
-*** 9175,9184 ****
+*** 9233,9242 ****
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
@@ -5191,7 +5191,7 @@
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: 1.0 is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: 3.0 is not a fixnum".
---- 9175,9184 ----
+--- 9233,9242 ----
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx+/carry: "fx+/carry: <-int> is not a fixnum".
@@ -5203,7 +5203,7 @@
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: 3.0 is not a fixnum".
 ***************
-*** 9194,9203 ****
+*** 9252,9261 ****
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
@@ -5214,7 +5214,7 @@
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: 1.0 is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: 3.0 is not a fixnum".
---- 9194,9203 ----
+--- 9252,9261 ----
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx-/carry: "fx-/carry: <-int> is not a fixnum".
@@ -5226,7 +5226,7 @@
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: 2.0 is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: 3.0 is not a fixnum".
 ***************
-*** 9213,9223 ****
+*** 9271,9281 ****
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
@@ -5238,7 +5238,7 @@
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: a is not a fixnum".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid start index 0.0".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index 2.0".
---- 9213,9223 ----
+--- 9271,9281 ----
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
   fx.mo:Expected error in mat fx*/carry: "fx*/carry: <-int> is not a fixnum".
@@ -5251,7 +5251,7 @@
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid start index 0.0".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index 2.0".
 ***************
-*** 9240,9249 ****
+*** 9298,9307 ****
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: count 1 is greater than difference between end index 5 and start index 5".
@@ -5262,7 +5262,7 @@
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: a is not a fixnum".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid start index 0.0".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index 2.0".
---- 9240,9249 ----
+--- 9298,9307 ----
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxrotate-bit-field: "fxrotate-bit-field: count 1 is greater than difference between end index 5 and start index 5".
@@ -5274,7 +5274,7 @@
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid start index 0.0".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index 2.0".
 ***************
-*** 9259,9276 ****
+*** 9317,9334 ****
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index <-int>".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: start index 7 is greater than end index 5".
@@ -5293,7 +5293,7 @@
   fl.mo:Expected error in mat fl=: "fl=: (a) is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: a is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: a is not a flonum".
---- 9259,9276 ----
+--- 9317,9334 ----
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index <int>".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: invalid end index <-int>".
   fx.mo:Expected error in mat fxreverse-bit-field: "fxreverse-bit-field: start index 7 is greater than end index 5".
@@ -5313,7 +5313,7 @@
   fl.mo:Expected error in mat fl=: "fl=: a is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: a is not a flonum".
 ***************
-*** 9278,9284 ****
+*** 9336,9342 ****
   fl.mo:Expected error in mat fl=: "fl=: 3 is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: 7/2 is not a flonum".
@@ -5321,7 +5321,7 @@
   fl.mo:Expected error in mat fl<: "fl<: (a) is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: a is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: a is not a flonum".
---- 9278,9284 ----
+--- 9336,9342 ----
   fl.mo:Expected error in mat fl=: "fl=: 3 is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl=: "fl=: 7/2 is not a flonum".
@@ -5330,7 +5330,7 @@
   fl.mo:Expected error in mat fl<: "fl<: a is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: a is not a flonum".
 ***************
-*** 9286,9292 ****
+*** 9344,9350 ****
   fl.mo:Expected error in mat fl<: "fl<: 3 is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: 7/2 is not a flonum".
@@ -5338,7 +5338,7 @@
   fl.mo:Expected error in mat fl>: "fl>: (a) is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: a is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: a is not a flonum".
---- 9286,9292 ----
+--- 9344,9350 ----
   fl.mo:Expected error in mat fl<: "fl<: 3 is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl<: "fl<: 7/2 is not a flonum".
@@ -5347,7 +5347,7 @@
   fl.mo:Expected error in mat fl>: "fl>: a is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: a is not a flonum".
 ***************
-*** 9294,9300 ****
+*** 9352,9358 ****
   fl.mo:Expected error in mat fl>: "fl>: 3 is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: 7/2 is not a flonum".
@@ -5355,7 +5355,7 @@
   fl.mo:Expected error in mat fl<=: "fl<=: (a) is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: a is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: a is not a flonum".
---- 9294,9300 ----
+--- 9352,9358 ----
   fl.mo:Expected error in mat fl>: "fl>: 3 is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl>: "fl>: 7/2 is not a flonum".
@@ -5364,7 +5364,7 @@
   fl.mo:Expected error in mat fl<=: "fl<=: a is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: a is not a flonum".
 ***************
-*** 9302,9308 ****
+*** 9360,9366 ****
   fl.mo:Expected error in mat fl<=: "fl<=: 3 is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: 7/2 is not a flonum".
@@ -5372,7 +5372,7 @@
   fl.mo:Expected error in mat fl>=: "fl>=: (a) is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: a is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: a is not a flonum".
---- 9302,9308 ----
+--- 9360,9366 ----
   fl.mo:Expected error in mat fl<=: "fl<=: 3 is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl<=: "fl<=: 7/2 is not a flonum".
@@ -5381,7 +5381,7 @@
   fl.mo:Expected error in mat fl>=: "fl>=: a is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: a is not a flonum".
 ***************
-*** 9310,9349 ****
+*** 9368,9407 ****
   fl.mo:Expected error in mat fl>=: "fl>=: 3 is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: 7/2 is not a flonum".
@@ -5422,7 +5422,7 @@
   fl.mo:Expected error in mat fl>=?: "fl>=?: a is not a flonum".
   fl.mo:Expected error in mat fl>=?: "fl>=?: a is not a flonum".
   fl.mo:Expected error in mat fl>=?: "fl>=?: 3 is not a flonum".
---- 9310,9349 ----
+--- 9368,9407 ----
   fl.mo:Expected error in mat fl>=: "fl>=: 3 is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: 7/2 is not a flonum".
   fl.mo:Expected error in mat fl>=: "fl>=: 7/2 is not a flonum".
@@ -5464,7 +5464,7 @@
   fl.mo:Expected error in mat fl>=?: "fl>=?: a is not a flonum".
   fl.mo:Expected error in mat fl>=?: "fl>=?: 3 is not a flonum".
 ***************
-*** 9353,9359 ****
+*** 9411,9417 ****
   fl.mo:Expected error in mat fl+: "fl+: (a . b) is not a flonum".
   fl.mo:Expected error in mat fl+: "fl+: 1 is not a flonum".
   fl.mo:Expected error in mat fl+: "fl+: 2/3 is not a flonum".
@@ -5472,7 +5472,7 @@
   fl.mo:Expected error in mat fl-: "fl-: (a . b) is not a flonum".
   fl.mo:Expected error in mat fl-: "fl-: 1 is not a flonum".
   fl.mo:Expected error in mat fl-: "fl-: a is not a flonum".
---- 9353,9359 ----
+--- 9411,9417 ----
   fl.mo:Expected error in mat fl+: "fl+: (a . b) is not a flonum".
   fl.mo:Expected error in mat fl+: "fl+: 1 is not a flonum".
   fl.mo:Expected error in mat fl+: "fl+: 2/3 is not a flonum".
@@ -5481,7 +5481,7 @@
   fl.mo:Expected error in mat fl-: "fl-: 1 is not a flonum".
   fl.mo:Expected error in mat fl-: "fl-: a is not a flonum".
 ***************
-*** 9363,9445 ****
+*** 9421,9503 ****
   fl.mo:Expected error in mat fl*: "fl*: (a . b) is not a flonum".
   fl.mo:Expected error in mat fl*: "fl*: 1 is not a flonum".
   fl.mo:Expected error in mat fl*: "fl*: 2/3 is not a flonum".
@@ -5565,7 +5565,7 @@
   fl.mo:Expected error in mat flround: "flround: a is not a flonum".
   fl.mo:Expected error in mat flround: "flround: 2.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flround: "flround: 2+1i is not a flonum".
---- 9363,9445 ----
+--- 9421,9503 ----
   fl.mo:Expected error in mat fl*: "fl*: (a . b) is not a flonum".
   fl.mo:Expected error in mat fl*: "fl*: 1 is not a flonum".
   fl.mo:Expected error in mat fl*: "fl*: 2/3 is not a flonum".
@@ -5650,7 +5650,7 @@
   fl.mo:Expected error in mat flround: "flround: 2.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flround: "flround: 2+1i is not a flonum".
 ***************
-*** 9459,9494 ****
+*** 9517,9552 ****
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: 3 is not a flonum".
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: 3/4 is not a flonum".
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: hi is not a flonum".
@@ -5687,7 +5687,7 @@
   fl.mo:Expected error in mat fleven?: "fleven?: a is not a flonum".
   fl.mo:Expected error in mat fleven?: "fleven?: 3 is not a flonum".
   fl.mo:Expected error in mat fleven?: "fleven?: 3.2 is not an integer".
---- 9459,9494 ----
+--- 9517,9552 ----
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: 3 is not a flonum".
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: 3/4 is not a flonum".
   fl.mo:Expected error in mat flinfinite?: "flinfinite?: hi is not a flonum".
@@ -5725,7 +5725,7 @@
   fl.mo:Expected error in mat fleven?: "fleven?: 3 is not a flonum".
   fl.mo:Expected error in mat fleven?: "fleven?: 3.2 is not an integer".
 ***************
-*** 9496,9503 ****
+*** 9554,9561 ****
   fl.mo:Expected error in mat fleven?: "fleven?: 1+1i is not a flonum".
   fl.mo:Expected error in mat fleven?: "fleven?: +inf.0 is not an integer".
   fl.mo:Expected error in mat fleven?: "fleven?: +nan.0 is not an integer".
@@ -5734,7 +5734,7 @@
   fl.mo:Expected error in mat flodd?: "flodd?: a is not a flonum".
   fl.mo:Expected error in mat flodd?: "flodd?: 3 is not a flonum".
   fl.mo:Expected error in mat flodd?: "flodd?: 3.2 is not an integer".
---- 9496,9503 ----
+--- 9554,9561 ----
   fl.mo:Expected error in mat fleven?: "fleven?: 1+1i is not a flonum".
   fl.mo:Expected error in mat fleven?: "fleven?: +inf.0 is not an integer".
   fl.mo:Expected error in mat fleven?: "fleven?: +nan.0 is not an integer".
@@ -5744,7 +5744,7 @@
   fl.mo:Expected error in mat flodd?: "flodd?: 3 is not a flonum".
   fl.mo:Expected error in mat flodd?: "flodd?: 3.2 is not an integer".
 ***************
-*** 9505,9511 ****
+*** 9563,9569 ****
   fl.mo:Expected error in mat flodd?: "flodd?: 3+1i is not a flonum".
   fl.mo:Expected error in mat flodd?: "flodd?: +inf.0 is not an integer".
   fl.mo:Expected error in mat flodd?: "flodd?: +nan.0 is not an integer".
@@ -5752,7 +5752,7 @@
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
---- 9505,9511 ----
+--- 9563,9569 ----
   fl.mo:Expected error in mat flodd?: "flodd?: 3+1i is not a flonum".
   fl.mo:Expected error in mat flodd?: "flodd?: +inf.0 is not an integer".
   fl.mo:Expected error in mat flodd?: "flodd?: +nan.0 is not an integer".
@@ -5761,7 +5761,7 @@
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
 ***************
-*** 9513,9519 ****
+*** 9571,9577 ****
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: 0.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: 0+1i is not a flonum".
@@ -5769,7 +5769,7 @@
   fl.mo:Expected error in mat flmax: "flmax: a is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: a is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 3 is not a flonum".
---- 9513,9519 ----
+--- 9571,9577 ----
   fl.mo:Expected error in mat flmin: "flmin: a is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: 0.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flmin: "flmin: 0+1i is not a flonum".
@@ -5778,7 +5778,7 @@
   fl.mo:Expected error in mat flmax: "flmax: a is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 3 is not a flonum".
 ***************
-*** 9521,9534 ****
+*** 9579,9592 ****
   fl.mo:Expected error in mat flmax: "flmax: a is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 0.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 0+1i is not a flonum".
@@ -5793,7 +5793,7 @@
   fl.mo:Expected error in mat fldenominator: "fldenominator: a is not a flonum".
   fl.mo:Expected error in mat fldenominator: "fldenominator: 3 is not a flonum".
   fl.mo:Expected error in mat fldenominator: "fldenominator: 0+1i is not a flonum".
---- 9521,9534 ----
+--- 9579,9592 ----
   fl.mo:Expected error in mat flmax: "flmax: a is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 0.0+1.0i is not a flonum".
   fl.mo:Expected error in mat flmax: "flmax: 0+1i is not a flonum".
@@ -5809,7 +5809,7 @@
   fl.mo:Expected error in mat fldenominator: "fldenominator: 3 is not a flonum".
   fl.mo:Expected error in mat fldenominator: "fldenominator: 0+1i is not a flonum".
 ***************
-*** 9574,9580 ****
+*** 9632,9638 ****
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
@@ -5817,7 +5817,7 @@
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
---- 9574,9580 ----
+--- 9632,9638 ----
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
@@ -5826,7 +5826,7 @@
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
   cfl.mo:Expected error in mat cfl-: "cfl-: a is not a cflonum".
 ***************
-*** 9584,9597 ****
+*** 9642,9655 ****
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
@@ -5841,7 +5841,7 @@
   foreign.mo:Expected error in mat load-shared-object: "load-shared-object: invalid path 3".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: no entry for "i do not exist"".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: no entry for "i do not exist"".
---- 9584,9597 ----
+--- 9642,9655 ----
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
   cfl.mo:Expected error in mat cfl/: "cfl/: a is not a cflonum".
@@ -5857,7 +5857,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: no entry for "i do not exist"".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: no entry for "i do not exist"".
 ***************
-*** 9626,9633 ****
+*** 9684,9691 ****
   foreign.mo:Expected error in mat foreign-procedure: "id: invalid foreign-procedure argument foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle abcde".
   foreign.mo:Expected error in mat foreign-procedure: "float_id: invalid foreign-procedure argument 0".
@@ -5866,7 +5866,7 @@
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
   foreign.mo:Expected error in mat foreign-bytevectors: "u8*->u8*: invalid foreign-procedure argument "hello"".
---- 9626,9633 ----
+--- 9684,9691 ----
   foreign.mo:Expected error in mat foreign-procedure: "id: invalid foreign-procedure argument foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle abcde".
   foreign.mo:Expected error in mat foreign-procedure: "float_id: invalid foreign-procedure argument 0".
@@ -5876,7 +5876,7 @@
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
   foreign.mo:Expected error in mat foreign-bytevectors: "u8*->u8*: invalid foreign-procedure argument "hello"".
 ***************
-*** 10125,10137 ****
+*** 10183,10195 ****
   unix.mo:Expected error in mat file-operations: "file-access-time: failed for "testlink": no such file or directory".
   unix.mo:Expected error in mat file-operations: "file-change-time: failed for "testlink": no such file or directory".
   unix.mo:Expected error in mat file-operations: "file-modification-time: failed for "testlink": no such file or directory".
@@ -5890,7 +5890,7 @@
   windows.mo:Expected error in mat registry: "get-registry: pooh is not a string".
   windows.mo:Expected error in mat registry: "put-registry!: 3 is not a string".
   windows.mo:Expected error in mat registry: "put-registry!: 3 is not a string".
---- 10125,10137 ----
+--- 10183,10195 ----
   unix.mo:Expected error in mat file-operations: "file-access-time: failed for "testlink": no such file or directory".
   unix.mo:Expected error in mat file-operations: "file-change-time: failed for "testlink": no such file or directory".
   unix.mo:Expected error in mat file-operations: "file-modification-time: failed for "testlink": no such file or directory".
@@ -5905,7 +5905,7 @@
   windows.mo:Expected error in mat registry: "put-registry!: 3 is not a string".
   windows.mo:Expected error in mat registry: "put-registry!: 3 is not a string".
 ***************
-*** 10159,10230 ****
+*** 10217,10288 ****
   ieee.mo:Expected error in mat flonum->fixnum: "flonum->fixnum: result for -inf.0 would be outside of fixnum range".
   ieee.mo:Expected error in mat flonum->fixnum: "flonum->fixnum: result for +nan.0 would be outside of fixnum range".
   ieee.mo:Expected error in mat fllp: "fllp: 3 is not a flonum".
@@ -5978,7 +5978,7 @@
   date.mo:Expected error in mat time: "time>=?: 3 is not a time record".
   date.mo:Expected error in mat time: "time>=?: #<procedure car> is not a time record".
   date.mo:Expected error in mat time: "time>=?: types of <time> and <time> differ".
---- 10159,10230 ----
+--- 10217,10288 ----
   ieee.mo:Expected error in mat flonum->fixnum: "flonum->fixnum: result for -inf.0 would be outside of fixnum range".
   ieee.mo:Expected error in mat flonum->fixnum: "flonum->fixnum: result for +nan.0 would be outside of fixnum range".
   ieee.mo:Expected error in mat fllp: "fllp: 3 is not a flonum".
@@ -6052,7 +6052,7 @@
   date.mo:Expected error in mat time: "time>=?: #<procedure car> is not a time record".
   date.mo:Expected error in mat time: "time>=?: types of <time> and <time> differ".
 ***************
-*** 10232,10245 ****
+*** 10290,10303 ****
   date.mo:Expected error in mat time: "add-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "subtract-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "copy-time: <date> is not a time record".
@@ -6067,7 +6067,7 @@
   date.mo:Expected error in mat date: "make-date: invalid nanosecond -1".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
---- 10232,10245 ----
+--- 10290,10303 ----
   date.mo:Expected error in mat time: "add-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "subtract-duration: <time> does not have type time-duration".
   date.mo:Expected error in mat time: "copy-time: <date> is not a time record".
@@ -6083,7 +6083,7 @@
   date.mo:Expected error in mat date: "make-date: invalid nanosecond <int>".
   date.mo:Expected error in mat date: "make-date: invalid nanosecond zero".
 ***************
-*** 10265,10325 ****
+*** 10323,10383 ****
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset est".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset "est"".
@@ -6145,7 +6145,7 @@
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset -90000".
   date.mo:Expected error in mat date: "current-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat conversions/sleep: "date->time-utc: <time> is not a date record".
---- 10265,10325 ----
+--- 10323,10383 ----
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset 90000".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset est".
   date.mo:Expected error in mat date: "make-date: invalid time-zone offset "est"".
diff --git a/mats/patch-compile-0-t-f-t b/mats/patch-compile-0-t-f-t
index 65aaaca511..abbc420ab3 100644
--- a/mats/patch-compile-0-t-f-t
+++ b/mats/patch-compile-0-t-f-t
@@ -1,7 +1,7 @@
-*** errors-compile-0-t-f-f	2019-08-29 13:23:28.054751053 -0400
---- errors-compile-0-t-f-t	2019-08-29 13:09:33.915590545 -0400
+*** errors-compile-0-t-f-f	2020-02-28 00:59:57.516641553 -0500
+--- errors-compile-0-t-f-t	2020-02-28 00:44:53.297052688 -0500
 ***************
-*** 3699,3705 ****
+*** 3887,3893 ****
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
@@ -9,7 +9,7 @@
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation oldgen".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
   misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
---- 3699,3705 ----
+--- 3887,3893 ----
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation -1".
   misc.mo:Expected error in mat compute-composition: "compute-composition: invalid generation "static"".
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: 17 is not a procedure".
@@ -18,7 +18,7 @@
   misc.mo:Expected error in mat make-object-finder: "make-object-finder: invalid generation -1".
   misc.mo:Expected error in mat make-object-finder: "incorrect number of arguments to #<procedure find-next>".
 ***************
-*** 7182,7192 ****
+*** 7426,7436 ****
   7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
@@ -30,7 +30,7 @@
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
---- 7182,7192 ----
+--- 7426,7436 ----
   7.mo:Expected error in mat sstats: "set-sstats-gc-bytes!: twelve is not an exact integer".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation yuk".
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid generation -1".
diff --git a/mats/patch-compile-0-t-t-f b/mats/patch-compile-0-t-t-f
index b13f6314f0..00b8044db8 100644
--- a/mats/patch-compile-0-t-t-f
+++ b/mats/patch-compile-0-t-t-f
@@ -1,7 +1,7 @@
-*** errors-compile-0-t-f-f	2019-08-29 13:23:28.054751053 -0400
---- errors-compile-0-t-t-f	2019-08-29 13:18:54.744598246 -0400
+*** errors-compile-0-t-f-f	2020-02-28 00:59:57.516641553 -0500
+--- errors-compile-0-t-t-f	2020-02-28 00:55:03.513627852 -0500
 ***************
-*** 144,150 ****
+*** 197,203 ****
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable b".
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable a".
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable g".
@@ -9,7 +9,7 @@
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable f".
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable c".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
---- 144,150 ----
+--- 197,203 ----
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable b".
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable a".
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable g".
@@ -18,7 +18,7 @@
   3.mo:Expected error in mat cpvalid: "attempt to reference undefined variable c".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
 ***************
-*** 3741,3747 ****
+*** 3929,3935 ****
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -26,7 +26,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
---- 3741,3747 ----
+--- 3929,3935 ----
   misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
@@ -35,7 +35,7 @@
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
 ***************
-*** 7192,7199 ****
+*** 7436,7443 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -44,7 +44,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 7192,7199 ----
+--- 7436,7443 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -54,7 +54,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 7201,7215 ****
+*** 7445,7459 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -70,7 +70,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 7201,7215 ----
+--- 7445,7459 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -87,7 +87,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7222,7247 ****
+*** 7466,7491 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -114,7 +114,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7222,7247 ----
+--- 7466,7491 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -142,7 +142,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7372,7410 ****
+*** 7616,7654 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -182,7 +182,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7372,7410 ----
+--- 7616,7654 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -223,7 +223,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7430,7465 ****
+*** 7674,7709 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
@@ -260,7 +260,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
---- 7430,7465 ----
+--- 7674,7709 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
diff --git a/mats/patch-interpret-0-f-f-f b/mats/patch-interpret-0-f-f-f
index 64248693cc..0be349fdd8 100644
--- a/mats/patch-interpret-0-f-f-f
+++ b/mats/patch-interpret-0-f-f-f
@@ -1,14 +1,14 @@
-*** errors-compile-0-f-f-f	2020-02-11 17:27:14.000000000 -0800
---- errors-interpret-0-f-f-f	2020-02-11 17:10:37.000000000 -0800
+*** errors-compile-0-f-f-f	2020-02-28 19:40:51.000000000 -0800
+--- errors-interpret-0-f-f-f	2020-02-28 19:23:12.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   primvars.mo:Expected error testing (environment (quote 0)): Exception in environment: invalid library reference 0
   primvars.mo:Expected error testing (environment (quote (a . b))): Exception in environment: invalid library reference (a . b)
   primvars.mo:Expected error testing (environment (quote #f)): Exception in environment: invalid library reference #f
@@ -221,10 +221,10 @@
   3.mo:Expected error in mat mrvs: "returned two values to single value return context".
   3.mo:Expected error in mat mrvs: "cdr: a is not a pair".
 ***************
-*** 4216,4231 ****
-  6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
-  6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
+*** 4274,4289 ****
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-read: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
@@ -238,9 +238,9 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 4222,4231 ----
+--- 4280,4289 ----
 ***************
-*** 7190,7196 ****
+*** 7248,7254 ****
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -248,7 +248,7 @@
   7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
---- 7190,7196 ----
+--- 7248,7254 ----
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -257,7 +257,7 @@
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
 ***************
-*** 7569,7575 ****
+*** 7627,7633 ****
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -265,7 +265,7 @@
   record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
---- 7569,7575 ----
+--- 7627,7633 ----
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -274,7 +274,7 @@
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
 ***************
-*** 8832,8844 ****
+*** 8890,8902 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -288,7 +288,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8832,8844 ----
+--- 8890,8902 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -303,7 +303,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 9599,9623 ****
+*** 9657,9681 ****
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -329,7 +329,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier booleen".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
---- 9599,9623 ----
+--- 9657,9681 ----
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -356,7 +356,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
 ***************
-*** 9630,9661 ****
+*** 9688,9719 ****
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -389,7 +389,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
---- 9630,9661 ----
+--- 9688,9719 ----
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -423,7 +423,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
 ***************
-*** 9663,9688 ****
+*** 9721,9746 ****
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -450,7 +450,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
---- 9663,9688 ----
+--- 9721,9746 ----
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -478,7 +478,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
 ***************
-*** 9693,9727 ****
+*** 9751,9785 ****
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -514,7 +514,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
---- 9693,9727 ----
+--- 9751,9785 ----
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -551,7 +551,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 10328,10337 ****
+*** 10386,10395 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -562,7 +562,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 10328,10337 ----
+--- 10386,10395 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
diff --git a/mats/patch-interpret-0-f-t-f b/mats/patch-interpret-0-f-t-f
index 293aa11169..6bd667d1ec 100644
--- a/mats/patch-interpret-0-f-t-f
+++ b/mats/patch-interpret-0-f-t-f
@@ -1,14 +1,14 @@
-*** errors-compile-0-f-t-f	2020-02-11 16:54:20.000000000 -0800
---- errors-interpret-0-f-t-f	2020-02-11 17:19:09.000000000 -0800
+*** errors-compile-0-f-t-f	2020-02-28 19:05:59.000000000 -0800
+--- errors-interpret-0-f-t-f	2020-02-28 19:32:19.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   primvars.mo:Expected error testing (environment (quote 0)): Exception in environment: invalid library reference 0
   primvars.mo:Expected error testing (environment (quote (a . b))): Exception in environment: invalid library reference (a . b)
   primvars.mo:Expected error testing (environment (quote #f)): Exception in environment: invalid library reference #f
@@ -194,10 +194,10 @@
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
 ***************
-*** 4216,4231 ****
-  6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
-  6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
+*** 4274,4289 ****
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-read: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
@@ -211,9 +211,9 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 4222,4231 ----
+--- 4280,4289 ----
 ***************
-*** 7190,7196 ****
+*** 7248,7254 ****
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -221,7 +221,7 @@
   7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
---- 7190,7196 ----
+--- 7248,7254 ----
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -230,7 +230,7 @@
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
 ***************
-*** 7378,7385 ****
+*** 7436,7443 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -239,7 +239,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 7378,7385 ----
+--- 7436,7443 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -249,7 +249,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 7387,7401 ****
+*** 7445,7459 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -265,7 +265,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 7387,7401 ----
+--- 7445,7459 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -282,7 +282,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7408,7433 ****
+*** 7466,7491 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -309,7 +309,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7408,7433 ----
+--- 7466,7491 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -337,7 +337,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7558,7596 ****
+*** 7616,7654 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -377,7 +377,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7558,7596 ----
+--- 7616,7654 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -418,7 +418,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7605,7661 ****
+*** 7663,7719 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
@@ -476,7 +476,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
---- 7605,7661 ----
+--- 7663,7719 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
   record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
@@ -535,7 +535,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
   record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
 ***************
-*** 8832,8844 ****
+*** 8890,8902 ****
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -549,7 +549,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
---- 8832,8844 ----
+--- 8890,8902 ----
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
   fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
@@ -564,7 +564,7 @@
   fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
   fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
 ***************
-*** 10328,10337 ****
+*** 10386,10395 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -575,7 +575,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 10328,10337 ----
+--- 10386,10395 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
diff --git a/mats/patch-interpret-0-t-f-f b/mats/patch-interpret-0-t-f-f
index 3ded3db933..287e852f49 100644
--- a/mats/patch-interpret-0-t-f-f
+++ b/mats/patch-interpret-0-t-f-f
@@ -1,14 +1,14 @@
-*** errors-compile-0-t-f-f	2019-09-18 14:36:30.069343324 -0400
---- errors-interpret-0-t-f-f	2019-09-18 14:57:29.009466228 -0400
+*** errors-compile-0-t-f-f	2020-02-28 00:59:57.516641553 -0500
+--- errors-interpret-0-t-f-f	2020-02-28 01:23:42.326688915 -0500
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   primvars.mo:Expected error testing (environment (quote 0)): Exception in environment: invalid library reference 0
   primvars.mo:Expected error testing (environment (quote (a . b))): Exception in environment: invalid library reference (a . b)
   primvars.mo:Expected error testing (environment (quote #f)): Exception in environment: invalid library reference #f
@@ -32,7 +32,7 @@
   primvars.mo:Expected error testing (expand 1.0+2.0i (quote #f)): Exception in sc-expand: #f is not an environment
   primvars.mo:Expected error testing (expand 1.0+2.0i (quote ((a . b))) 1.0+2.0i): Exception in sc-expand: ((a . b)) is not an environment
 ***************
-*** 52,58 ****
+*** 54,60 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -40,7 +40,7 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: a is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
---- 58,64 ----
+--- 60,66 ----
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -49,7 +49,7 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
 ***************
-*** 79,149 ****
+*** 81,151 ****
   primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
   primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
   primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
@@ -121,7 +121,7 @@
   3.mo:Expected error in mat let: "incorrect argument count in call ((lambda (x . r) ((...) x (...))))".
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
---- 85,155 ----
+--- 87,157 ----
   primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
   primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
   primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
@@ -194,10 +194,10 @@
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
 ***************
-*** 4131,4146 ****
-  6.mo:Expected error in mat pretty-print: "incorrect number of arguments to #<procedure pretty-format>".
-  6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
+*** 4274,4289 ****
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in $compressed-warning: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in $compressed-warning: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
@@ -211,9 +211,9 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 4137,4146 ----
+--- 4280,4289 ----
 ***************
-*** 7105,7111 ****
+*** 7248,7254 ****
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -221,7 +221,7 @@
   7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
---- 7105,7111 ----
+--- 7248,7254 ----
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -230,7 +230,7 @@
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
 ***************
-*** 7434,7440 ****
+*** 7627,7633 ****
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -238,7 +238,7 @@
   record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
---- 7434,7440 ----
+--- 7627,7633 ----
   record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
   record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
   record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
@@ -247,7 +247,7 @@
   record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
   record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
 ***************
-*** 9443,9467 ****
+*** 9657,9681 ****
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -273,7 +273,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier booleen".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
---- 9443,9467 ----
+--- 9657,9681 ----
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
   foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
@@ -300,7 +300,7 @@
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
   foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
 ***************
-*** 9474,9505 ****
+*** 9688,9719 ****
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect number of arguments to #<procedure foreign-sizeof>".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -333,7 +333,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
---- 9474,9505 ----
+--- 9688,9719 ----
   foreign.mo:Expected error in mat foreign-sizeof: "incorrect number of arguments to #<procedure foreign-sizeof>".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
   foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
@@ -367,7 +367,7 @@
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
 ***************
-*** 9507,9532 ****
+*** 9721,9746 ****
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -394,7 +394,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
---- 9507,9532 ----
+--- 9721,9746 ----
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
   foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
@@ -422,7 +422,7 @@
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
 ***************
-*** 9537,9571 ****
+*** 9751,9785 ****
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -458,7 +458,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
---- 9537,9571 ----
+--- 9751,9785 ----
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
   foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
@@ -495,7 +495,7 @@
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
   foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
 ***************
-*** 10172,10181 ****
+*** 10386,10395 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -506,7 +506,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 10172,10181 ----
+--- 10386,10395 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
diff --git a/mats/patch-interpret-0-t-t-f b/mats/patch-interpret-0-t-t-f
index be130a2939..d6e6a21911 100644
--- a/mats/patch-interpret-0-t-t-f
+++ b/mats/patch-interpret-0-t-t-f
@@ -1,14 +1,14 @@
-*** errors-compile-0-t-t-f	2019-09-18 14:32:22.453870860 -0400
---- errors-interpret-0-t-t-f	2019-09-18 15:03:50.499559489 -0400
+*** errors-compile-0-t-t-f	2020-02-28 00:55:03.513627852 -0500
+--- errors-interpret-0-t-t-f	2020-02-28 01:30:26.126514942 -0500
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   primvars.mo:Expected error testing (environment (quote 0)): Exception in environment: invalid library reference 0
   primvars.mo:Expected error testing (environment (quote (a . b))): Exception in environment: invalid library reference (a . b)
   primvars.mo:Expected error testing (environment (quote #f)): Exception in environment: invalid library reference #f
@@ -32,7 +32,7 @@
   primvars.mo:Expected error testing (expand 1.0+2.0i (quote #f)): Exception in sc-expand: #f is not an environment
   primvars.mo:Expected error testing (expand 1.0+2.0i (quote ((a . b))) 1.0+2.0i): Exception in sc-expand: ((a . b)) is not an environment
 ***************
-*** 52,58 ****
+*** 54,60 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -40,7 +40,7 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: a is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
---- 58,64 ----
+--- 60,66 ----
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
   primvars.mo:Expected error in mat make-parameter: "+: a is not a number".
   primvars.mo:Expected error in mat make-parameter: "incorrect number of arguments to #<procedure>".
@@ -49,7 +49,7 @@
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: -1 is not a positive fixnum".
   primvars.mo:Expected error in mat collect-generation-radix: "collect-generation-radix: 0 is not a positive fixnum".
 ***************
-*** 79,149 ****
+*** 81,151 ****
   primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
   primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
   primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
@@ -121,7 +121,7 @@
   3.mo:Expected error in mat let: "incorrect argument count in call ((lambda (x . r) ((...) x (...))))".
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
---- 85,155 ----
+--- 87,157 ----
   primvars.mo:Expected error in mat print-radix: "print-radix: 1 is not between 2 and 36".
   primvars.mo:Expected error in mat timer-interrupt-handler: "timer-interrupt-handler: midnight is not a procedure".
   primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input port string> is not a textual output port".
@@ -194,10 +194,10 @@
   3.mo:Expected error in mat letrec: "variable f is not bound".
   3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
 ***************
-*** 4131,4146 ****
-  6.mo:Expected error in mat pretty-print: "incorrect number of arguments to #<procedure pretty-format>".
-  6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
+*** 4274,4289 ****
   6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in $compressed-warning: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+  6.mo:Expected error in mat fasl: "separate-eval: Warning in $compressed-warning: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 - 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
@@ -211,9 +211,9 @@
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
   6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
---- 4137,4146 ----
+--- 4280,4289 ----
 ***************
-*** 7105,7111 ****
+*** 7248,7254 ****
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -221,7 +221,7 @@
   7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
---- 7105,7111 ----
+--- 7248,7254 ----
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: file "testfile-mc-1a.ss" not found in source directories
   7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for ./testfile-mc-3a.ss: no such file or directory
@@ -230,7 +230,7 @@
   7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
 ***************
-*** 7243,7250 ****
+*** 7436,7443 ****
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -239,7 +239,7 @@
   record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
---- 7243,7250 ----
+--- 7436,7443 ----
   7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
   7.mo:Expected error in mat error: "a: hit me!".
   7.mo:Expected error in mat error: "f: n is 0".
@@ -249,7 +249,7 @@
   record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
   record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
 ***************
-*** 7252,7266 ****
+*** 7445,7459 ****
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -265,7 +265,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid input #f".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
---- 7252,7266 ----
+--- 7445,7459 ----
   record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
   record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
   record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
@@ -282,7 +282,7 @@
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
   record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
 ***************
-*** 7273,7298 ****
+*** 7466,7491 ****
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -309,7 +309,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
---- 7273,7298 ----
+--- 7466,7491 ----
   record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
   record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
@@ -337,7 +337,7 @@
   record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
   record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
 ***************
-*** 7423,7461 ****
+*** 7616,7654 ****
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -377,7 +377,7 @@
   record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
---- 7423,7461 ----
+--- 7616,7654 ----
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
   record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
@@ -418,7 +418,7 @@
   record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
   record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
 ***************
-*** 7481,7516 ****
+*** 7674,7709 ****
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
@@ -455,7 +455,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
---- 7481,7516 ----
+--- 7674,7709 ----
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
   record.mo:Expected error in mat r6rs-records-syntactic: "invalid syntax point".
@@ -493,7 +493,7 @@
   record.mo:Expected error in mat r6rs-records-syntactic: "record-rtd: #<ex3> is not a record".
   record.mo:Expected error in mat r6rs-records-syntactic: "parent record type is sealed ex3".
 ***************
-*** 10172,10181 ****
+*** 10386,10395 ****
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
@@ -504,7 +504,7 @@
   oop.mo:Expected error in mat oop: "m1: not applicable to 17".
   oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
   oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
---- 10172,10181 ----
+--- 10386,10395 ----
   exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
   exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
   exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
diff --git a/mats/patch-interpret-3-f-f-f b/mats/patch-interpret-3-f-f-f
index 268aa9aea5..d32363b127 100644
--- a/mats/patch-interpret-3-f-f-f
+++ b/mats/patch-interpret-3-f-f-f
@@ -1,14 +1,14 @@
-*** errors-compile-3-f-f-f	2020-02-11 16:50:22.000000000 -0800
---- errors-interpret-3-f-f-f	2020-02-11 17:31:27.000000000 -0800
+*** errors-compile-3-f-f-f	2020-02-28 19:01:47.000000000 -0800
+--- errors-interpret-3-f-f-f	2020-02-28 19:45:15.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x at line 1, char 19 of testfile.ss".
   profile.mo:Expected warning in mat compile-profile: "profile-dump-list: unmodified source file "testfile.ss" not found in source directories".
diff --git a/mats/patch-interpret-3-f-t-f b/mats/patch-interpret-3-f-t-f
index e9cc8d2e92..63035f3176 100644
--- a/mats/patch-interpret-3-f-t-f
+++ b/mats/patch-interpret-3-f-t-f
@@ -1,14 +1,14 @@
-*** errors-compile-3-f-t-f	2020-02-11 16:57:59.000000000 -0800
---- errors-interpret-3-f-t-f	2020-02-11 17:23:14.000000000 -0800
+*** errors-compile-3-f-t-f	2020-02-28 19:09:52.000000000 -0800
+--- errors-interpret-3-f-t-f	2020-02-28 19:36:41.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x at line 1, char 19 of testfile.ss".
   profile.mo:Expected warning in mat compile-profile: "profile-dump-list: unmodified source file "testfile.ss" not found in source directories".
diff --git a/mats/patch-interpret-3-t-f-f b/mats/patch-interpret-3-t-f-f
index 13c4412ea0..cdf7fa459e 100644
--- a/mats/patch-interpret-3-t-f-f
+++ b/mats/patch-interpret-3-t-f-f
@@ -1,14 +1,14 @@
-*** errors-compile-3-t-f-f	2019-08-29 14:17:18.177816308 -0400
---- errors-interpret-3-t-f-f	2019-08-29 14:38:33.501263784 -0400
+*** errors-compile-3-t-f-f	2020-02-28 01:57:59.385429659 -0500
+--- errors-interpret-3-t-f-f	2020-02-28 02:20:45.246151052 -0500
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x at line 1, char 19 of testfile.ss".
   profile.mo:Expected warning in mat compile-profile: "profile-dump-list: unmodified source file "testfile.ss" not found in source directories".
diff --git a/mats/patch-interpret-3-t-t-f b/mats/patch-interpret-3-t-t-f
index 7fc3bebf9b..d3726d23af 100644
--- a/mats/patch-interpret-3-t-t-f
+++ b/mats/patch-interpret-3-t-t-f
@@ -1,14 +1,14 @@
-*** errors-compile-3-t-t-f	2019-08-29 14:13:01.676337307 -0400
---- errors-interpret-3-t-t-f	2019-08-29 14:44:41.857727186 -0400
+*** errors-compile-3-t-t-f	2020-02-28 01:53:21.016941990 -0500
+--- errors-interpret-3-t-t-f	2020-02-28 02:27:17.889233777 -0500
 ***************
 *** 1,3 ****
 --- 1,9 ----
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1010, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1012, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1019, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1021, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1028, char 4 of 6.ms
-+ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 1 at line 1030, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 2 at line 1032, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 5 at line 1039, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 6 at line 1041, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 9 at line 1048, char 4 of 6.ms
++ 6.mo:Bug in mat cp1in-verify-format-warnings clause 10 at line 1050, char 4 of 6.ms
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x".
   3.mo:Expected warning in mat cpvalid: "possible attempt to reference undefined variable x at line 1, char 19 of testfile.ss".
   profile.mo:Expected warning in mat compile-profile: "profile-dump-list: unmodified source file "testfile.ss" not found in source directories".
diff --git a/mats/root-experr-compile-0-f-f-f b/mats/root-experr-compile-0-f-f-f
index 669dcf7c4a..70e5fd5be0 100644
--- a/mats/root-experr-compile-0-f-f-f
+++ b/mats/root-experr-compile-0-f-f-f
@@ -4272,6 +4272,8 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #<
 6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
 6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
 6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-read: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
diff --git a/mats/root-experr-compile-2-f-f-f b/mats/root-experr-compile-2-f-f-f
index 669dcf7c4a..70e5fd5be0 100644
--- a/mats/root-experr-compile-2-f-f-f
+++ b/mats/root-experr-compile-2-f-f-f
@@ -4272,6 +4272,8 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #<
 6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
 6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
 6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
+6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-write: fasl file content is compressed internally; compressing the file (#<binary output port testfile.ss>) is redundant and can slow fasl writing and reading significantly
+6.mo:Expected error in mat fasl: "separate-eval: Warning in fasl-read: fasl file content is compressed internally; compressing the file (#<binary input port testfile.ss>) is redundant and can slow fasl writing and reading significantly
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format".
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~a~a~a~s" in call to format".
 6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "~a~~~s" in call to format at line 1, char 28 of testfile.ss".
diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex
index 63a02a2d62..659e4f0c61 100644
--- a/release_notes/release_notes.stex
+++ b/release_notes/release_notes.stex
@@ -64,6 +64,42 @@ Console I/O now supports characters from the Unicode Basic
 Multilingual Plane in Windows. Windows consoles do not yet support the
 supplementary planes.
 
+\subsection{Incompatible fasl-format and compiled-file compression changes (9.5.3)}
+
+The fasl (fast-load) format now supports per-object compression.
+Whether the fasl writer actually performs compression is determined
+by the new \scheme{fasl-compressed} parameter, whose value defaults
+to \scheme{#t}.
+The compression format and level are determined by the
+\scheme{compress-format} and \scheme{compress-level}
+parameters.
+
+The \scheme{compile-compressed} parameter has been eliminated.
+Since compiled files are written in fasl format, the
+\scheme{fasl-compressed} parameter also now controls whether compiled
+files are compressed.
+
+Because individual portions of a fasl file are already compressed
+by default, attempting to compress a fasl file as a whole is often
+ineffective as well as inefficient both when writing and reading
+fasl objects.
+Thus, in particular, the \var{output-port} and \scheme{wpo-port}
+supplied to \scheme{compile-port} and \scheme{compile-to-port}
+should not be opened for compression.
+Similarly, external tools should not expect compiled files to be
+compressed as a whole, nor should they compress compiled files.
+
+Because compression of fasl files was previously encouraged and is
+now discouraged, the first attempt to write fasl data to or read
+fasl data from a compressed port will cause a warning to be issued,
+i.e., an exception with condition type \scheme{&warning} to be
+raised.
+
+The rationale for this change is to allow the fasl reader to seek
+past, without reading, portions of an object file that contain
+compile-time code at run time and run-time code at compile time.
+
+
 \subsection{Bytevector compression and compression level (9.5.3)}
 
 The procedure \scheme{bytevector-compress} now selects the level of
diff --git a/s/4.ss b/s/4.ss
index 41b06083e4..4bd58a1392 100644
--- a/s/4.ss
+++ b/s/4.ss
@@ -1,4 +1,3 @@
-"4.ss"
 ;;; 4.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define-who apply
   (let ()
     (define-syntax build-apply
@@ -55,12 +55,6 @@
                  cl ...))])))
     (build-apply (x1 x2 x3 x4))))
 
-(define ormap)
-(define andmap)
-(define map)
-(define for-each)
-(define fold-left)
-(define fold-right)
 (let ()
   (define length-error
      (lambda (who l1 l2)
@@ -424,3 +418,4 @@
       (unless (procedure? promise)
          ($oops who "~s is not a procedure" promise))
       (promise)))
+)
diff --git a/s/5_1.ss b/s/5_1.ss
index 44047cafb3..d0b8180f41 100644
--- a/s/5_1.ss
+++ b/s/5_1.ss
@@ -1,4 +1,3 @@
-"5_1.ss"
 ;;; 5_1.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,6 +15,7 @@
 
 ;;; type and generic predicates
 
+(begin
 (define boolean?
    (lambda (x)
       (or (eq? x #t) (eq? x #f))))
@@ -332,3 +332,4 @@
             (or (null? s*)
                 (and (#3%symbol=? (car s*) s1)
                      (f (cdr s*))))))]))
+)
diff --git a/s/5_2.ss b/s/5_2.ss
index 67e1830a27..f639471c14 100644
--- a/s/5_2.ss
+++ b/s/5_2.ss
@@ -1,4 +1,3 @@
-"5_2.ss"
 ;;; 5_2.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,6 +15,7 @@
 
 ;;; list and pair functions
 
+(begin
 (define atom?
    (lambda (x)
       (not (pair? x))))
@@ -792,3 +792,4 @@
   (set! enumerate
     (lambda (ls)
       ($iota (fx- ($list-length ls 'enumerate) 1) '()))))
+)
diff --git a/s/5_3.ss b/s/5_3.ss
index 7c8e694655..666f4cc20c 100644
--- a/s/5_3.ss
+++ b/s/5_3.ss
@@ -1,4 +1,3 @@
-"5_3.ss"
 ;;; 5_3.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -24,6 +23,7 @@
 ;;; dangerous: -0.0, +inf.0, -inf.0, 1e100, 1e-100, 0.1
 ;;; safe: 0.0, +nan.0, 1.0, 2.0, 0.5
 
+(begin
 (eval-when (compile)
 
    (define-constant max-float-exponent
@@ -3072,3 +3072,4 @@
              [k (- end start) (- k w-1)])
             ((<= k w-1) (logor (sll m^ k) ($fxreverse m k))))))))
 )))))))
+)
diff --git a/s/5_4.ss b/s/5_4.ss
index b92e339a02..2ae466183b 100644
--- a/s/5_4.ss
+++ b/s/5_4.ss
@@ -1,4 +1,3 @@
-"5_4.ss"
 ;;; 5_4.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,6 +15,7 @@
 
 ;;; character and string functions
 
+(begin
 (define substring
    (lambda (s1 m n)
       (unless (string? s1)
@@ -829,3 +829,4 @@
         ($compose ($decompose s #f))))
   )
 )
+)
diff --git a/s/5_6.ss b/s/5_6.ss
index 53cff82e79..3f3cf9674e 100644
--- a/s/5_6.ss
+++ b/s/5_6.ss
@@ -1,4 +1,3 @@
-"5_6.ss"
 ;;; 5_6.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/5_7.ss b/s/5_7.ss
index 5aa4ef0ef2..e51e0aca1e 100644
--- a/s/5_7.ss
+++ b/s/5_7.ss
@@ -1,4 +1,3 @@
-"5_7.ss"
 ;;; 5_7.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,6 +15,7 @@
 
 ;;; symbol functions
 
+(begin
 (define property-list
    (lambda (s)
       (unless (symbol? s)
@@ -79,14 +79,10 @@
                 (set-cdr! prev (cdr (cdr pl)))
                 ($set-system-property-list! s (cdr (cdr pl))))
             (rp (cdr (cdr pl)) (cdr pl)))))))
+)
 
 (eval-when (compile) (optimize-level 3))
 
-(define $gensym->pretty-name)
-(define gensym-prefix)
-(define gensym-count)
-(define gensym->unique-string)
-(define gensym)
 (let ([prefix "g"] [count 0])
   (define generate-unique-name
    ; a-z must come first in alphabet.  separator must not be in alphabet.
diff --git a/s/6.ss b/s/6.ss
index 14adf00cd5..3edcffd81c 100644
--- a/s/6.ss
+++ b/s/6.ss
@@ -1,4 +1,3 @@
-"6.ss"
 ;;; 6.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define with-output-to-string
   (lambda (th)
     (unless (procedure? th)
@@ -502,3 +502,4 @@
                 [else (loop (fx+ i 1))]))
             (substring s (skip-sep s base n) n)))))
 )
+)
diff --git a/s/7.ss b/s/7.ss
index e1443fc854..1a0abb68df 100644
--- a/s/7.ss
+++ b/s/7.ss
@@ -1,4 +1,3 @@
-"7.ss"
 ;;; 7.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,6 +15,7 @@
 
 ;;; system operations
 
+(begin
 (define scheme-start
   (make-parameter
     (lambda fns (for-each load fns) (new-cafe))
@@ -118,9 +118,16 @@
                       (p path)
                       (loop (cdr ls))))))))))
 
+(set! $compressed-warning
+  (let ([warned? #f])
+    (lambda (who p)
+      (unless warned?
+        (set! warned? #t)
+        (warningf who "fasl file content is compressed internally; compressing the file (~s) is redundant and can slow fasl writing and reading significantly" p)))))
+
 (set-who! fasl-read
   (let ()
-    (define $fasl-read (foreign-procedure "(cs)fasl_read" (ptr boolean fixnum ptr) ptr))
+    (define $fasl-read (foreign-procedure "(cs)fasl_read" (int fixnum ptr) ptr))
     (define $bv-fasl-read (foreign-procedure "(cs)bv_fasl_read" (ptr ptr) ptr))
     (define (get-uptr p)
       (let ([k (get-u8 p)])
@@ -129,12 +136,19 @@
               (let ([k (get-u8 p)])
                 (f k (logor (ash n 7) (fxsrl k 1))))
               n))))
-    (define (malformed p) ($oops who "malformed fasl-object header found in ~s" p))
+    (define (get-uptr/bytes p)
+      (let ([k (get-u8 p)])
+        (let f ([k k] [n (fxsrl k 1)] [bytes 1])
+          (if (fxlogbit? 0 k)
+              (let ([k (get-u8 p)])
+                (f k (logor (ash n 7) (fxsrl k 1)) (fx+ bytes 1)))
+              (values n bytes)))))
+    (define (malformed p what) ($oops who "malformed fasl-object found in ~s (~a)" p what))
     (define (check-header p)
       (let ([bv (make-bytevector 8 (constant fasl-type-header))])
         (unless (and (eqv? (get-bytevector-n! p bv 1 7) 7)
                      (bytevector=? bv (constant fasl-header)))
-          (malformed p)))
+          (malformed p "invalid header")))
       (let ([n (get-uptr p)])
         (unless (= n (constant scheme-version))
           ($oops who "incompatible fasl-object version ~a found in ~s"
@@ -146,21 +160,20 @@
              (lambda (a)
                ($oops who "incompatible fasl-object machine-type ~s found in ~s"
                  (cdr a) p))]
-            [else (malformed p)])))
+            [else (malformed p "unrecognized machine type")])))
       (unless (and (eqv? (get-u8 p) (char->integer #\()) ;)
                    (let f ()
                      (let ([n (get-u8 p)])
                        (and (not (eof-object? n)) ;(
                             (or (eqv? n (char->integer #\))) (f))))))
-        (malformed p)))
+        (malformed p "invalid list of base boot files")))
     (define (go p situation)
       (define (go1)
         (if (and ($port-flags-set? p (constant port-flag-file))
+                 (or (not ($port-flags-set? p (constant port-flag-compressed)))
+                     (begin ($compressed-warning who p) #f))
                  (eqv? (binary-port-input-count p) 0))
-            ($fasl-read ($port-info p)
-              ($port-flags-set? p (constant port-flag-compressed))
-              situation
-              (port-name p))
+            ($fasl-read ($port-info p) situation (port-name p))
             (let fasl-entry ()
               (let ([ty (get-u8 p)])
                 (cond
@@ -174,20 +187,29 @@
                    (go2 (eqv? situation (constant fasl-type-visit)))]
                   [(eqv? ty (constant fasl-type-visit-revisit))
                    (go2 #f)]
-                  [else (malformed p)])))))
+                  [else (malformed p "invalid situation")])))))
       (define (go2 skip?)
-        (let ([ty (get-u8 p)])
-          (cond
-            [(eqv? ty (constant fasl-type-fasl-size))
-             (let ([n (get-uptr p)])
-               (if skip?
-                   (begin
-                     (if (and (port-has-port-position? p) (port-has-set-port-position!? p))
-                         (set-port-position! p (+ (port-position p) n))
-                         (get-bytevector-n p n))
-                     (go1))
-                   ($bv-fasl-read (get-bytevector-n p n) (port-name p))))]
-            [else (malformed p)])))
+        (let ([n (get-uptr p)])
+          (if skip?
+              (begin
+                (if (and (port-has-port-position? p) (port-has-set-port-position!? p))
+                    (set-port-position! p (+ (port-position p) n))
+                    (get-bytevector-n p n))
+                (go1))
+              (let ([compressed-flag (get-u8 p)])
+                (cond
+                  [(or (eqv? compressed-flag (constant fasl-type-gzip)) (eqv? compressed-flag (constant fasl-type-lz4)))
+                   (let-values ([(dest-size dest-size-bytes) (get-uptr/bytes p)])
+                     (let* ([src-size (- n 1 dest-size-bytes)]
+                            [bv (get-bytevector-n p src-size)]
+                            [bv ($bytevector-uncompress bv dest-size
+                                  (if (eqv? compressed-flag (constant fasl-type-gzip))
+                                      (constant COMPRESS-GZIP)
+                                      (constant COMPRESS-LZ4)))])
+                       ($bv-fasl-read bv (port-name p))))]
+                  [(eqv? compressed-flag (constant fasl-type-uncompressed))
+                   ($bv-fasl-read (get-bytevector-n p (- n 1)) (port-name p))]
+                  [else (malformed p "invalid compression")])))))
       (unless (and (input-port? p) (binary-port? p))
         ($oops who "~s is not a binary input port" p))
       (go1))
@@ -256,15 +278,11 @@
                                       fp
                                       (loop fp))))))
                         (begin (set-port-position! ip start-pos) 0)))])
-          (port-file-compressed! ip)
           (if ($compiled-file-header? ip)
               (begin
                 (do-load-binary who fn ip situation for-import? importer)
                 (close-port ip))
               (begin
-                (when ($port-flags-set? ip (constant port-flag-compressed))
-                  (close-port ip)
-                  ($oops who "missing header for compiled file ~s" fn))
                 (unless ksrc
                   (close-port ip)
                   ($oops who "~a is not a compiled file" fn))
@@ -1490,3 +1508,4 @@
         [() (print-pass-stats #f ($pass-stats))]
         [(key) (print-pass-stats key ($pass-stats))]
         [(key psl*) (print-pass-stats key psl*)]))))
+)
diff --git a/s/Mf-base b/s/Mf-base
index 3d27c88c0f..c709608e90 100644
--- a/s/Mf-base
+++ b/s/Mf-base
@@ -33,8 +33,8 @@ i = f
 # cp0 determines the number of cp0 (source optimizer) iterations run
 cp0 = 2
 
-# cc determines whether compiled files are compressed
-cc = t
+# fc determines whether fasl objects are compressed
+fc = t
 
 # xf determines the compression foramt
 xf = (compress-format)
@@ -225,7 +225,7 @@ clean: profileclean
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$p (compile-profile (quote source)))'\
@@ -254,7 +254,7 @@ clean: profileclean
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$p (compile-profile (quote source)))'\
@@ -286,7 +286,7 @@ clean: profileclean
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(generate-inspector-information #$i)'\
@@ -299,7 +299,7 @@ clean: profileclean
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$(xp) (compile-profile (quote source)))'\
@@ -375,7 +375,7 @@ cmacros.so: cmacros.ss machine.def layout.ss
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(generate-inspector-information #$i)'\
@@ -390,7 +390,7 @@ priminfo.so: priminfo.ss primdata.ss cmacros.so
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(generate-inspector-information #$i)'\
@@ -406,7 +406,7 @@ mkheader.so: mkheader.ss cmacros.so primvars.so env.so
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(generate-inspector-information #$i)'\
@@ -421,7 +421,7 @@ nanopass.so: $(shell echo ../nanopass/nanopass/*) ../nanopass/nanopass.ss
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(generate-inspector-information #$i)'\
@@ -447,7 +447,7 @@ script.all makescript:
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$p (compile-profile (quote source)))'\
@@ -490,7 +490,7 @@ script-static.all:
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$p (compile-profile (quote source)))'\
@@ -519,7 +519,7 @@ script-dynamic.all:
              '(optimize-level $o)'\
              '(debug-level $d)'\
              '(commonization-level $(cl))'\
-             '(compile-compressed #$(cc))'\
+             '(fasl-compressed #$(fc))'\
              '(compress-format $(xf))'\
              '(compress-level $(xl))'\
              '(when #$p (compile-profile (quote source)))'\
diff --git a/s/back.ss b/s/back.ss
index fb2d2dc428..b78569a1b0 100644
--- a/s/back.ss
+++ b/s/back.ss
@@ -1,4 +1,3 @@
-"back.ss"
 ;;; back.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define-who trace-output-port
    ($make-thread-parameter
       (console-output-port)
@@ -137,7 +137,7 @@
         ($oops who "~s is not a procedure" x))
       x)))
 
-(define compile-compressed
+(define fasl-compressed
   ($make-thread-parameter #t (lambda (x) (and x #t))))
 
 (define compile-file-message
@@ -208,3 +208,4 @@
   ($make-thread-parameter #t (lambda (x) (and x #t))))
 
 (set! $scheme-version (string->symbol ($format-scheme-version (constant scheme-version))))
+)
diff --git a/s/bytevector.ss b/s/bytevector.ss
index ce265f055b..cd79108130 100644
--- a/s/bytevector.ss
+++ b/s/bytevector.ss
@@ -1,4 +1,3 @@
-"bytevector.ss"
 ;;; bytevector.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;
@@ -1459,62 +1458,59 @@
     ;; Always big-endian, so that compressed data is portable.
     (define uncompressed-length-endianness (endianness big))
 
-    (define $bytevector-compress-size
+    (define fp-bytevector-compress-size
       (foreign-procedure "(cs)bytevector_compress_size" (iptr int) uptr))
-    (define $bytevector-compress
+    (define fp-bytevector-compress
       (foreign-procedure "(cs)bytevector_compress" (scheme-object iptr iptr scheme-object iptr iptr int) scheme-object))
-    (define $bytevector-uncompress
+    (define fp-bytevector-uncompress
       (foreign-procedure "(cs)bytevector_uncompress" (scheme-object iptr iptr scheme-object iptr iptr int) scheme-object))
 
-    (set-who! bytevector-compress
-      (lambda (bv)
-        (unless (bytevector? bv) (not-a-bytevector who bv))
-        (let* ([fmt ($tc-field 'compress-format ($tc))]
-               [dest-max-len ($bytevector-compress-size (bytevector-length bv) fmt)]
-               [dest-alloc-len (min (+ dest-max-len uncompressed-length-length)
-                                    ;; In the unlikely event of a non-fixnum requested size...
-                                    (constant maximum-bytevector-length))]
+    (let ()
+      (define (compress who bv fmt offset)
+        (let* ([dest-max-len (fp-bytevector-compress-size (bytevector-length bv) fmt)]
+               [dest-alloc-len (min (+ dest-max-len offset) (constant maximum-bytevector-length))]
                [dest-bv (make-bytevector dest-alloc-len)])
-          (let ([r ($bytevector-compress dest-bv
-                                         uncompressed-length-length
-                                         (fx- dest-alloc-len uncompressed-length-length)
-                                         bv
-                                         0
-                                         (bytevector-length bv)
-                                         fmt)])
-            (cond
-             [(string? r)
-              ($oops who r bv)]
-             [else
-              (let ([tag (bitwise-ior
-                           (bitwise-arithmetic-shift-left (bytevector-length bv) (constant COMPRESS-FORMAT-BITS))
-                           fmt)])
-                ($bytevector-u64-set! dest-bv 0 tag uncompressed-length-endianness who)
-                (bytevector-truncate! dest-bv (fx+ r uncompressed-length-length)))])))))
+          (let ([r (fp-bytevector-compress dest-bv offset (fx- dest-alloc-len offset) bv 0 (bytevector-length bv) fmt)])
+            (if (string? r)
+                ($oops who r bv)
+                (bytevector-truncate! dest-bv (fx+ r offset))))))
 
-    (set-who! bytevector-uncompress
-      (lambda (bv)
-        (unless (bytevector? bv) (not-a-bytevector who bv))
-        (unless (>= (bytevector-length bv) uncompressed-length-length)
-          ($oops who "invalid data in source bytevector ~s" bv))
-        (let* ([tag ($bytevector-u64-ref bv 0 uncompressed-length-endianness who)]
-               [fmt (logand tag (fx- (fxsll 1 (constant COMPRESS-FORMAT-BITS)) 1))]
-               [dest-length (bitwise-arithmetic-shift-right tag (constant COMPRESS-FORMAT-BITS))])
-          (unless (and (fixnum? dest-length)
-                       ($fxu< dest-length (constant maximum-bytevector-length)))
-            ($oops who "bytevector ~s claims invalid uncompressed size ~s" bv dest-length))
-          (let* ([dest-bv (make-bytevector dest-length)]
-                 [r ($bytevector-uncompress dest-bv
-                                            0
-                                            dest-length
-                                            bv
-                                            uncompressed-length-length
-                                            (fx- (bytevector-length bv) uncompressed-length-length)
-                                            fmt)])
-            (cond
-             [(string? r) ($oops who r bv)]
-             [(fx= r dest-length) dest-bv]
-             [else
-              ($oops who "uncompressed size ~s for ~s is smaller than expected size ~a" r bv dest-length)]))))))
+      (set-who! $bytevector-compress
+        (lambda (bv fmt)
+          (compress who bv fmt 0)))
 
+      (set-who! bytevector-compress
+        (lambda (bv)
+          (unless (bytevector? bv) (not-a-bytevector who bv))
+          (let* ([fmt ($tc-field 'compress-format ($tc))]
+                 [dest-bv (compress who bv fmt uncompressed-length-length)])
+            (let ([tag (bitwise-ior
+                         (bitwise-arithmetic-shift-left (bytevector-length bv) (constant COMPRESS-FORMAT-BITS))
+                         fmt)])
+              ($bytevector-u64-set! dest-bv 0 tag uncompressed-length-endianness who)
+              dest-bv)))))
+
+    (let ()
+      (define (uncompress who bv dest-length fmt offset)
+        (unless (and (fixnum? dest-length) ($fxu< dest-length (constant maximum-bytevector-length)))
+          ($oops who "bytevector ~s claims invalid uncompressed size ~s" bv dest-length))
+        (let ([dest-bv (make-bytevector dest-length)])
+          (let ([r (fp-bytevector-uncompress dest-bv 0 dest-length bv offset (fx- (bytevector-length bv) offset) fmt)])
+            (cond
+              [(string? r) ($oops who r bv)]
+              [(fx= r dest-length) dest-bv]
+              [else ($oops who "uncompressed size ~s for ~s is smaller than expected size ~s" r bv dest-length)]))))
+
+      (set-who! $bytevector-uncompress
+        (lambda (bv dest-length fmt)
+          (uncompress who bv dest-length fmt 0)))
+
+      (set-who! bytevector-uncompress
+        (lambda (bv)
+          (unless (bytevector? bv) (not-a-bytevector who bv))
+          (unless (>= (bytevector-length bv) uncompressed-length-length) ($oops who "invalid data in source bytevector ~s" bv))
+          (let* ([tag ($bytevector-u64-ref bv 0 uncompressed-length-endianness who)]
+                 [fmt (logand tag (fx- (fxsll 1 (constant COMPRESS-FORMAT-BITS)) 1))]
+                 [dest-length (bitwise-arithmetic-shift-right tag (constant COMPRESS-FORMAT-BITS))])
+            (uncompress who bv dest-length fmt uncompressed-length-length))))))
 )
diff --git a/s/cafe.ss b/s/cafe.ss
index 720cfbd724..e5d2f242b3 100644
--- a/s/cafe.ss
+++ b/s/cafe.ss
@@ -1,4 +1,3 @@
-"cafe.ss"
 ;;; cafe.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define default-prompt-and-read
   (lambda (n)
     (unless (and (integer? n) (>= n 0))
@@ -214,3 +214,4 @@ Type e to exit interrupt handler and continue
                      (lambda ()
                        (waiter ($cafe) eval))))))))]))))
 )
+)
diff --git a/s/cback.ss b/s/cback.ss
index 7ba4544cdf..cedc90a9f9 100644
--- a/s/cback.ss
+++ b/s/cback.ss
@@ -1,4 +1,3 @@
-"cback.ss"
 ;;; cback.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,5 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (current-eval compile)
 (define $compiler-is-loaded? #t)
+)
diff --git a/s/cmacros.ss b/s/cmacros.ss
index 71b7e0213f..d3e8e02e1e 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -434,7 +434,7 @@
 (define-constant fasl-type-gensym 19)
 (define-constant fasl-type-exactnum 20)
 ; 21
-(define-constant fasl-type-fasl-size 22)
+; 22
 (define-constant fasl-type-record 23)
 (define-constant fasl-type-rtd 24)
 (define-constant fasl-type-small-integer 25)
@@ -456,6 +456,10 @@
 (define-constant fasl-type-immutable-bytevector 40)
 (define-constant fasl-type-immutable-box 41)
 
+(define-constant fasl-type-uncompressed 42)
+(define-constant fasl-type-gzip 43)
+(define-constant fasl-type-lz4 44)
+
 (define-constant fasl-fld-ptr 0)
 (define-constant fasl-fld-u8 1)
 (define-constant fasl-fld-i16 2)
@@ -1392,7 +1396,9 @@
    [void* lz4-out-buffer]
    [U64 instr-counter]
    [U64 alloc-counter]
-   [ptr parameters]))
+   [ptr parameters]
+   [ptr DSTBV]
+   [ptr SRCBV]))
 
 (define tc-field-list
   (let f ([ls (oblist)] [params '()])
diff --git a/s/compile.ss b/s/compile.ss
index 67aa805213..d46de06d92 100644
--- a/s/compile.ss
+++ b/s/compile.ss
@@ -1,4 +1,3 @@
-"compile.ss"
 ;;; compile.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -16,13 +15,6 @@
 
 ;;; use fixnum arithmetic in code building & output routines
 
-(define compile)
-(define $compile-backend)
-(define compile-file)
-(define $c-make-code)
-(define make-boot-header)
-(define make-boot-file)
-
 (let ()
 (import (nanopass))
 (include "types.ss")
@@ -495,9 +487,9 @@
                    [$optimize-closures ($optimize-closures)]
                    [enable-cross-library-optimization (enable-cross-library-optimization)]
                    [generate-covin-files (generate-covin-files)])
-      (emit-header op (constant machine-type))
-      (when hostop (emit-header hostop (host-machine-type)))
-      (when wpoop (emit-header wpoop (host-machine-type)))
+      (emit-header op (constant scheme-version) (constant machine-type))
+      (when hostop (emit-header hostop (constant scheme-version) (host-machine-type)))
+      (when wpoop (emit-header wpoop (constant scheme-version) (host-machine-type)))
       (let cfh0 ([n 1] [rrcinfo** '()] [rlpinfo** '()] [rfinal** '()])
         (let ([x0 ($pass-time 'read do-read)])
           (if (eof-object? x0)
@@ -749,40 +741,30 @@
         (close-port op))))
 
   (define with-object-file
-    (case-lambda
-      [(who ofn p) (with-object-file who ofn #t p)]
-      [(who ofn compressed-okay? p)
-       (call-with-port/cleanup ofn
-         ($open-file-output-port who ofn
-           (if (and compressed-okay? (compile-compressed))
-               (file-options replace compressed)
-               (file-options replace)))
-         p)]))
+    (lambda (who ofn p)
+      (call-with-port/cleanup ofn
+        ($open-file-output-port who ofn
+          (file-options replace))
+        p)))
 
   (define with-host-file
     (lambda (who ofn p)
       (if ofn
           (call-with-port/cleanup ofn
             ($open-file-output-port who ofn
-              (if (compile-compressed)
-                  (file-options replace compressed)
-                  (file-options replace)))
+              (file-options replace))
             p)
           (p #f))))
 
   (define with-wpo-file
-    (case-lambda
-      [(who ofn p) (with-wpo-file who ofn #t p)]
-      [(who ofn compressed-okay? p)
-       (if (generate-wpo-files)
-           (let ([ofn (new-extension "wpo" ofn)])
-             (call-with-port/cleanup ofn
-               ($open-file-output-port who ofn
-                 (if (and compressed-okay? (compile-compressed))
-                     (file-options replace compressed)
-                     (file-options replace)))
-               p))
-           (p #f))]))
+    (lambda (who ofn p)
+      (if (generate-wpo-files)
+          (let ([ofn (new-extension "wpo" ofn)])
+            (call-with-port/cleanup ofn
+              ($open-file-output-port who ofn
+                (file-options replace))
+              p))
+          (p #f))))
 
   (define with-coverage-file
     (lambda (who ofn p)
@@ -801,7 +783,7 @@
 
 (set! $compile-host-library
   (lambda (who iofn)
-    (let ([ip ($open-file-input-port who iofn (file-options compressed))])
+    (let ([ip ($open-file-input-port who iofn)])
       (on-reset (close-port ip)
         (let loop ([rx1* '()] [rcinfo* '()] [rother* '()])
           (let ([x1 (fasl-read ip)])
@@ -812,7 +794,7 @@
                  (unless (null? rother*) ($oops 'compile-library "unexpected value ~s read from file ~s that also contains ~s" (car rother*) iofn (car rx1*)))
                  (with-object-file who iofn
                    (lambda (op)
-                     (emit-header op (constant machine-type))
+                     (emit-header op (constant scheme-version) (constant machine-type))
                        (let loop ([x1* (reverse rx1*)] [rrcinfo** (list rcinfo*)] [rlpinfo** '()] [rfinal** '()])
                          (if (null? x1*)
                              (compile-file-help2 op (reverse rrcinfo**) (reverse rlpinfo**) (reverse rfinal**))
@@ -892,7 +874,6 @@
                                    (loop)))))
                            (get-bv))
                          (begin (set-port-position! ip start-pos) #f)))])
-              (port-file-compressed! ip)
               (if ($compiled-file-header? ip)
                   (let loop ([rls '()])
                     (let ([x (fasl-read ip)])
@@ -935,7 +916,7 @@
               [else ($oops who "unable to locate expanded library file for library ~s" path)])))
         (define read-binary-file
           (lambda (path fn libs-visible?)
-            (call-with-port ($open-file-input-port who fn (file-options compressed))
+            (call-with-port ($open-file-input-port who fn)
               (lambda (ip)
                 (on-reset (close-port ip)
                   (if ($compiled-file-header? ip)
@@ -1511,18 +1492,17 @@
 
   (define finish-compile
     (lambda (who msg ifn ofn hash-bang-line x1)
-      (with-object-file who ofn #f
+      (with-object-file who ofn
         (lambda (op)
           (with-coverage-file who ofn
             (lambda (source-table)
               (when hash-bang-line (put-bytevector op hash-bang-line))
-              (when (compile-compressed) (port-file-compressed! op))
               (parameterize ([$target-machine (constant machine-type-name)]
                              ; dummy sfd for block-profile optimization
                              [$sfd (make-source-file-descriptor ifn #xc7 #xc7c7)]
                              [$block-counter 0])
                 (when source-table ($insert-profile-src! source-table x1))
-                (emit-header op (constant machine-type))
+                (emit-header op (constant scheme-version) (constant machine-type))
                 (let-values ([(rcinfo* lpinfo* final*) (compile-file-help1 x1 msg)])
                   (compile-file-help2 op (list rcinfo*) (list lpinfo*) (list final*))))))))))
 
@@ -1531,7 +1511,7 @@
       (with-wpo-file who ofn
         (lambda (wpoop)
           (when wpoop
-            (emit-header wpoop (host-machine-type))
+            (emit-header wpoop (constant scheme-version) (host-machine-type))
             ($with-fasl-target (host-machine-type)
               (lambda ()
                 (parameterize ([$target-machine (machine-type)])
@@ -1671,7 +1651,7 @@
 (let ()
   (define emit-boot-header
     (lambda (op machine bootfiles)
-      (emit-header op (constant machine-type) (map path-root (map path-last bootfiles)))
+      (emit-header op (constant scheme-version) (constant machine-type) (map path-root (map path-last bootfiles)))
       (when (null? bootfiles)
         (parameterize ([$target-machine machine] [$sfd #f])
           (c-print-fasl ($np-boot-code 'error-invoke) op (constant fasl-type-visit-revisit))
@@ -1697,7 +1677,7 @@
                 (emit-boot-header op machine bootfile*))
               (for-each
                 (lambda (infn)
-                  (let ([ip ($open-file-input-port who infn (file-options compressed))])
+                  (let ([ip ($open-file-input-port who infn)])
                     (on-reset (close-port ip)
                       (if ($compiled-file-header? ip)
                           (begin
@@ -1771,7 +1751,7 @@
               (let ([ip* (reverse rip*)])
                 (with-object-file who outfn
                   (lambda (op)
-                    (emit-header op (constant machine-type))
+                    (emit-header op (constant scheme-version) (constant machine-type))
                     (c-print-fasl `(object ,(make-recompile-info
                                               (vector->list (hashtable-keys import-ht))
                                               (vector->list (hashtable-keys include-ht))))
@@ -1802,7 +1782,6 @@
                      [ip ($open-file-input-port who fn)])
                 (on-reset (close-port ip)
                   ;; NB: Does not currently support files beginning with a #! line.  Add that here if desired.
-                  (port-file-compressed! ip)
                   (unless ($compiled-file-header? ip) ($oops who "missing header for compiled file ~s" fn))
                   (let ([rcinfo (fasl-read ip)])
                     (unless (recompile-info? rcinfo) ($oops who "expected recompile info at start of ~s, found ~a" fn rcinfo))
@@ -1835,12 +1814,14 @@
          ($oops who "~s is not a textual input port" ip))
        (unless (and (output-port? op) (binary-port? op))
          ($oops who "~s is not a binary output port" op))
+       (when ($port-flags-set? op (constant port-flag-compressed)) ($compressed-warning who op))
        (when sfd
          (unless (source-file-descriptor? sfd)
            ($oops who "~s is not a source-file descriptor or #f" sfd)))
        (when wpoop
          (unless (and (output-port? wpoop) (binary-port? wpoop))
-           ($oops who "~s is not a binary output port or #f" wpoop)))
+           ($oops who "~s is not a binary output port or #f" wpoop))
+         (when ($port-flags-set? wpoop (constant port-flag-compressed)) ($compressed-warning who wpoop)))
        (when covop
          (unless (and (output-port? covop) (textual-port? covop))
            ($oops who "~s is not a textual output port or #f" covop)))
@@ -1849,7 +1830,8 @@
          ($oops who "compiler for ~s is not loaded" machine))
        (when hostop
          (unless (and (output-port? hostop) (binary-port? hostop))
-           ($oops who "~s is not a binary output port or #f" hostop)))
+           ($oops who "~s is not a binary output port or #f" hostop))
+         (when ($port-flags-set? hostop (constant port-flag-compressed)) ($compressed-warning who hostop)))
        (let ([source-table (and covop (make-source-table))])
          (let ([fp (and (port-has-port-position? ip)
                         (let ([fp (port-position ip)])
@@ -1884,12 +1866,14 @@
          ($oops who "~s is not a proper list" sexpr*))
        (unless (and (output-port? op) (binary-port? op))
          ($oops who "~s is not a binary output port" op))
+       (when ($port-flags-set? op (constant port-flag-compressed)) ($compressed-warning who op))
        (when sfd
          (unless (source-file-descriptor? sfd)
            ($oops who "~s is not a source-file descriptor or #f" sfd)))
        (when wpoop
          (unless (and (output-port? wpoop) (binary-port? wpoop))
-           ($oops who "~s is not a binary output port or #f" wpoop)))
+           ($oops who "~s is not a binary output port or #f" wpoop))
+         (when ($port-flags-set? wpoop (constant port-flag-compressed)) ($compressed-warning who wpoop)))
        (when covop
          (unless (and (output-port? covop) (textual-port? covop))
            ($oops who "~s is not a textual output port or #f" covop)))
@@ -1898,7 +1882,8 @@
          ($oops who "compiler for ~s is not loaded" machine))
        (when hostop
          (unless (and (output-port? hostop) (binary-port? hostop))
-           ($oops who "~s is not a binary output port or #f" hostop)))
+           ($oops who "~s is not a binary output port or #f" hostop))
+         (when ($port-flags-set? hostop (constant port-flag-compressed)) ($compressed-warning who hostop)))
        (if (and (= (length sexpr*) 1) (pair? (car sexpr*)) (eq? (caar sexpr*) 'top-level-program))
            (let ([library-collector (make-parameter '())])
              (parameterize ([$require-libraries library-collector])
@@ -1979,10 +1964,10 @@
             (if (and (eqv? (read-char ip) #\#)
                      (eqv? (read-char ip) #\!)
                      (memv (lookahead-char ip) '(#\space #\/)))
-                ; copy #! line.  open output file w/o compression
-                (with-object-file who out #f
+                ; copy #! line
+                (with-object-file who out
                   (lambda (op)
-                    (with-wpo-file who out #f
+                    (with-wpo-file who out
                       (lambda (wpoop)
                         (with-coverage-file who out
                           (lambda (source-table)
@@ -2003,12 +1988,8 @@
                                             (when wpoop (put-u8 wpoop n)))
                                           (let ([fp (+ fp 1)])
                                             (if (char=? c #\newline) fp (loop fp)))))])
-                              ; compress remainder of file if requeseted
-                              (when (compile-compressed)
-                                (port-file-compressed! op)
-                                (when wpoop (port-file-compressed! wpoop)))
                               (compile-file-help op #f wpoop source-table machine sfd ((if r6rs? $make-read-program $make-read) ip sfd fp) out))))))))
-                ; no #! line.  open output file w/ compression, if so directed
+                ; no #! line
                 (with-object-file who out
                   (lambda (op)
                     (set-port-position! ip start-pos)
diff --git a/s/cp0.ss b/s/cp0.ss
index 99cccf8461..f6319af30e 100644
--- a/s/cp0.ss
+++ b/s/cp0.ss
@@ -1,4 +1,3 @@
-"cp0"
 ;;; cp0.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/cpcommonize.ss b/s/cpcommonize.ss
index 12f44e615f..6fe0431025 100644
--- a/s/cpcommonize.ss
+++ b/s/cpcommonize.ss
@@ -1,4 +1,3 @@
-"cpcommonize.ss"
 ;;; cpcommonize.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define-who commonization-level
   ($make-thread-parameter
     0
@@ -576,3 +576,4 @@
             x
             (let ([worthwhile-size (expt 2 (fx- 10 level))])
               (cpcommonize2 (cpcommonize1 (cpcommonize0 x) worthwhile-size))))))))
+)
diff --git a/s/cpletrec.ss b/s/cpletrec.ss
index f5b2fb00c0..5231fff78e 100644
--- a/s/cpletrec.ss
+++ b/s/cpletrec.ss
@@ -1,4 +1,3 @@
-"cpletrec.ss"
 ;;; cpletrec.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/cpnanopass.ss b/s/cpnanopass.ss
index 313abd76c4..ed0dfce9fb 100644
--- a/s/cpnanopass.ss
+++ b/s/cpnanopass.ss
@@ -1,4 +1,3 @@
-"cpnanopass.ss"
 ;;; cpnanopass.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;
@@ -16102,6 +16101,6 @@
   (set! $track-dynamic-closure-counts track-dynamic-closure-counts)
 
   (set! $track-static-closure-counts track-static-closure-counts)
-)
 
-(define $optimize-closures (make-parameter #t (lambda (x) (and x #t))))
+  (set! $optimize-closures (make-parameter #t (lambda (x) (and x #t))))
+)
diff --git a/s/cprep.ss b/s/cprep.ss
index 6080785f8d..9b1f4bd309 100644
--- a/s/cprep.ss
+++ b/s/cprep.ss
@@ -1,4 +1,3 @@
-"cprep.ss"
 ;;; cprep.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/cpvalid.ss b/s/cpvalid.ss
index 4602814814..e01d12a37e 100644
--- a/s/cpvalid.ss
+++ b/s/cpvalid.ss
@@ -1,4 +1,3 @@
-"cpvalid.ss"
 ;;; cpvalid.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -17,10 +16,10 @@
 ;;; see comments relating to both cpvalid and cpletrec at front of
 ;;; cpletrec.ss
 
+(begin
 (define undefined-variable-warnings
   ($make-thread-parameter #f (lambda (x) (and x #t))))
 
-(define $cpvalid)
 (let ()
   (import (nanopass))
   (include "base-lang.ss")
@@ -562,3 +561,4 @@
   (set! $cpvalid
     (lambda (x)
       (if (= (optimize-level) 3) x (cpvalid x)))))
+)
diff --git a/s/date.ss b/s/date.ss
index 6527372738..1dbbba37f4 100644
--- a/s/date.ss
+++ b/s/date.ss
@@ -1,4 +1,3 @@
-"date.ss"
 ;;; date.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/engine.ss b/s/engine.ss
index d23dc432a5..01fea2b650 100644
--- a/s/engine.ss
+++ b/s/engine.ss
@@ -1,4 +1,3 @@
-"engine.ss"
 ;;; engine.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -29,10 +28,6 @@
 ;;;   *timer*   the saved timer interrupt handler
 
 
-(define make-engine)
-(define engine-block)
-(define engine-return)
-
 (let ()
 
 (define-threaded *exit*)
diff --git a/s/enum.ss b/s/enum.ss
index faa76c48ff..b5384ad216 100644
--- a/s/enum.ss
+++ b/s/enum.ss
@@ -1,4 +1,3 @@
-"enum.ss"
 ;;; enum.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -27,24 +26,6 @@
 ;;  should throw an error if its argument is not a symbol.  We have chosen to
 ;;  not include that check, but if the standard is updated, this may need to be changed.
 
-(define $enum-set-members)
-
-(define enum-set?)
-(define make-enumeration)
-(define enum-set-universe)
-(define enum-set-indexer)
-(define enum-set-constructor)
-(define enum-set->list)
-(define enum-set-member?)
-(define enum-set-subset?)
-(define enum-set=?)
-(define enum-set-union)
-(define enum-set-intersection)
-(define enum-set-difference)
-(define enum-set-complement)
-(define enum-set-projection)
-
-
 (let ()
 
 ;;;;;;;;
diff --git a/s/env.ss b/s/env.ss
index 9be6eae36a..3c653be6c4 100644
--- a/s/env.ss
+++ b/s/env.ss
@@ -1,4 +1,3 @@
-"env.ss"
 ;;; env.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,5 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 ($make-base-modules)
 ($make-rnrs-libraries)
+)
diff --git a/s/event.ss b/s/event.ss
index 042167936d..a1dd6e712f 100644
--- a/s/event.ss
+++ b/s/event.ss
@@ -1,4 +1,3 @@
-"event.ss"
 ;;; event.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,10 +13,6 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
-(define set-timer)
-(define enable-interrupts)
-(define disable-interrupts)
-
 (let ()
 (define stop-event-timer
    (lambda ()
diff --git a/s/exceptions.ss b/s/exceptions.ss
index 819fea3bae..5b249ba13a 100644
--- a/s/exceptions.ss
+++ b/s/exceptions.ss
@@ -1,4 +1,3 @@
-"exceptions.ss"
 ;;; exceptions.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -29,6 +28,7 @@ TODO:
  - deal with error? and warning? mats
 |#
 
+(begin
 (let ()
   (define (warning-only? c)
     (and (warning? c) (not (serious-condition? c))))
@@ -734,3 +734,4 @@ TODO:
             (condition fwcond ($make-src-condition src start?))
             fwcond))))
 )
+)
diff --git a/s/expeditor.ss b/s/expeditor.ss
index 04e554d4b6..11204209bc 100644
--- a/s/expeditor.ss
+++ b/s/expeditor.ss
@@ -1,4 +1,3 @@
-"expeditor.ss"
 ;;; expeditor.ss
 ;;; R. Kent Dybvig
 ;;; August 2007
diff --git a/s/fasl-helpers.ss b/s/fasl-helpers.ss
index 84207299ec..a673c1d32f 100644
--- a/s/fasl-helpers.ss
+++ b/s/fasl-helpers.ss
@@ -135,8 +135,8 @@
 
 (define emit-header
   (case-lambda
-    [(p mtype) (emit-header p mtype '())]
-    [(p mtype bootfiles)
+    [(p version mtype) (emit-header p version mtype '())]
+    [(p version mtype bootfiles)
      (define (put-str p s)
        (let ([n (string-length s)])
          (do ([i 0 (fx+ i 1)])
@@ -146,7 +146,7 @@
                ($oops #f "cannot handle bootfile name character ~s whose integer code exceeds 255" c))
              (put-u8 p k)))))
      (put-bytevector p (constant fasl-header))
-     (put-uptr p (constant scheme-version))
+     (put-uptr p version)
      (put-uptr p mtype)
      (put-u8 p (char->integer #\())           ; )
      (let f ([bootfiles bootfiles] [sep? #f])
diff --git a/s/fasl.ss b/s/fasl.ss
index 1e5410cf79..13941ace7b 100644
--- a/s/fasl.ss
+++ b/s/fasl.ss
@@ -1,4 +1,3 @@
-"fasl.ss"
 ;;; fasl.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -591,6 +590,17 @@
 
 (define start
   (lambda (p t situation proc)
+    (define (append-bvs bv*)
+      (let f ([bv* bv*] [n 0])
+        (if (null? bv*)
+            (if (fixnum? n)
+                (make-bytevector n)
+                ($oops 'fasl-write "fasl output is too large to compress"))
+            (let ([bv1 (car bv*)])
+              (let ([m (bytevector-length bv1)])
+                (let ([bv2 (f (cdr bv*) (+ n m))])
+                  (bytevector-copy! bv1 0 bv2 n m)
+                  bv2))))))
     (dump-graph)
     (let-values ([(bv* size)
                   (let-values ([(p extractor) ($open-bytevector-list-output-port)])
@@ -601,9 +611,23 @@
                     (proc p)
                     (extractor))])
       (put-u8 p situation)
-      (put-u8 p (constant fasl-type-fasl-size))
-      (put-uptr p size)
-      (for-each (lambda (bv) (put-bytevector p bv)) bv*))))
+      (if (and (>= size 100) (fasl-compressed))
+          (let* ([fmt ($tc-field 'compress-format ($tc))]
+                 [bv (append-bvs bv*)]
+                 [uncompressed-size-bv (call-with-bytevector-output-port (lambda (bvp) (put-uptr bvp (bytevector-length bv))))]
+                 [bv ($bytevector-compress bv fmt)])
+            (put-uptr p (+ 1 (bytevector-length uncompressed-size-bv) (bytevector-length bv)))
+            (put-u8 p 
+              (cond
+                [(eqv? fmt (constant COMPRESS-GZIP)) (constant fasl-type-gzip)]
+                [(eqv? fmt (constant COMPRESS-LZ4)) (constant fasl-type-lz4)]
+                [else ($oops 'fasl-write "unexpected $compress-format value ~s" fmt)]))
+            (put-bytevector p uncompressed-size-bv)
+            (put-bytevector p bv))
+          (begin
+            (put-uptr p (+ size 1))
+            (put-u8 p (constant fasl-type-uncompressed))
+            (for-each (lambda (bv) (put-bytevector p bv)) bv*))))))
 
 (module (fasl-write fasl-file)
   ; when called from fasl-write or fasl-file, always preserve annotations;
@@ -618,7 +642,8 @@
     (lambda (x p)
       (unless (and (output-port? p) (binary-port? p))
         ($oops who "~s is not a binary output port" p))
-      (emit-header p (constant machine-type-any))
+      (when ($port-flags-set? p (constant port-flag-compressed)) ($compressed-warning who p))
+      (emit-header p (constant scheme-version) (constant machine-type-any))
       (fasl-one x p)))
 
   (define-who fasl-file
@@ -634,7 +659,7 @@
             (delete-file out #f))
           (on-reset
             (close-port op)
-            (emit-header op (constant machine-type-any))
+            (emit-header op (constant scheme-version) (constant machine-type-any))
             (let fasl-loop ()
               (let ([x (read ip)])
                 (unless (eof-object? x)
@@ -645,7 +670,7 @@
 
 (define fasl-base-rtd
   (lambda (x p)
-    (emit-header p (constant machine-type-any))
+    (emit-header p (constant scheme-version) (constant machine-type-any))
     (let ([t (make-table)])
       (bld-graph x t #f really-bld-record)
       (start p t (constant fasl-type-visit-revisit) (lambda (p) (wrf-graph x p t #f really-wrf-record))))))
@@ -668,7 +693,6 @@
   (set! $fasl-base-rtd (lambda (x p) ((target-fasl-base-rtd (fasl-target)) x p)))
   (set! fasl-write (lambda (x p) ((target-fasl-write (fasl-target)) x p)))
   (set! fasl-file (lambda (in out) ((target-fasl-file (fasl-target)) in out))))
-)
 
 (when ($unbound-object? (#%$top-level-value '$capture-fasl-target))
   (let ([ht (make-hashtable values =)])
@@ -685,3 +709,4 @@
           [else ($oops who "unrecognized machine type ~s" mt)])))))
   
 ($capture-fasl-target (constant machine-type))
+)
diff --git a/s/foreign.ss b/s/foreign.ss
index 4420780756..d68c32e152 100644
--- a/s/foreign.ss
+++ b/s/foreign.ss
@@ -1,4 +1,3 @@
-"foreign.ss"
 ;;; foreign.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,10 +13,6 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
-"foreign.ss"
-(define remove-foreign-entry)
-(define load-shared-object)
-(define foreign-entry?)
 (let ()
    (define $foreign-address-name
       (foreign-procedure "(cs)foreign_address_name" (void*)
diff --git a/s/format.ss b/s/format.ss
index f42712d973..fed633d3b0 100644
--- a/s/format.ss
+++ b/s/format.ss
@@ -1,4 +1,3 @@
-"format.ss"
 ;;; format.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/front.ss b/s/front.ss
index 1ca36b0769..f214cebed2 100644
--- a/s/front.ss
+++ b/s/front.ss
@@ -1,4 +1,3 @@
-"front.ss"
 ;;; front.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define-who make-parameter
   (case-lambda
     [(init guard) (#2%make-parameter init guard)]
@@ -249,3 +249,4 @@
     [(x env-spec records? compiling-a-file outfn) ((current-expand) x env-spec records? compiling-a-file outfn)]))
 
 (define $compiler-is-loaded? #f)
+)
diff --git a/s/ftype.ss b/s/ftype.ss
index 3f4e3d0aa1..96a39b9a24 100644
--- a/s/ftype.ss
+++ b/s/ftype.ss
@@ -1,4 +1,3 @@
-"ftype.ss"
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
 ;;; Licensed under the Apache License, Version 2.0 (the "License");
@@ -228,6 +227,7 @@ ftype operators:
    appropriate size for int and unsigned.
 |#
 
+(begin
 (let ()
   (include "types.ss")
   (define-syntax rtd/fptr
@@ -2051,3 +2051,4 @@ ftype operators:
 (define-syntax ftype-spin-lock! (lambda (x) ($trans-ftype-locked-op! #'ftype-spin-lock! x #'$fptr-spin-lock!)))
 (define-syntax ftype-unlock! (lambda (x) ($trans-ftype-locked-op! #'ftype-unlock! x #'$fptr-unlock!)))
 (define-syntax ftype-set! (lambda (x) ($trans-ftype-set! x)))
+)
diff --git a/s/inspect.ss b/s/inspect.ss
index bd54c87116..67940aa2c4 100644
--- a/s/inspect.ss
+++ b/s/inspect.ss
@@ -1,4 +1,3 @@
-"inspect.ss"
 ;;; inspect.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -29,8 +28,7 @@
 ; ---port info should include file descriptor, perhaps provide access
 ;    location in file
 
-(define inspect)
-
+(begin
 (let ()
 
 (define-syntax make-dispatch-table
@@ -2880,3 +2878,4 @@
       [(x g) ($compute-composition x (filter-generation who g))])))
 
 (define object-counts (foreign-procedure "(cs)object_counts" () ptr))
+)
diff --git a/s/interpret.ss b/s/interpret.ss
index db25327977..dff79777e7 100644
--- a/s/interpret.ss
+++ b/s/interpret.ss
@@ -1,4 +1,3 @@
-"interpret.ss"
 ;;; interpret.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -709,6 +708,6 @@
 (set! $interpret-backend
   (lambda (x situation for-import? importer ofn)
     (interpret-Lexpand x situation for-import? importer ofn (expand/optimize-output))))
+(current-eval interpret)
 )
 
-(current-eval interpret)
diff --git a/s/io.ss b/s/io.ss
index bf52ffb571..541a7f39a5 100644
--- a/s/io.ss
+++ b/s/io.ss
@@ -1,4 +1,3 @@
-"io.ss"
 ;;; io.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;
@@ -80,6 +79,7 @@ implementation notes:
     so we instead use an input-mode flag in the port header.
 |#
 
+(begin
 (set-who! file-buffer-size
   ($make-thread-parameter $c-bufsiz
     (lambda (x)
@@ -6307,3 +6307,4 @@ implementation notes:
   ; utf8->string, etc., are in prims.ss, since they are used by
   ; foreign procedures argument and return values
 )
+)
diff --git a/s/library.ss b/s/library.ss
index 173c4586c7..f9f2988c10 100644
--- a/s/library.ss
+++ b/s/library.ss
@@ -27,8 +27,6 @@
    (generate-interrupt-trap #f)
    ($track-dynamic-closure-counts #f))
 
-"library.ss (includes #<void> just before)"
-
 (eval-when (compile)
 (define-syntax define-library-entry
   (lambda (x)
@@ -131,8 +129,6 @@
 ;;; set up $nuate for overflow
 (define $nuate ($closure-code (call/1cc (lambda (k) k))))
 
-"making closure counters!"
-
 (set! #{raw-ref-count bhowt6w0coxl0s2y-1} '#[#{profile-counter b5vnnom9h4o4uny0-2} 0])
 (set! #{raw-create-count bhowt6w0coxl0s2y-2} '#[#{profile-counter b5vnnom9h4o4uny0-2} 0])
 (set! #{raw-alloc-count bhowt6w0coxl0s2y-3} '#[#{profile-counter b5vnnom9h4o4uny0-2} 0])
diff --git a/s/mathprims.ss b/s/mathprims.ss
index e790267641..83501ceece 100644
--- a/s/mathprims.ss
+++ b/s/mathprims.ss
@@ -1,4 +1,3 @@
-"mathprims.ss"
 ;;; mathprims.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (eval-when (compile)
 
   (define-syntax define-relop
@@ -766,3 +766,4 @@
          [else (noncflonum-error 'cfl-conjugate x)])))
 
 )
+)
diff --git a/s/newhash.ss b/s/newhash.ss
index 7af992bbf2..227050bee7 100644
--- a/s/newhash.ss
+++ b/s/newhash.ss
@@ -1,4 +1,3 @@
-"newhash.ss"
 ;;; newhash.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/pdhtml.ss b/s/pdhtml.ss
index 15e929e2a4..5d45e24f6e 100644
--- a/s/pdhtml.ss
+++ b/s/pdhtml.ss
@@ -1,4 +1,3 @@
-"pdhtml.ss"
 ;;; pdhtml.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;
@@ -56,6 +55,7 @@
 ;;;  source annotation around the transformer output so that the source info for t>
 ;;;  when expression is transferred to the generated if expression.
 
+(begin
 (let ()
   (include "types.ss")
   (module (make-tracker tracker-profile-ct)
@@ -1535,3 +1535,4 @@
         (unless (or (eq? color #f) (string? color)) ($oops who "~s is not a string or #f" color))
         color)))
 )
+)
diff --git a/s/pretty.ss b/s/pretty.ss
index 5d4e995d67..3127334d94 100644
--- a/s/pretty.ss
+++ b/s/pretty.ss
@@ -1,4 +1,3 @@
-"pretty.ss"
 ;;; pretty.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -24,6 +23,7 @@
 ;;;; EXPORTED VARIABLES
 
 ;;; pretty tries to fit things within line length
+(begin
 (define pretty-line-length
    ($make-thread-parameter
       75
@@ -797,3 +797,4 @@
     (wr (prty-obj x) p)
     (write-char #\> p)))
 )
+)
diff --git a/s/primdata.ss b/s/primdata.ss
index 5f14933c0b..fbf2a34372 100644
--- a/s/primdata.ss
+++ b/s/primdata.ss
@@ -918,7 +918,6 @@
   (command-line [sig [() -> (list)] [(sub-list) -> (void)]] [flags])  ; not restricted to 1 argument
   (command-line-arguments [sig [() -> (list)] [(sub-list) -> (void)]] [flags])
   (commonization-level [sig [() -> (ufixnum)] [(sub-ufixnum) -> (void)]] [flags])
-  (compile-compressed [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
   (compile-file-message [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
   (compile-interpret-simple [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
   (compile-imported-libraries [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
@@ -955,6 +954,7 @@
   (expand-output [sig [() -> (maybe-textual-output-port)] [(maybe-textual-output-port) -> (void)]] [flags])
   (expand/optimize-output [sig [() -> (maybe-textual-output-port)] [(maybe-textual-output-port) -> (void)]] [flags])
   (exit-handler [sig [() -> (procedure)] [(procedure) -> (void)]] [flags])
+  (fasl-compressed [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
   (file-buffer-size [sig [() -> (ufixnum)] [(sub-fixnum) -> (void)]] [flags])
   (generate-allocation-counts [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
   (generate-covin-files [sig [() -> (boolean)] [(ptr) -> (void)]] [flags unrestricted])
@@ -1756,10 +1756,12 @@
   ($build-install-library/rt-code [flags])
   ($build-invoke-program [flags])
   ($byte-copy! [flags])
+  ($bytevector-compress [flags])
   ($bytevector-ref-check? [flags])
   ($bytevector-set!-check? [flags])
   ($bytevector-set! [flags])
   ($bytevector-set-immutable! #;[sig [(bytevector) -> (ptr)]] [flags true])
+  ($bytevector-uncompress [flags])
   ($capture-fasl-target [flags])
   ($c-error [flags])
   ($check-heap-errors [flags])
@@ -1786,6 +1788,7 @@
   ($compile-host-library [flags])
   ($compound-condition-components [flags discard true])
   ($compound-condition? [flags pure unrestricted mifoldable discard])
+  ($compressed-warning [flags])
   ($compute-composition [flags])
   ($compute-size [flags])
   ($constituent? [flags])
diff --git a/s/prims.ss b/s/prims.ss
index 44531e84dd..dadd7710e4 100644
--- a/s/prims.ss
+++ b/s/prims.ss
@@ -1,4 +1,3 @@
-"prims.ss"
 ;;; prims.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -19,6 +18,7 @@
    (run-cp0 (default-run-cp0))
    (generate-interrupt-trap #f))
 
+(begin
 ;;; hand-coded primitives
 
 (define-who $hand-coded
@@ -2315,3 +2315,4 @@
         (unless (string? str) ($oops who "~s is not a string" str))
         (wctmb cp (string->utf16 str 'little))))))
 )
+)
diff --git a/s/primvars.ss b/s/primvars.ss
index 3a5b6748aa..38eeabef79 100644
--- a/s/primvars.ss
+++ b/s/primvars.ss
@@ -1,4 +1,3 @@
-"primvars.ss"
 ;;; primvars.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
diff --git a/s/print.ss b/s/print.ss
index fe59260e48..a6602cdf0a 100644
--- a/s/print.ss
+++ b/s/print.ss
@@ -1,4 +1,3 @@
-"print.ss"
 ;;; print.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (eval-when (compile)
 (define-constant cycle-node-max 1000)
 
@@ -587,7 +587,7 @@ floating point returns with (1 0 -1 ...).
 (define wrhelp
    (lambda (x r lev len d? env p)
      (define void? (lambda (x) (eq? x (void))))
-     (define black-hole? (lambda (x) (eq? x '#0=#0#)))
+     (define black-hole? (lambda (x) (eq? x '#3=#3#)))
      (define base-rtd? (lambda (x) (eq? x #!base-rtd)))
      (if-feature pthreads
        (begin
@@ -1339,3 +1339,4 @@ floating point returns with (1 0 -1 ...).
       (unless (or (not x) (and (fixnum? x) (fx> x 0)) (and (bignum? x) ($bigpositive? x)))
         ($oops 'print-precision "~s is not a positive exact integer or #f" x))
       x)))
+)
diff --git a/s/read.ss b/s/read.ss
index 895484d15b..b7cb971f2a 100644
--- a/s/read.ss
+++ b/s/read.ss
@@ -1,4 +1,3 @@
-"read.ss"
 ;;; read.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -18,6 +17,7 @@
 ;(define read)
 ;(define $read)
 
+(begin
 (let ()
 (include "types.ss")
 
@@ -1872,3 +1872,4 @@
   (char-name 'alarm #\bel)
   (char-name 'nel #\nel)
   (char-name 'ls #\ls))
+)
diff --git a/s/record.ss b/s/record.ss
index 3849c55d4b..4fc8fa9251 100644
--- a/s/record.ss
+++ b/s/record.ss
@@ -1,4 +1,3 @@
-"record.ss"
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
 ;;; Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/s/reloc.ss b/s/reloc.ss
index 60261c0a4a..f93691232f 100644
--- a/s/reloc.ss
+++ b/s/reloc.ss
@@ -1,4 +1,3 @@
-"reloc.ss"
 ;;; reloc.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -14,6 +13,7 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
+(begin
 (define $reloc
   (lambda (type item-offset code-offset)
     (make-reloc type item-offset code-offset
@@ -57,8 +57,6 @@
                         (bitwise-arithmetic-shift-left (reloc-item-offset r) (constant reloc-item-offset-offset))))
                     (mkc1 r* (fx+ n 1))))))))))
 
-(define $make-cinst)
-(define $make-vtable)
 (let ()
 (set! $make-cinst
   (lambda (build-sinst vtable)
@@ -100,3 +98,4 @@
                         r)
                   (constant ptr-bytes)))))))
 )
+)
diff --git a/s/strip.ss b/s/strip.ss
index de873712b5..15c7a75323 100644
--- a/s/strip.ss
+++ b/s/strip.ss
@@ -89,6 +89,14 @@
                 (let ([k (read-byte p)])
                   (f k (logor (ash n 7) (fxsrl k 1))))
                 n)))))
+    (define read-uptr/bytes
+      (lambda (p)
+        (let ([k (read-byte p)])
+          (let f ([k k] [n (fxsrl k 1)] [bytes 1])
+            (if (fxlogbit? 0 k)
+                (let ([k (read-byte p)])
+                  (f k (logor (ash n 7) (fxsrl k 1)) (fx+ bytes 1)))
+                (values n bytes))))))
     (define read-byte-or-eof
       (lambda (p)
         (get-u8 p)))
@@ -101,6 +109,12 @@
       (let ([y (read-byte p)])
         (unless (eqv? y x)
           (bogus "expected byte ~s, got ~s from ~a" x y (port-name p)))))
+    (define read-bytevector
+      (lambda (p n)
+        (let ([bv (make-bytevector n)])
+          (do ([i 0 (fx+ i 1)])
+              ((fx= i n) bv)
+            (bytevector-u8-set! bv i (read-byte p))))))
     (define read-string
       (lambda (p)
         (let ([n (read-uptr p)])
@@ -116,13 +130,21 @@
             (fasl-type-case ty
               [(fasl-type-header) (read-header p)]
               [(fasl-type-visit fasl-type-revisit fasl-type-visit-revisit)
-               (let ([situation ty])
-                 (let ([ty (read-byte p)])
-                   (fasl-type-case ty
-                     [(fasl-type-fasl-size)
-                      (let ([size (read-uptr p)])
-                        (fasl-entry situation (read-fasl p #f)))]
-                     [else (bogus "expected fasl-size in ~a" (port-name p))])))]
+               (let* ([situation ty]
+                      [size (read-uptr p)]
+                      [compressed-flag (read-byte p)])
+                 (fasl-type-case compressed-flag
+                   [(fasl-type-gzip fasl-type-lz4)
+                    (let-values ([(dest-size dest-size-bytes) (read-uptr/bytes p)])
+                      (let* ([src-size (- size 1 dest-size-bytes)]
+                             [bv (read-bytevector p src-size)]
+                             [bv ($bytevector-uncompress bv dest-size
+                                   (if (eqv? compressed-flag (constant fasl-type-gzip))
+                                       (constant COMPRESS-GZIP)
+                                       (constant COMPRESS-LZ4)))])
+                        (fasl-entry situation (read-fasl (open-bytevector-input-port bv) #f))))]
+                   [(fasl-type-uncompressed) (fasl-entry situation (read-fasl p #f))]
+                   [else (bogus "expected compression flag in ~a" (port-name p))]))]
               [else (bogus "expected header or situation in ~a" (port-name p))]))))
     (define (read-header p)
       (let* ([bv (constant fasl-header)] [n (bytevector-length bv)])
@@ -203,13 +225,7 @@
                      ((fx= i n) v)
                    (vector-set! v i (read-iptr p))))))]
           [(fasl-type-bytevector fasl-type-immutable-bytevector)
-           (fasl-bytevector
-             ty
-             (let ([n (read-uptr p)])
-               (let ([bv (make-bytevector n)])
-                 (do ([i 0 (fx+ i 1)])
-                     ((fx= i n) bv)
-                   (bytevector-u8-set! bv i (read-byte p))))))]
+           (fasl-bytevector ty (read-bytevector p (read-uptr p)))]
           [(fasl-type-base-rtd) (fasl-tuple ty '#())]
           [(fasl-type-rtd) (read-record p g (read-fasl p g))]
           [(fasl-type-record) (read-record p g #f)]
@@ -446,52 +462,44 @@
           [reloc (type-etc code-offset item-offset fasl) (build! fasl t)]
           [indirect (g i) (build! (vector-ref g i) t)])))
 
+    (include "fasl-helpers.ss")
+
     (define write-entry
       (lambda (p x)
+        (define (append-bvs bv*)
+          (let f ([bv* bv*] [n 0])
+            (if (null? bv*)
+                (if (fixnum? n)
+                    (make-bytevector n)
+                    ($oops 'fasl-write "fasl output is too large to compress"))
+                (let ([bv1 (car bv*)])
+                  (let ([m (bytevector-length bv1)])
+                    (let ([bv2 (f (cdr bv*) (+ n m))])
+                      (bytevector-copy! bv1 0 bv2 n m)
+                      bv2))))))
         (fasl-case x
           [header (version machine dependencies)
-           (write-header p version machine dependencies)]
+           (emit-header p version machine dependencies)]
           [entry (situation fasl)
            (let ([t (make-table)])
              (build! fasl t)
-             (let ([bv (call-with-bytevector-output-port
-                         (lambda (p)
-                           (let ([n (table-count t)])
-                             (unless (fx= n 0)
-                               (write-byte p (constant fasl-type-graph))
-                               (write-uptr p n)))
-                           (write-fasl p t fasl)))])
-               (write-byte p situation)
-               (write-byte p (constant fasl-type-fasl-size))
-               (write-uptr p (bytevector-length bv))
-               (put-bytevector p bv)))]
+             ($fasl-start p t situation
+               (lambda (p) (write-fasl p t fasl))))]
           [else (sorry! "unrecognized top-level fasl-record-type ~s" x)])))
 
-    (define write-header
-      (lambda (p version machine dependencies)
-        (put-bytevector p (constant fasl-header))
-        (write-uptr p version)
-        (write-uptr p machine)
-        (write-byte p (char->integer #\())
-        (let f ([dependencies dependencies])
-          (unless (null? dependencies)
-            (write-byte p (car dependencies))
-            (f (cdr dependencies))))
-        (write-byte p (char->integer #\)))))
-
     (define write-graph
       (lambda (p t x th)
         (let ([a (eq-hashtable-ref (table-ht t) x #f)])
           (cond
             [(not a) (th)]
             [(cdr a)
-             (write-byte p (constant fasl-type-graph-def))
-             (write-uptr p (car a))
+             (put-u8 p (constant fasl-type-graph-def))
+             (put-uptr p (car a))
              (set-cdr! a #f)
              (th)]
             [else
-             (write-byte p (constant fasl-type-graph-ref))
-             (write-uptr p (car a))]))))
+             (put-u8 p (constant fasl-type-graph-ref))
+             (put-uptr p (car a))]))))
 
     (define write-fasl
       (lambda (p t x)
@@ -501,42 +509,42 @@
           [pair (vfasl)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-pair))
-               (write-uptr p (fx- (vector-length vfasl) 1))
+               (put-u8 p (constant fasl-type-pair))
+               (put-uptr p (fx- (vector-length vfasl) 1))
                (vector-for-each (lambda (fasl) (write-fasl p t fasl)) vfasl)))]
           [tuple (ty vfasl)
            (write-graph p t x
              (lambda ()
-               (write-byte p ty)
+               (put-u8 p ty)
                (vector-for-each (lambda (fasl) (write-fasl p t fasl)) vfasl)))]
           [string (ty string)
            (write-graph p t x
              (lambda ()
-               (write-byte p ty)
+               (put-u8 p ty)
                (write-string p string)))]
           [gensym (pname uname)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-gensym))
+               (put-u8 p (constant fasl-type-gensym))
                (write-string p pname)
                (write-string p uname)))]
           [vector (ty vfasl)
            (write-graph p t x
              (lambda ()
-               (write-byte p ty)
-               (write-uptr p (vector-length vfasl))
+               (put-u8 p ty)
+               (put-uptr p (vector-length vfasl))
                (vector-for-each (lambda (fasl) (write-fasl p t fasl)) vfasl)))]
           [fxvector (ty viptr)
            (write-graph p t x
              (lambda ()
-               (write-byte p ty)
-               (write-uptr p (vector-length viptr))
-               (vector-for-each (lambda (iptr) (write-iptr p iptr)) viptr)))]
+               (put-u8 p ty)
+               (put-uptr p (vector-length viptr))
+               (vector-for-each (lambda (iptr) (put-iptr p iptr)) viptr)))]
           [bytevector (ty bv)
            (write-graph p t x
              (lambda ()
-               (write-byte p ty)
-               (write-uptr p (bytevector-length bv))
+               (put-u8 p ty)
+               (put-uptr p (bytevector-length bv))
                (put-bytevector p bv)))]
           [record (maybe-uid size nflds rtd pad-ty* fld*)
            (if (and strip-source-annotations? (fasl-annotation? x))
@@ -545,51 +553,51 @@
                  (lambda ()
                    (if maybe-uid
                        (begin
-                         (write-byte p (constant fasl-type-rtd))
+                         (put-u8 p (constant fasl-type-rtd))
                          (write-fasl p t maybe-uid))
-                       (write-byte p (constant fasl-type-record)))
-                   (write-uptr p size)
-                   (write-uptr p nflds)
+                       (put-u8 p (constant fasl-type-record)))
+                   (put-uptr p size)
+                   (put-uptr p nflds)
                    (write-fasl p t rtd)
                    (for-each (lambda (pad-ty fld)
-                               (write-byte p pad-ty)
+                               (put-u8 p pad-ty)
                                (field-case fld
                                  [ptr (fasl) (write-fasl p t fasl)]
-                                 [byte (n) (write-byte p n)]
-                                 [iptr (n) (write-iptr p n)]
-                                 [single (n) (write-uptr p n)]
+                                 [byte (n) (put-u8 p n)]
+                                 [iptr (n) (put-iptr p n)]
+                                 [single (n) (put-uptr p n)]
                                  [double (high low)
-                                  (write-uptr p high)
-                                  (write-uptr p low)]))
+                                  (put-uptr p high)
+                                  (put-uptr p low)]))
                      pad-ty* fld*))))]
           [closure (offset c)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-closure))
-               (write-uptr p offset)
+               (put-u8 p (constant fasl-type-closure))
+               (put-uptr p offset)
                (write-fasl p t c)))]
           [flonum (high low)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-flonum))
-               (write-uptr p high)
-               (write-uptr p low)))]
+               (put-u8 p (constant fasl-type-flonum))
+               (put-uptr p high)
+               (put-uptr p low)))]
           [large-integer (sign vuptr)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-large-integer))
-               (write-byte p sign)
-               (write-uptr p (vector-length vuptr))
-               (vector-for-each (lambda (uptr) (write-uptr p uptr)) vuptr)))]
+               (put-u8 p (constant fasl-type-large-integer))
+               (put-u8 p sign)
+               (put-uptr p (vector-length vuptr))
+               (vector-for-each (lambda (uptr) (put-uptr p uptr)) vuptr)))]
           [eq-hashtable (mutable? subtype minlen veclen vpfasl)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-eq-hashtable))
-               (write-byte p mutable?)
-               (write-byte p subtype)
-               (write-uptr p minlen)
-               (write-uptr p veclen)
-               (write-uptr p (vector-length vpfasl))
+               (put-u8 p (constant fasl-type-eq-hashtable))
+               (put-u8 p mutable?)
+               (put-u8 p subtype)
+               (put-uptr p minlen)
+               (put-uptr p veclen)
+               (put-uptr p (vector-length vpfasl))
                (vector-for-each
                  (lambda (pfasl)
                    (write-fasl p t (car pfasl))
@@ -598,12 +606,12 @@
           [symbol-hashtable (mutable? minlen equiv veclen vpfasl)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-symbol-hashtable))
-               (write-byte p mutable?)
-               (write-uptr p minlen)
-               (write-byte p equiv)
-               (write-uptr p veclen)
-               (write-uptr p (vector-length vpfasl))
+               (put-u8 p (constant fasl-type-symbol-hashtable))
+               (put-u8 p mutable?)
+               (put-uptr p minlen)
+               (put-u8 p equiv)
+               (put-uptr p veclen)
+               (put-uptr p (vector-length vpfasl))
                (vector-for-each
                  (lambda (pfasl)
                    (write-fasl p t (car pfasl))
@@ -612,10 +620,10 @@
           [code (flags free name arity-mask info pinfo* bytes m vreloc)
            (write-graph p t x
              (lambda ()
-               (write-byte p (constant fasl-type-code))
-               (write-byte p flags)
-               (write-uptr p free)
-               (write-uptr p (bytevector-length bytes))
+               (put-u8 p (constant fasl-type-code))
+               (put-u8 p flags)
+               (put-uptr p free)
+               (put-uptr p (bytevector-length bytes))
                (write-fasl p t name)
                (write-fasl p t arity-mask)
                (if strip-inspector-information?
@@ -625,52 +633,28 @@
                    (write-fasl p t (fasl-atom (constant fasl-type-immediate) (constant snil)))
                    (write-fasl p t pinfo*))
                (put-bytevector p bytes)
-               (write-uptr p m)
+               (put-uptr p m)
                (vector-for-each (lambda (reloc) (write-fasl p t reloc)) vreloc)))]
           [small-integer (iptr)
-           (write-byte p (constant fasl-type-small-integer))
-           (write-iptr p iptr)]
+           (put-u8 p (constant fasl-type-small-integer))
+           (put-iptr p iptr)]
           [atom (ty uptr)
-           (write-byte p ty)
-           (write-uptr p uptr)]
+           (put-u8 p ty)
+           (put-uptr p uptr)]
           [reloc (type-etc code-offset item-offset fasl)
-           (write-byte p type-etc)
-           (write-uptr p code-offset)
-           (when (fxlogtest type-etc 2) (write-uptr p item-offset))
+           (put-u8 p type-etc)
+           (put-uptr p code-offset)
+           (when (fxlogtest type-etc 2) (put-uptr p item-offset))
            (write-fasl p t fasl)]
           [indirect (g i) (write-fasl p t (vector-ref g i))])))
 
-    (define write-byte
-      (lambda (p x)
-        (put-u8 p x)))
-
-    (define-who write-uptr
-      (lambda (p n)
-        (unless (>= n 0)
-          (sorry! "received negative input ~s" n))
-        (let f ([n n] [cbit 0])
-          (if (and (fixnum? n) (fx<= n 127))
-              (write-byte p (fxlogor (fxsll n 1) cbit))
-              (begin
-                (f (ash n -7) 1)
-                (write-byte p (fxlogor (fxsll (logand n #x7f) 1) cbit)))))))
-
-    (define write-iptr
-      (lambda (p x)
-        (let f ([n (if (< x 0) (- x) x)] [cbit 0])
-          (if (and (fixnum? n) (fx<= n 63))
-              (write-byte p (fxlogor (if (< x 0) #x80 0) (fxsll n 1) cbit))
-              (begin
-                (f (ash n -7) 1)
-                (write-byte p (fxlogor (fxsll (logand n #x7f) 1) cbit)))))))
-
     (define write-string
       (lambda (p x)
         (let ([n (string-length x)])
-          (write-uptr p n)
+          (put-uptr p n)
           (do ([i 0 (fx+ i 1)])
             ((fx= i n))
-            (write-uptr p (char->integer (string-ref x i)))))))
+            (put-uptr p (char->integer (string-ref x i)))))))
 
     (module (fasl-program-info? fasl-library/rt-info? fasl-recompile-info?)
       (import (nanopass))
@@ -700,7 +684,6 @@
             (on-reset (close-port ip)
               (let* ([script-header (read-script-header ip)]
                      [mode (and script-header (unless-feature windows (get-mode ifn)))])
-                (port-file-compressed! ip)
                 (let loop ([rentry* '()])
                   (set! fasl-count (fx+ fasl-count 1))
                   (let ([entry (read-entry ip)])
@@ -728,7 +711,6 @@
                   (on-reset (delete-file ofn #f)
                     (on-reset (close-port op)
                       (when script-header (put-bytevector op script-header))
-                      (when (compile-compressed) (port-file-compressed! op))
                       (for-each (lambda (entry) (write-entry op entry)) entry*)
                       (close-port op)
                       (unless-feature windows (when mode (chmod ofn mode)))))))))))))
@@ -898,19 +880,16 @@
                          (let ([script-header1 (read-script-header ip1)]
                                [script-header2 (read-script-header ip2)])
                            (if (equal? script-header1 script-header2)
-                               (begin
-                                 (port-file-compressed! ip1)
-                                 (port-file-compressed! ip2)
-                                 (let loop ()
-                                   (set! fasl-count (fx+ fasl-count 1))
-                                   (let ([entry1 (read-entry ip1)] [entry2 (read-entry ip2)])
-                                     (if (eof-object? entry1)
-                                         (or (eof-object? entry2)
-                                             (and error? (bogus "~a has fewer fasl entries than ~a" ifn1 ifn2)))
-                                         (if (eof-object? entry2)
-                                             (and error? (bogus "~a has fewer fasl entries than ~a" ifn2 ifn1))
-                                             (and (fluid-let ([cmp-ht (make-eq-hashtable)]
-                                                              [gensym-table (make-hashtable string-hash string=?)])
-                                                    (fasl=? entry1 entry2))
-                                                  (loop)))))))
+                               (let loop ()
+                                 (set! fasl-count (fx+ fasl-count 1))
+                                 (let ([entry1 (read-entry ip1)] [entry2 (read-entry ip2)])
+                                   (if (eof-object? entry1)
+                                       (or (eof-object? entry2)
+                                           (and error? (bogus "~a has fewer fasl entries than ~a" ifn1 ifn2)))
+                                       (if (eof-object? entry2)
+                                           (and error? (bogus "~a has fewer fasl entries than ~a" ifn2 ifn1))
+                                           (and (fluid-let ([cmp-ht (make-eq-hashtable)]
+                                                            [gensym-table (make-hashtable string-hash string=?)])
+                                                  (fasl=? entry1 entry2))
+                                                (loop))))))
                                (and error? (bogus "script headers ~s and ~s differ" script-header1 script-header2)))))))))))])))))
diff --git a/s/strnum.ss b/s/strnum.ss
index feba1a37dc..3802788cdb 100644
--- a/s/strnum.ss
+++ b/s/strnum.ss
@@ -1,4 +1,3 @@
-"strnum.ss"
 ;;; strnum.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -94,6 +93,7 @@ restriction, with string->number returning #f and the reader raising
 an exception.
 |#
 
+(begin
 (let ()
 ;;   (mknum-state <state name>
 ;;                <expression if end of string found>
@@ -529,3 +529,4 @@ an exception.
      (unless (inexact? x)
        ($oops who "a precision is specified and ~s is not inexact" x))
      (parameterize ([print-radix r] [print-precision m]) (format "~a" x))]))
+)
diff --git a/s/syntax.ss b/s/syntax.ss
index e3bf829c97..75aee67e9c 100644
--- a/s/syntax.ss
+++ b/s/syntax.ss
@@ -1,4 +1,3 @@
-"syntax.ss"
 ;;; syntax.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;; 
@@ -4847,7 +4846,6 @@
                                           fp
                                           (loop fp))))))
                             (begin (set-port-position! ip start-pos) 0)))])
-              (port-file-compressed! ip)
               (if ($compiled-file-header? ip)
                   (let ([x (fasl-read ip)])
                     (close-port ip)
@@ -5185,7 +5183,6 @@
                                             fp
                                             (loop fp))))))
                               (begin (set-port-position! ip start-pos) 0)))])
-                (port-file-compressed! ip)
                 (unless ($compiled-file-header? ip) ($oops who "missing header for compiled file ~s" fn))
                 (let ([x (fasl-read ip)])
                   (unless (recompile-info? x) ($oops who "expected recompile info at start of ~s, found ~a" fn x)))
@@ -7482,6 +7479,7 @@
 
 (current-expand sc-expand)
 
+(begin
 ;;; syntax-rules/syntax-case aux keywords
 (define-syntax ...
   (lambda (x)
@@ -10303,3 +10301,4 @@
 
 (set-who! $annotation-options (make-enumeration '(debug profile)))
 (set-who! $make-annotation-options (enum-set-constructor $annotation-options))
+)
diff --git a/s/trace.ss b/s/trace.ss
index 31f1248ddb..49f84eba91 100644
--- a/s/trace.ss
+++ b/s/trace.ss
@@ -1,4 +1,3 @@
-"trace.ss"
 ;;; trace.ss
 ;;; Copyright 1984-2017 Cisco Systems, Inc.
 ;;;