From 2daf225cab9f4bc1411882c8a3b1f073ce1e01c4 Mon Sep 17 00:00:00 2001
From: dyb <dyb@scheme.com>
Date: Mon, 11 Feb 2019 20:06:42 -0800
Subject: [PATCH] committing a handful of changes, none of which should be
 particularly controversial, unless I damaged something in the process of
 integrating them with other recent changes.  the user's guide and release
 notes have been updated as well to reflect the changes of interest to end
 users. - the body of load-library is now wrapped in a $pass-time with   to
 show the time spent loading libraries separately from the time   spent in
 expand.     syntax.ss - interpret now plays the pass-time game    
 interpret.ss - added compile-time-value? predicate and  
 compile-time-value-value accessor     syntax.ss, primdata.ss,     8.ms,
 primvars.ms, root-experr* - $pass-stats now returns accurrate stats for the
 currently timed   pass.     7.ss - compile-whole-program and
 compile-whole-library now propagate   recompile info from the named wpo file
 to the object file   to support maybe-compile-program and
 maybe-compile-library in   the case where compile-whole-{program,library}
 overwrites the   original object file.     compile.ss,     7.ms, mat.ss,
 primvars.ms - replaced the ancient and unusable bintar with one that creates 
  a useful tarball for binary installs     bintar - generated Mf-install
 InstallBin (InstallLib, InstallMan) now   correctly indirects through
 InstallPrefix if the --installbin   (--installlib, --installman) configure
 flag is not present.     src/configure - removed definition of
 generate-procedure-source-information     patch.ss - guardian tconc cells are
 now allocated in generation 0 in the hope   that they can be released more
 quickly.     gc.c - added ftype-guardian syntax: (ftype-guardian A) creates a
 new   guardian for ftype pointers of type A, the first base field (or   one
 of the first base fields in the case of unions) of which must   be a
 word-sized integer with native endianness representing a   reference count. 
 ftype pointers are registered with and retrieved   from the guardian just
 like objects are registered with and   retrieved from any guardian.  the
 difference is that the garbage   collector decrements the reference count
 before resurrecting an   ftype pointer and resurrects only those whose
 reference counts   become zero, i.e., are ready for deallocation.    
 ftype.ss, cp0.ss, cmacros.ss, cpnanopass.ss, prims.ss, primdata.ss,     gc.c,
     4.ms, root-experr* - fixed a bug in automatic recompilation handling of
 missing include   files specified with absolute pathnames or pathnames
 starting with   "./" or "..": was erroring out in file-modification-time with
 a   file-not-found or other exception rather than recompiling.     syntax.ss,
     7.ms, root-experr*, patch* - changed inline vector-for-each and
 string-for-each code to   put the last call to the procedure in tail
 position, as was   already done for the library definitions and for the
 inline   code for for-each.     cp0.ss,     5_4.ms, 5_6.ms - the compiler now
 generates better inline code for the bytevector   procedure.  instead of one
 byte memory write for each argument,   it writes up to 4 (32-bit machines) or
 8 (64-bit machines) bytes   at a time, which almost always results in fewer
 instructions and   fewer writes.     cpnanopass.ss,     bytevector.ms -
 packaged unchanging implicit reader arguments into a single record   to
 reduce the number of arguments.     read.ss - recoded run-vector to handle
 zero-length vectors.  it appears   we're not presently generating empty
 vectors (representing empty   groups), but the fasl format permits them.    
 7.ss

original commit: 7be1d190de7171f74a1ee71e348d3e6310392686
---
 LOG                              |  71 ++++
 bintar                           | 146 ++++---
 c/gc.c                           |  13 +-
 configure                        |   6 +-
 csug/syntax.stex                 |  26 ++
 csug/threads.stex                | 112 ++++++
 mats/4.ms                        | 141 +++++++
 mats/5_4.ms                      |  34 ++
 mats/5_6.ms                      |  34 ++
 mats/7.ms                        | 428 ++++++++++++++++++---
 mats/8.ms                        |  17 +
 mats/bytevector.ms               | 265 ++++++++++++-
 mats/mat.ss                      |  12 +
 mats/patch-compile-0-f-t-f       |  28 +-
 mats/patch-compile-0-t-f-f       | 636 +++++++++++++++----------------
 mats/patch-interpret-0-f-f-f     |  48 +--
 mats/patch-interpret-0-f-t-f     |  48 +--
 mats/patch-interpret-3-f-f-f     |   4 +-
 mats/patch-interpret-3-f-t-f     |   4 +-
 mats/primvars.ms                 |   3 +-
 mats/root-experr-compile-0-f-f-f |  11 +-
 mats/root-experr-compile-2-f-f-f |  32 +-
 release_notes/release_notes.stex |  52 +++
 s/7.ss                           |  37 +-
 s/cmacros.ss                     |  23 +-
 s/compile.ss                     |  50 ++-
 s/cp0.ss                         | 127 +++---
 s/cpnanopass.ss                  |  76 +++-
 s/ftype.ss                       |  29 +-
 s/interpret.ss                   |  21 +-
 s/patch.ss                       |   5 -
 s/primdata.ss                    |   9 +-
 s/prims.ss                       |  13 +-
 s/read.ss                        | 174 +++++----
 s/syntax.ss                      | 153 ++++----
 35 files changed, 2093 insertions(+), 795 deletions(-)

diff --git a/LOG b/LOG
index e06c729446..00138656a0 100644
--- a/LOG
+++ b/LOG
@@ -1061,3 +1061,74 @@
     newhash.ss, primdata.ss,
     hash.ms, root-experr*, patch*,
     objects.stex, release_notes.stex
+- the body of load-library is now wrapped in a $pass-time with
+  to show the time spent loading libraries separately from the time
+  spent in expand.
+    syntax.ss
+- interpret now plays the pass-time game
+    interpret.ss
+- added compile-time-value? predicate and
+  compile-time-value-value accessor
+    syntax.ss, primdata.ss,
+    8.ms, primvars.ms, root-experr*
+- $pass-stats now returns accurrate stats for the currently timed
+  pass.
+    7.ss
+- compile-whole-program and compile-whole-library now propagate
+  recompile info from the named wpo file to the object file 
+  to support maybe-compile-program and maybe-compile-library in
+  the case where compile-whole-{program,library} overwrites the
+  original object file.
+    compile.ss,
+    7.ms, mat.ss, primvars.ms
+- replaced the ancient and unusable bintar with one that creates
+  a useful tarball for binary installs
+    bintar
+- generated Mf-install InstallBin (InstallLib, InstallMan) now
+  correctly indirects through InstallPrefix if the --installbin
+  (--installlib, --installman) configure flag is not present.
+    src/configure
+- removed definition of generate-procedure-source-information
+    patch.ss
+- guardian tconc cells are now allocated in generation 0 in the hope
+  that they can be released more quickly.
+    gc.c
+- added ftype-guardian syntax: (ftype-guardian A) creates a new
+  guardian for ftype pointers of type A, the first base field (or
+  one of the first base fields in the case of unions) of which must
+  be a word-sized integer with native endianness representing a
+  reference count.  ftype pointers are registered with and retrieved
+  from the guardian just like objects are registered with and
+  retrieved from any guardian.  the difference is that the garbage
+  collector decrements the reference count before resurrecting an
+  ftype pointer and resurrects only those whose reference counts
+  become zero, i.e., are ready for deallocation.
+    ftype.ss, cp0.ss, cmacros.ss, cpnanopass.ss, prims.ss, primdata.ss,
+    gc.c,
+    4.ms, root-experr*
+- fixed a bug in automatic recompilation handling of missing include
+  files specified with absolute pathnames or pathnames starting with
+  "./" or "..": was erroring out in file-modification-time with a
+  file-not-found or other exception rather than recompiling.
+    syntax.ss,
+    7.ms, root-experr*, patch*
+- changed inline vector-for-each and string-for-each code to
+  put the last call to the procedure in tail position, as was
+  already done for the library definitions and for the inline
+  code for for-each.
+    cp0.ss,
+    5_4.ms, 5_6.ms
+- the compiler now generates better inline code for the bytevector
+  procedure.  instead of one byte memory write for each argument,
+  it writes up to 4 (32-bit machines) or 8 (64-bit machines) bytes
+  at a time, which almost always results in fewer instructions and
+  fewer writes.
+    cpnanopass.ss,
+    bytevector.ms
+- packaged unchanging implicit reader arguments into a single record
+  to reduce the number of arguments.
+    read.ss
+- recoded run-vector to handle zero-length vectors.  it appears
+  we're not presently generating empty vectors (representing empty
+  groups), but the fasl format permits them.
+    7.ss
diff --git a/bintar b/bintar
index f0b2b8764a..7d3654689a 100644
--- a/bintar
+++ b/bintar
@@ -1,89 +1,73 @@
 #! /bin/csh -f
-if ($#argv < 3) then
-    echo "Usage: $BINTAR <release> <dist-type> <machine-type1> <machine-type2> ..."
-    exit(1)
-endif
-set release = $argv[1]
-if (!(-d $release)) then
-    echo Release $release does not exist or is not a directory
-    exit(1)
+
+set T = "."
+if ("$argv[1]" == "--target-dir") then
+    set T = "$argv[2]"
+    shift
+    shift
 endif
 
-switch ($argv[2])
-    case tar.gz:
-        if (!($?tarfile)) set tarfile = "$release"
-        foreach x ($argv[3-])
-            set tarfile = "$tarfile"-$x
-        end
-        set tarfile = "$tarfile".tar.gz
-        alias command 'tar -chf - \!* | gzip -c >' $tarfile
+if ($#argv != 2 && $#argv != 3) then
+    echo "Usage: $0 [ --target-dir <target-directory> ] <release> <machine-type> [ <workarea> ]"
+    exit 1
+endif
+
+set R = $argv[1]
+set M = $argv[2]
+if ($#argv == 2) then
+  set W = $M
+else
+  set W = $argv[3]
+endif
+
+if (!(-d $W)) then
+    echo "Error: work area $W does not exist or is not a directory"
+    exit 1
+endif
+
+if (!(-e $W/boot/$M)) then
+    echo "Error: "$
+    exit 1
+endif
+
+if (-e $R) then
+    echo "Error: $R already exists"
+    exit 1
+endif
+
+onintr error
+
+mkdir $R || goto error
+( cd $R ; ln -s ../LICENSE ../NOTICE . ) || goto error
+( cd $R ; ln -s ../$W/scheme.1.in ../$W/installsh ../$W/examples . ) || goto error
+( cd $R ; ln -s ../$W/Mf-install Makefile ) || goto error
+mkdir -p $R/boot/$M $R/bin/$M || goto error
+( cd $R/boot/$M ; ln -s ../../../$W/boot/$M/{scheme.h,petite.boot,scheme.boot} . ) || goto error
+
+switch ($M)
+    case a6nt:
+    case ta6nt:
+    case ti3nt:
+    case i3nt:
+        ( cd $R/boot/$M ; ln -s ../../../$W/boot/$M/{csv951md.lib,csv951mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) || goto error
+        ( cd $R/bin/$M ; ln -s ../../../$W/bin/$M/{scheme.exe,csv951.dll,csv951.lib,vcruntime140.lib} . ) || goto error
+        breaksw
+    default:
+        ( cd $R/boot/$M ; ln -s ../../../$W/boot/$M/{main.o,kernel.o} . ) || goto error
+        ( cd $R/bin/$M ; ln -s ../../../$W/bin/$M/{scheme} . ) || goto error
         breaksw
-    default
-        echo Unknown target $argv[2]
-        exit(1)
 endsw
 
-set files = ()
-set files = ($files $release/{Notice,ReadMe})
-set files = ($files $release/License)
-set files = ($files $release/examples/*)
-set files = ($files $release/custom/{ReadMe,custom.c})
-set files = ($files $release/custom/{crepl.c,sample.c,sample.ss})
-
-foreach m ($argv[3-])
-    set files = ($files $release/boot/$m/scheme.h)
-    set files = ($files $release/boot/$m/petite.boot)
-    set files = ($files $release/boot/$m/scheme.boot)
-    switch ($m)
-        case a6nt:
-        case ta6nt:
-        case ti3nt:
-        case i3nt:
-            set files = ($files $release/bin/$m/scheme.exe)
-            set files = ($files $release/bin/$m/csv951.dll)
-            set files = ($files $release/bin/$m/csv951.lib)
-            set files = ($files $release/bin/$m/vcruntime140.dll)
-            set files = ($files $release/boot/$m/csv951md.lib)
-            set files = ($files $release/boot/$m/csv951mt.lib)
-            set files = ($files $release/boot/$m/custommd.obj)
-            set files = ($files $release/boot/$m/custommt.obj)
-            set files = ($files $release/boot/$m/scheme.res)
-            set files = ($files $release/custom/Makefile.$m)
-            breaksw
-        default:
-            set files = ($files $release/bin/$m/scheme)
-            set files = ($files $release/boot/$m/custom.o)
-            set files = ($files $release/boot/$m/kernel.o)
-            set files = ($files $release/custom/Mf-$m)
-            if (! $?custom_make) then
-                set files = ($files $release/custom/{configure,Makefile.in,Mf-none,Mf-install.in,installsh})
-                set files = ($files $release/custom/scheme.1.in)
-                set custom_make
-            endif
-            breaksw
-    endsw
-end
-
-if ($?INTERACTIVE) then
-  ls -lL $files | more -10
-  askokay:
-    echo -n "Okay? (y/n) [y]: "
-    set ans = $<
-    if ("$ans" == "n") exit(1)
-    if ("$ans" != "" && "$ans" != "y") goto askokay
-
-  again:
-    echo "Command Alias:"
-    alias command
-    echo -n "Okay? (y/n) [y]: "
-    set ans = $<
-    if ("$ans" != "" && "$ans" != "y") then
-      if ("$ans" == "n") then
-        echo -n "Enter appropriate command: "
-        alias command "$<"
-      endif
-      goto again
-    endif
+set broken = `find -L $R -type l`
+if ($#broken != 0) then
+    echo "Error: missing $broken"
+    goto error
 endif
 
-command $files
+tar -czhf $T/csv$R-$M.tar.gz $R || goto error
+rm -rf $R
+exit
+
+error:
+rm -rf $R
+exit 1
diff --git a/c/gc.c b/c/gc.c
index be750f8ba3..f14b110355 100644
--- a/c/gc.c
+++ b/c/gc.c
@@ -916,6 +916,17 @@ void GCENTRY(ptr tc, IGEN mcg, IGEN tg) {
                 ptr old_end, new_end;
 
                 rep = GUARDIANREP(ls);
+              /* ftype_guardian_rep is a marker for reference-counted ftype pointer */
+                if (rep == ftype_guardian_rep) {
+                  int b; uptr *addr;
+                  rep = GUARDIANOBJ(ls);
+                  if (FWDMARKER(rep) == forward_marker) rep = FWDADDRESS(rep);
+                /* Caution: Building in assumption about shape of an ftype pointer */
+                  addr = RECORDINSTIT(rep, 0);
+                  LOCKED_DECR(addr, b);
+                  if (!b) continue;
+                }
+
                 relocate(&rep);
 
               /* if tconc was old it's been forwarded */
@@ -923,7 +934,7 @@ void GCENTRY(ptr tc, IGEN mcg, IGEN tg) {
 
                 old_end = Scdr(tconc);
                 /* allocating pair in tg means it will be swept, which is wasted effort, but should cause no harm */
-                new_end = S_cons_in(space_impure, tg, FIX(0), FIX(0));
+                new_end = S_cons_in(space_impure, 0, FIX(0), FIX(0));
 #ifdef ENABLE_OBJECT_COUNTS
                 S_G.countof[tg][countof_pair] += 1;
 #endif /* ENABLE_OBJECT_COUNTS */
diff --git a/configure b/configure
index edbb9a544e..3f288c7251 100755
--- a/configure
+++ b/configure
@@ -249,15 +249,15 @@ if [ "$w" = "" ] ; then
 fi
 
 if [ "$installbin" = "" ] ; then
-  installbin=$installprefix/bin
+  installbin='${InstallPrefix}/bin'
 fi
 
 if [ "$installlib" = "" ] ; then
-  installlib=$installprefix/lib
+  installlib='${InstallPrefix}/lib'
 fi
 
 if [ "$installman" = "" ] ; then
-  installman=$installprefix/$installmansuffix
+  installman='${InstallPrefix}'/$installmansuffix
 fi
 
 if [ "$disablex11" = "no" ] ; then
diff --git a/csug/syntax.stex b/csug/syntax.stex
index aa021c2ff4..b22950adb6 100644
--- a/csug/syntax.stex
+++ b/csug/syntax.stex
@@ -629,6 +629,32 @@ prec ;=> \var{exception: invalid syntax prec}
 \endschemedisplay
 
 
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{compile-time-value?}{\categoryprocedure}{(compile-time-value? \var{obj})}
+\returns \scheme{#t} if \var{obj} is a compile-time value; \scheme{#f} otherwise
+\listlibraries
+\endentryheader
+
+\schemedisplay
+(define-syntax x (make-compile-time-value "eggs"))
+(compile-time-value? (top-level-syntax 'x)) ;=> #t
+\endschemedisplay
+
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{compile-time-value-value}{\categoryprocedure}{(compile-time-value-value \var{ctv})}
+\returns the value of a compile-time value
+\listlibraries
+\endentryheader
+
+\schemedisplay
+(define-syntax x (make-compile-time-value "eggs"))
+(compile-time-value-value (top-level-syntax 'x)) ;=> "eggs"
+\endschemedisplay
+
+
 %----------------------------------------------------------------------------
 \entryheader
 \formdef{define-property}{\categorysyntax}{(define-property \var{id} \var{key} \var{expr})}
diff --git a/csug/threads.stex b/csug/threads.stex
index a098280758..3ab1413bba 100644
--- a/csug/threads.stex
+++ b/csug/threads.stex
@@ -406,6 +406,118 @@ the specified field, subtracts $1$ from the value, and writes the new
 value back into the field.
 Both return \scheme{#t} if the new value is 0, otherwise \scheme{#f}.
 
+\section{Reference counting with ftype guardians\label{SECTTHREADFTYPEGUARDIANS}}
+
+\index{\scheme{ftype-guardian}}%
+Applications that manage memory outside the Scheme heap can leverage
+the Scheme storage management system to help perform reference
+counting via \emph{ftype guardians}.
+In a reference-counted memory management system, each object holds
+a count of pointers to it.
+The count is incremented when a new pointer is created and decremented
+when a pointer is dropped.
+When the count reaches zero, the object is no longer needed and the
+memory it formerly occupied can be made available for some other
+purpose.
+
+\entryheader
+\formdef{ftype-guardian}{\categorysyntax}{(ftype-guardian \var{ftype-name})}
+\returns a new ftype guardian
+\listlibraries
+\endentryheader
+
+\var{ftype-name} must name an ftype.
+The first base field of the ftype (or one of the first base fields
+in the case of unions) must be a word-sized integer (iptr or uptr)
+with native endianness.
+This field is assumed to hold a reference count.
+
+The return value is a new ftype guardian \var{g}, with which
+ftype-pointers of type \var{ftype-name} (or some subtype of
+\var{ftype-name}) can be registered.
+An ftype pointer is registered with \var{g} by invoking \var{g}
+with the ftype pointer as an argument.
+
+An ftype guardian does not automatically protect from collection
+the ftype pointers registered with it,  as a normal guardian would
+do.
+Instead, for each registered ftype pointer that becomes inaccessible
+via normal (non-weak, non-guardian pointers), the guardian decrements
+the reference count of the object to which the ftype pointer points.
+If the resulting reference-count value is zero, the ftype pointer
+is preserved and can be retrieved from the guardian.
+If the resulting reference-count value is non-zero, however, the
+ftype pointer is not preserved.
+Objects retrieved from an ftype guardian (by calling it without
+arguments) are guaranteed to have zero reference counts, assuming
+reference counts are maintained properly by code outside the
+collector.
+
+The collector decrements the reference count using the equivalent
+of \index{\scheme{ftype-locked-decr!}}\scheme{ftype-locked-decr!}
+to support systems in which non-Scheme objects are stored in memory
+shared by multiple processes.
+In such systems, programs should themselves use
+\index{\scheme{ftype-locked-incr!}}\scheme{ftype-locked-incr!} and
+\scheme{ftype-locked-decr!} or non-Scheme equivalents (e.g., the C
+\index{\scheme{LOCKED_INCR}}\scheme{LOCKED_INCR} and
+\index{\scheme{LOCKED_INCR}}\scheme{LOCKED_DECR} macros in scheme.h,
+which are described in Section~\ref{SECTFOREIGNCLIB}) to maintain
+reference counts.
+
+The following example defines a simple ftype and an allocator for
+objects of that ftype that frees any objects of that ftype that were
+previously allocated and no longer accessible.
+
+\schemedisplay
+(module (A make-A free-dropped-As)
+  (define-ftype A
+    (struct
+      [refcount uptr]
+      [data int]))
+  (define g (ftype-guardian A))
+  (define free-dropped-As
+    (lambda ()
+      (let ([a (g)])
+        (when a
+          (printf "freeing ~s\n" (ftype-ref A (data) a))
+          (foreign-free (ftype-pointer-address a))
+          (free-dropped-As)))))
+  (define make-A
+    (lambda (n)
+      (free-dropped-As)
+      (let ([a (make-ftype-pointer A (foreign-alloc (ftype-sizeof A)))])
+        (ftype-set! A (refcount) a 1)
+        (ftype-set! A (data) a n)
+        (g a)
+        a))))
+\endschemedisplay
+
+We can test this by allocating, dropping, and immediately collecting
+ftype pointers to A.
+
+\schemedisplay
+> (do ([i 10 (fx- i 1)])
+      ((fx= i 0))
+    (make-A i)
+    (collect))
+freeing 10
+freeing 9
+freeing 8
+freeing 7
+freeing 6
+freeing 5
+freeing 4
+freeing 3
+freeing 2
+> (free-dropped-As)
+freeing 1
+\endschemedisplay
+
+Objects guarded by an ftype guardian might contain pointers to other
+objects whose reference counts should also be incremented upon
+allocation of the containing object and decremented upon freeing
+of the containing object.
 
 \section{Thread Parameters\label{SECTTHREADPARAMETERS}}
 
diff --git a/mats/4.ms b/mats/4.ms
index 3d531e227f..f2a6bac8a6 100644
--- a/mats/4.ms
+++ b/mats/4.ms
@@ -3470,6 +3470,147 @@
      #t)
  )
 
+(mat refcount-guardians
+  (error? ; unrecognized ftype
+    (ftype-guardian NO!))
+  (error? ; first element must be a word-sized integer with native endianness
+    (let ()
+      (define-ftype A (struct))
+      (ftype-guardian A)))
+  (error? ; first element must be a word-sized integer with native endianness
+    (let ()
+      (define-ftype A (union [u1 (struct (refcount char))] [u2 (struct (foo (* A)))]))
+      (ftype-guardian A)))
+  (error? ; invalid ftype-guardian argument
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian A))
+      (g (cons 'ka 'blooie))))
+  (error? ; invalid ftype-guardian argument
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian A))
+      (g (make-ftype-pointer iptr 0))))
+  (eq?
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian iptr))
+      (g (make-ftype-pointer A 0)))
+    (void))
+  (with-interrupts-disabled
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian A))
+      (define a (make-ftype-pointer A (foreign-alloc (ftype-sizeof A))))
+      (ftype-set! A (refcount) a 0)
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (eqv? (ftype-ref A (refcount) a) 1))
+      (g a)
+      (set! a #f)
+      (collect 0 0)
+      (assert (eqv? (ftype-ref A (refcount) (g)) 0))
+      (assert (not (g)))
+      #t))
+  (with-interrupts-disabled
+    (let ()
+      (define-ftype A (struct (refcount uptr) (x int)))
+      (define g (ftype-guardian A))
+      (define addr (foreign-alloc (ftype-sizeof A)))
+      (define a1 (make-ftype-pointer A addr))
+      (define a2 (make-ftype-pointer A addr))
+      (define wpa1 (weak-cons a1 '()))
+      (define wpa2 (weak-cons a2 '()))
+      (ftype-set! A (refcount) a1 0)
+      (ftype-set! A (x) a1 17)
+      (assert (eqv? (ftype-ref A (x) a1) 17))
+      (assert (eqv? (ftype-ref A (x) a2) 17))
+      (assert (eqv? (ftype-ref A (refcount) a1) 0))
+      (assert (eqv? (ftype-ref A (refcount) a2) 0))
+      (assert (not (ftype-locked-incr! A (refcount) a1)))
+      (assert (not (ftype-locked-incr! A (refcount) a2)))
+      (assert (eqv? (ftype-ref A (refcount) a1) 2))
+      (assert (eqv? (ftype-ref A (refcount) a2) 2))
+      (g a1)
+      (g a2)
+      (collect 0 0)
+      (assert (not (g)))
+      (set! a1 #f)
+      (collect 0 0)
+      (assert (not (g)))
+      (set! a2 #f)
+      (collect 0 0)
+      (set! a2 (g))
+      (assert (eq? (car wpa2) a2))
+      (assert (not (g)))
+      (assert (eqv? (ftype-ref A (refcount) a2) 0))
+      #t))
+  (with-interrupts-disabled
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian A))
+      (define regular-g (make-guardian))
+      (define addr (foreign-alloc (ftype-sizeof A)))
+      (define a (make-ftype-pointer A addr))
+      (ftype-set! A (refcount) a 0)
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (eqv? (ftype-ref A (refcount) a) 1))
+      (regular-g a)
+      (g a)
+      (regular-g a)
+      (set! a #f)
+      (collect 0 0)
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 0))
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 0))
+      (assert (eqv? (ftype-ref A (refcount) (g)) 0))
+      (assert (not (regular-g)))
+      (assert (not (g)))
+      #t))
+  (with-interrupts-disabled
+    (let ()
+      (define-ftype A (struct (refcount uptr) (x int)))
+      (define g (ftype-guardian A))
+      (define regular-g (make-guardian))
+      (define addr (foreign-alloc (ftype-sizeof A)))
+      (define a (make-ftype-pointer A addr))
+      (ftype-set! A (refcount) a 0)
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (eqv? (ftype-ref A (refcount) a) 2))
+      (regular-g a)
+      (g a)
+      (regular-g a)
+      (set! a #f)
+      (collect 0 0)
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 1))
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 1))
+      (assert (not (regular-g)))
+      (assert (not (g)))
+      #t))
+  (with-interrupts-disabled
+    (let ()
+      (define-ftype A (struct (refcount iptr) (x int)))
+      (define g (ftype-guardian A))
+      (define regular-g (make-guardian))
+      (define addr (foreign-alloc (ftype-sizeof A)))
+      (define a (make-ftype-pointer A addr))
+      (ftype-set! A (refcount) a 0)
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (not (ftype-locked-incr! A (refcount) a)))
+      (assert (eqv? (ftype-ref A (refcount) a) 2))
+      (regular-g a)
+      (g a)
+      (g a)
+      (regular-g a)
+      (set! a #f)
+      (collect 0 0)
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 0))
+      (assert (eqv? (ftype-ref A (refcount) (regular-g)) 0))
+      (assert (eqv? (ftype-ref A (refcount) (g)) 0))
+      (assert (not (regular-g)))
+      (assert (not (g)))
+      #t))
+  )
+
 (mat weak-cons
    (procedure? weak-cons)
    (procedure? weak-pair?)
diff --git a/mats/5_4.ms b/mats/5_4.ms
index e9535566a2..1bc6335096 100644
--- a/mats/5_4.ms
+++ b/mats/5_4.ms
@@ -927,6 +927,40 @@
       "apkf1" "bqlg2" "crmh3" "dsni4" "etoj5" "uapkf1"
       "vbqlg2" "wcrmh3" "xdsni4" "yetoj5" "aupkf1" "bvqlg2"
       "cwrmh3" "dxsni4" "eytoj5"))
+ ; check for proper tail recursion
+   (equal?
+     (list
+       (let ([s (statistics)])
+         (let ([k 100000] [str "abc"])
+           (let ([n k] [m 0])
+             (define (f) (unless (fx= n 0) (string-for-each foo str)))
+             (define (foo x)
+               (set! m (+ m 1))
+               (when (char=? x (string-ref str (fx- (string-length str) 1)))
+                 (set! n (- n 1))
+                 (f)
+                 17)) ; blow tail recursion here
+             (f)
+             (list (> (sstats-bytes (sstats-difference (statistics) s))
+                      10000)
+                   (eqv? n 0)
+                   (eqv? m (* k (string-length str)))))))
+       (let ([s (statistics)])
+         (let ([k 100000] [str "abc"])
+           (let ([n k] [m 0])
+             (define (f) (unless (fx= n 0) (string-for-each foo str)))
+             (define (foo x)
+               (set! m (+ m 1))
+               (when (char=? x (string-ref str (fx- (string-length str) 1)))
+                 (set! n (- n 1))
+                 (f)))
+             (f)
+             (list (<= 0
+                      (sstats-bytes (sstats-difference (statistics) s))
+                      1000)
+                   (eqv? n 0)
+                   (eqv? m (* k (string-length str))))))))
+     '((#t #t #t) (#t #t #t)))
  )
 
 (mat string-xcase-errors
diff --git a/mats/5_6.ms b/mats/5_6.ms
index 858db03e9e..6b46205815 100644
--- a/mats/5_6.ms
+++ b/mats/5_6.ms
@@ -1008,6 +1008,40 @@
       (u a p k f 1) (v b q l g 2) (w c r m h 3) (x d s n i 4)
       (y e t o j 5) (a u p k f 1) (b v q l g 2) (c w r m h 3)
       (d x s n i 4) (e y t o j 5)))
+ ; check for proper tail recursion
+   (equal?
+     (list
+       (let ([s (statistics)])
+         (let ([k 100000] [v '#(a b c)])
+           (let ([n k] [m 0])
+             (define (f) (unless (fx= n 0) (vector-for-each foo v)))
+             (define (foo x)
+               (set! m (+ m 1))
+               (when (eq? x (vector-ref v (fx- (vector-length v) 1)))
+                 (set! n (- n 1))
+                 (f)
+                 17)) ; blow tail recursion here
+             (f)
+             (list (> (sstats-bytes (sstats-difference (statistics) s))
+                      10000)
+                   (eqv? n 0)
+                   (eqv? m (* k (vector-length v)))))))
+       (let ([s (statistics)])
+         (let ([k 100000] [v '#(a b c)])
+           (let ([n k] [m 0])
+             (define (f) (unless (fx= n 0) (vector-for-each foo v)))
+             (define (foo x)
+               (set! m (+ m 1))
+               (when (eq? x (vector-ref v (fx- (vector-length v) 1)))
+                 (set! n (- n 1))
+                 (f)))
+             (f)
+             (list (<= 0
+                      (sstats-bytes (sstats-difference (statistics) s))
+                      1000)
+                   (eqv? n 0)
+                   (eqv? m (* k (vector-length v))))))))
+     '((#t #t #t) (#t #t #t)))
  )
 
 (define $merge-sort
diff --git a/mats/7.ms b/mats/7.ms
index 3bc215b259..2d963bae28 100644
--- a/mats/7.ms
+++ b/mats/7.ms
@@ -286,19 +286,6 @@
 )
 
 (mat maybe-compile
-  (begin
-    (define touch
-      (lambda (objfn srcfn)
-        (let loop ()
-          (let ([p (open-file-input/output-port srcfn (file-options no-fail no-truncate))])
-            (put-u8 p (lookahead-u8 p))
-            (close-port p))
-          (when (file-exists? objfn)
-            (unless (time>? (file-modification-time srcfn) (file-modification-time objfn))
-              (sleep (make-time 'time-duration 1000000 1))
-              (loop))))
-        #t))
-    #t)
   (error? ; not a procedure
     (compile-program-handler 'ignore))
   (procedure? (compile-program-handler))
@@ -783,25 +770,15 @@
       "testdir/testfile-mc-1b")
     #t)
   (error? ; can't find testfile-mc-1a.ss
-    (let ([mt* (map file-modification-time '("testdir/testfile-mc-1b.so"))])
-      (separate-compile 'maybe-compile-library "testdir/testfile-mc-1b")
-      (map
-        (lambda (x y) (if (time=? x y) '= (if (time<? x y) '< '>)))
-        (map file-modification-time '("testdir/testfile-mc-1b.so"))
-        mt*)))
-  ; make sure maybe-compile-file doesn't wipe out b.so when it fails to find a.ss
-  (file-exists? "testdir/testfile-mc-1b.so")
-  (equal?
-    (let ([mt* (map file-modification-time '("testdir/testfile-mc-1b.so"))])
-      (separate-compile '(lambda (x)
-                           (parameterize ([source-directories (cons "testdir" (source-directories))])
-                             (maybe-compile-library x)))
-        "testdir/testfile-mc-1b")
-      (map
-        (lambda (x y) (if (time=? x y) '= (if (time<? x y) '< '>)))
-        (map file-modification-time '("testdir/testfile-mc-1b.so"))
-        mt*))
-    '(=))
+    (separate-compile 'maybe-compile-library "testdir/testfile-mc-1b"))
+  ; make sure maybe-compile-file wipes out b.so when it fails to find a.ss
+  (or (= (optimize-level) 3) (not (file-exists? "testdir/testfile-mc-1b.so")))
+  (begin
+    (separate-compile '(lambda (x)
+                         (parameterize ([source-directories (cons "testdir" (source-directories))])
+                           (maybe-compile-library x)))
+      "testdir/testfile-mc-1b")
+    #t)
   (touch "testdir/testfile-mc-1b.so" "testdir/testfile-mc-1a.ss")
   (equal?
     (let ([mt* (map file-modification-time '("testdir/testfile-mc-1b.so"))])
@@ -828,17 +805,12 @@
     '(>))
   (delete-file "testdir/testfile-mc-1a.ss")
   (error? ; maybe-compile-library: can't find testfile-mc-1a.ss
-    (let ([mt* (map file-modification-time '("testdir/testfile-mc-1b.so"))])
-      (separate-compile '(lambda (x)
-                           (parameterize ([source-directories (cons "testdir" (source-directories))])
-                             (maybe-compile-library x)))
-        "testdir/testfile-mc-1b")
-      (map
-        (lambda (x y) (if (time=? x y) '= (if (time<? x y) '< '>)))
-        (map file-modification-time '("testdir/testfile-mc-1b.so"))
-        mt*)))
-  ; make sure maybe-compile-file doesn't wipe out b.so when it fails to find a.ss
-  (file-exists? "testdir/testfile-mc-1b.so")
+    (separate-compile '(lambda (x)
+                         (parameterize ([source-directories (cons "testdir" (source-directories))])
+                           (maybe-compile-library x)))
+      "testdir/testfile-mc-1b"))
+  ; make sure maybe-compile-file wipes out b.so when it fails to find a.ss
+  (or (= (optimize-level) 3) (not (file-exists? "testdir/testfile-mc-1b.so")))
   (begin
     (rm-rf "testdir")
     #t)
@@ -883,6 +855,170 @@
       (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))
     #t)
+  ; make sure maybe-compile-file handles missing include files gracefully
+  (begin
+    (mkfile "testfile-mc-3a.ss"
+      "hello from 3a!")
+    (mkfile "testfile-mc-3b.ss"
+      '(library (testfile-mc-3b)
+         (export q)
+         (import (chezscheme))
+         (define-syntax q
+           (begin
+             (printf "expanding testfile-mc-3b\n")
+             (lambda (x)
+               (printf "expanding q\n")
+               (include "./testfile-mc-3a.ss"))))))
+    (mkfile "testfile-mc-3.ss"
+      '(import (chezscheme) (testfile-mc-3b))
+      '(define-syntax qq
+         (begin
+           (printf "expanding testfile-mc-3\n")
+           (lambda (x)
+             (printf "expanding qq\n")
+             #'q)))
+      '(printf "qq => ~a\n" qq))
+    (delete-file "testfile-mc-3b.so")
+    (delete-file "testfile-mc-3.so")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t])
+           (maybe-compile-program x)))
+      'mc-3)
+    #t)
+  (begin
+    (delete-file "testfile-mc-3a.ss")
+    #t)
+  (error? ; separate-compile: no such file or directory: testfile-mc-3a.ss
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t])
+           (maybe-compile-program x)))
+      'mc-3))
+  ; make sure maybe-compile-file handles missing include files gracefully
+  (begin
+    (define-record-type hash-bang-chezscheme)
+    (record-writer (type-descriptor hash-bang-chezscheme) (lambda (x p wr) (display-string "#!chezscheme")))
+    (mkfile "testfile-mc-4a.ss"
+      "hello from 4a!")
+    (mkfile "testfile-mc-4b.ss"
+      (make-hash-bang-chezscheme)
+      '(library (testfile-mc-4b)
+         (export b)
+         (import (chezscheme))
+         (define-syntax q
+           (lambda (x)
+             (if (file-exists? "testfile-mc-4a.ss")
+                 (begin
+                   (printf "HEY!\n")
+                   (#%$require-include "./testfile-mc-4a.ss")
+                   (call-with-input-file "testfile-mc-4a.ss" read))
+                 (begin
+                   (printf "BARLEY!\n")
+                   "testfile-mc-4a is no more"))))
+         (define (b) q)))
+    (mkfile "testfile-mc-4.ss"
+      '(import (chezscheme) (testfile-mc-4b))
+      '(printf "q => ~a\n" (b)))
+    (delete-file "testfile-mc-4b.so")
+    (delete-file "testfile-mc-4.so")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t])
+           (maybe-compile-program x)))
+      'mc-4)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-4.so"))
+    "q => hello from 4a!\n")
+  (begin
+    (mkfile "testfile-mc-4a.ss"
+      "goodbye from 4a!")
+    (touch "testfile-mc-4.so" "testfile-mc-4a.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [import-notify #t])
+           (maybe-compile-program x)))
+      'mc-4)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-4.so"))
+    "q => goodbye from 4a!\n")
+  (begin
+    (delete-file "testfile-mc-4a.ss")
+    #t)
+  (begin
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [import-notify #t])
+           (maybe-compile-program x)))
+      'mc-4)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-4.so"))
+    "q => testfile-mc-4a is no more\n")
+  ; make sure maybe-compile-file handles missing include files gracefully
+  (begin
+    (define-record-type hash-bang-chezscheme)
+    (record-writer (type-descriptor hash-bang-chezscheme) (lambda (x p wr) (display-string "#!chezscheme")))
+    (mkfile "testfile-mc-5a.ss"
+      "hello from 5a!")
+    (mkfile "testfile-mc-5b.ss"
+      (make-hash-bang-chezscheme)
+      '(library (testfile-mc-5b)
+         (export q)
+         (import (chezscheme))
+         (define-syntax q
+           (lambda (x)
+             (if (file-exists? "testfile-mc-5a.ss")
+                 (begin
+                   (printf "HEY!\n")
+                   (#%$require-include "./testfile-mc-5a.ss")
+                   (call-with-input-file "testfile-mc-5a.ss" read))
+                 (begin
+                   (printf "BARLEY!\n")
+                   "testfile-mc-5a is no more"))))))
+    (mkfile "testfile-mc-5.ss"
+      '(import (chezscheme) (testfile-mc-5b))
+      '(define-syntax qq (lambda (x) #'q))
+      '(printf "qq => ~a\n" qq))
+    (delete-file "testfile-mc-5b.so")
+    (delete-file "testfile-mc-5.so")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t])
+           (maybe-compile-program x)))
+      'mc-5)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-5.so"))
+    "qq => hello from 5a!\n")
+  (begin
+    (mkfile "testfile-mc-5a.ss"
+      "goodbye from 5a!")
+    (touch "testfile-mc-5.so" "testfile-mc-5a.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [import-notify #t])
+           (maybe-compile-program x)))
+      'mc-5)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-5.so"))
+    "qq => goodbye from 5a!\n")
+  (begin
+    (delete-file "testfile-mc-5a.ss")
+    #t)
+  (begin
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-file-message #f] [compile-imported-libraries #t] [import-notify #t])
+           (maybe-compile-program x)))
+      'mc-5)
+    #t)
+  (equal?
+    (separate-eval '(load-program "testfile-mc-5.so"))
+    "qq => testfile-mc-5a is no more\n")
  )
 
 (mat make-boot-file
@@ -3225,6 +3361,211 @@ evaluating module init
     "(9 . 5)\n")
 )
 
+(mat maybe-compile-whole
+  (begin
+    (delete-file "testfile-mcw-a1.so")
+    (delete-file "testfile-mcw-a1.wpo")
+    (delete-file "testfile-mcw-b1.so")
+    (delete-file "testfile-mcw-b1.wpo")
+    (delete-file "testfile-mcw-c1.so")
+    (delete-file "testfile-mcw-c1.wpo")
+    (with-output-to-file "testfile-mcw-ha1.ss"
+      (lambda ()
+        (pretty-print
+          '(define minor-msg-number 97)))
+      'replace)
+    (with-output-to-file "testfile-mcw-hb1.ss"
+      (lambda ()
+        (pretty-print
+          '(define major-msg-number 113)))
+      'replace)
+    (with-output-to-file "testfile-mcw-a1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-a1)
+             (export a)
+             (import (chezscheme))
+             (define a "hello from a"))))
+      'replace)
+    (with-output-to-file "testfile-mcw-b1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-b1)
+             (export b)
+             (import (chezscheme) (testfile-mcw-a1))
+             (include "testfile-mcw-ha1.ss")
+             (define b (lambda () (format "~a and b [~s]" a minor-msg-number))))))
+      'replace)
+    (with-output-to-file "testfile-mcw-c1.ss"
+      (lambda ()
+        (for-each pretty-print
+          '((import (chezscheme) (testfile-mcw-b1))
+            (include "testfile-mcw-hb1.ss")
+            (printf "~a and c [~s]\n" (b) major-msg-number))))
+      'replace)
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (compile-program x)))
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "hello from a and b [97] and c [113]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-a1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-a1)
+             (export a)
+             (import (chezscheme))
+             (define a "greetings from a"))))
+      'replace)
+    (touch "testfile-mcw-a1.so" "testfile-mcw-a1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (maybe-compile-program x)))
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "greetings from a and b [97] and c [113]\n")
+
+  (begin
+    (separate-compile
+      '(lambda (x)
+         (compile-whole-program (format "~a.wpo" x) (format "~a.so" x)) #f)
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "greetings from a and b [97] and c [113]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-a1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-a1)
+             (export a)
+             (import (chezscheme))
+             (define a "salutations from a"))))
+      'replace)
+    (touch "testfile-mcw-a1.so" "testfile-mcw-a1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (parameterize ([compile-program-handler
+                            (lambda (ifn ofn)
+                              (compile-program ifn ofn)
+                              (compile-whole-program (format "~a.wpo" (path-root ofn)) ofn #t))])
+             (maybe-compile-program x))))
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "salutations from a and b [97] and c [113]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-a1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-a1)
+             (export a)
+             (import (chezscheme))
+             (define a "goodbye from a"))))
+      'replace)
+    (touch "testfile-mcw-a1.so" "testfile-mcw-a1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (parameterize ([compile-program-handler
+                            (lambda (ifn ofn)
+                              (compile-program ifn ofn)
+                              (compile-whole-program (format "~a.wpo" (path-root ofn)) ofn #t))])
+             (maybe-compile-program x))))
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "goodbye from a and b [97] and c [113]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-hb1.ss"
+      (lambda ()
+        (pretty-print
+          '(define major-msg-number 773)))
+      'replace)
+    (touch "testfile-mcw-c1.so" "testfile-mcw-hb1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (parameterize ([compile-program-handler
+                            (lambda (ifn ofn)
+                              (compile-program ifn ofn)
+                              (compile-whole-program (format "~a.wpo" (path-root ofn)) ofn #t))])
+             (maybe-compile-program x))))
+      'mcw-c1)
+    #t)
+
+  (equal?
+    (separate-eval '(load-program "testfile-mcw-c1.so"))
+    "goodbye from a and b [97] and c [773]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-a1.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mcw-a1)
+             (export a)
+             (import (chezscheme))
+             (define a "hello again from a"))))
+      'replace)
+    (touch "testfile-mcw-a1.so" "testfile-mcw-a1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (parameterize ([compile-library-handler
+                            (lambda (ifn ofn)
+                              (compile-library ifn ofn)
+                              (compile-whole-library (format "~a.wpo" (path-root ofn)) ofn))])
+             (maybe-compile-library x))))
+      'mcw-b1)
+    #t)
+
+  (equal?
+    (separate-eval '(let () (import (testfile-mcw-b1)) (printf "~a\n" (b))))
+    "hello again from a and b [97]\n")
+
+  (begin
+    (with-output-to-file "testfile-mcw-ha1.ss"
+      (lambda ()
+        (pretty-print
+          '(define minor-msg-number -53)))
+      'replace)
+    (touch "testfile-mcw-a1.so" "testfile-mcw-a1.ss")
+    (separate-compile
+      '(lambda (x)
+         (parameterize ([compile-imported-libraries #t] [generate-wpo-files #t])
+           (parameterize ([compile-library-handler
+                            (lambda (ifn ofn)
+                              (compile-library ifn ofn)
+                              (compile-whole-library (format "~a.wpo" (path-root ofn)) ofn))])
+             (maybe-compile-library x))))
+      'mcw-b1)
+    #t)
+
+  (equal?
+    (separate-eval '(let () (import (testfile-mcw-b1)) (printf "~a\n" (b))))
+    "hello again from a and b [-53]\n")
+)
+
 (mat library-manager
   (begin
     (with-output-to-file "testfile-lm-a.ss"
@@ -3417,7 +3758,6 @@ evaluating module init
     "\"odd\"\n"))
   )
 
-
 ;;; section 7.2:
 
 (mat top-level-value-functions
diff --git a/mats/8.ms b/mats/8.ms
index 6fa4d6d73f..211007c0ce 100644
--- a/mats/8.ms
+++ b/mats/8.ms
@@ -6111,6 +6111,8 @@
           (lambda (r)
             (r #'a #'frip "extra stuff"))))
       a))
+  (error? ; not a compile-time value
+    (compile-time-value-value 17))
   (begin
     (with-output-to-file "testfile-mctv0.ss"
       (lambda ()
@@ -6132,6 +6134,7 @@
   (begin
     (import (testfile-mctv0))
     #t)
+  (compile-time-value? (make-compile-time-value 'fred))
   (begin
     (define-syntax frob (make-compile-time-value 'rabf))
     #t)
@@ -6180,6 +6183,7 @@
       (define-syntax x (make-compile-time-value 'xow)))
     #t)
   (eq? (let () (import (mctv l1)) (get-ctv x)) 'xow)
+  (eq? (compile-time-value-value (top-level-syntax 'x (environment '(mctv l1)))) 'xow)
   (begin
     (with-output-to-file "testfile-mctv1.ss"
       (lambda ()
@@ -6190,6 +6194,19 @@
     (for-each separate-compile '(mctv1))
     #t)
   (eq? (let () (import (testfile-mctv1)) (get-ctv x)) 'xuko1)
+  (compile-time-value? (top-level-syntax 'x (environment '(testfile-mctv1))))
+  (eq? (compile-time-value-value (top-level-syntax 'x (environment '(testfile-mctv1)))) 'xuko1)
+  (begin
+    (with-output-to-file "testfile-mctv1a.ss"
+      (lambda ()
+        (pretty-print
+          '(library (testfile-mctv1a) (export x) (import (chezscheme))
+             (define-syntax x (make-compile-time-value 'xuko1)))))
+      'replace)
+    (for-each separate-compile '(mctv1a))
+    #t)
+  (eq? (compile-time-value-value (top-level-syntax 'x (environment '(testfile-mctv1a)))) 'xuko1)
+  (eq? (let () (import (testfile-mctv1a)) (get-ctv x)) 'xuko1)
   (begin
     (with-output-to-file "testfile-mctv2.ss"
       (lambda ()
diff --git a/mats/bytevector.ms b/mats/bytevector.ms
index ebb1011c33..262a721eb2 100644
--- a/mats/bytevector.ms
+++ b/mats/bytevector.ms
@@ -111,6 +111,9 @@
   (eqv? (bytevector) (make-bytevector (- 4 4) (+ 1 1)))
   (eqv? (bytevector) (make-bytevector (- 4 4) (+ 1 1)))
   (equal? (bytevector 1) #vu8(1))
+  (equal? (bytevector -1) #vu8(255))
+  (equal? (bytevector -1 2) #vu8(255 2))
+  (equal? (bytevector 2 -1) #vu8(2 255))
   (equal?
     (letrec-syntax ([z (syntax-rules ()
                          [(_) (list (bytevector))]
@@ -135,29 +138,76 @@
       #vu8(1)
       #vu8()))
   (equal?
-    (let ([a 1] [c 3] [d 4] [e 5] [f 6] [h 8] [k 11] [l 12] [p 16] [q 17])
+    (letrec-syntax ([z (syntax-rules ()
+                         [(_) (list (bytevector))]
+                         [(_ x ... y) (cons (bytevector x ... y) (z x ...))])])
+      (z -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17))
+    '(#vu8(255 254 253 252 251 250 249 248 247 246 245 244 243 242 241 240 239)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245 244 243 242 241 240)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245 244 243 242 241)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245 244 243 242)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245 244 243)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245 244)
+      #vu8(255 254 253 252 251 250 249 248 247 246 245)
+      #vu8(255 254 253 252 251 250 249 248 247 246)
+      #vu8(255 254 253 252 251 250 249 248 247)
+      #vu8(255 254 253 252 251 250 249 248)
+      #vu8(255 254 253 252 251 250 249)
+      #vu8(255 254 253 252 251 250)
+      #vu8(255 254 253 252 251)
+      #vu8(255 254 253 252)
+      #vu8(255 254 253)
+      #vu8(255 254)
+      #vu8(255)
+      #vu8()))
+  (equal?
+    (let ([a 1] [c -3] [d -4] [e 5] [f 6] [h -8] [k 11] [l -12] [p -16] [q 17])
       (letrec-syntax ([z (syntax-rules ()
                            [(_) (list (bytevector))]
                            [(_ x ... y) (cons (bytevector x ... y) (z x ...))])])
-        (z a 2 c d e f 7 h 9 10 k l 13 14 15 p q)))
-    '(#vu8(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11 12 13 14)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11 12 13)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11 12)
-      #vu8(1 2 3 4 5 6 7 8 9 10 11)
-      #vu8(1 2 3 4 5 6 7 8 9 10)
-      #vu8(1 2 3 4 5 6 7 8 9)
-      #vu8(1 2 3 4 5 6 7 8)
-      #vu8(1 2 3 4 5 6 7)
-      #vu8(1 2 3 4 5 6)
-      #vu8(1 2 3 4 5)
-      #vu8(1 2 3 4)
-      #vu8(1 2 3)
+        (z a 2 c d e f -7 h 9 -10 k l -13 -14 15 p q)))
+    '(#vu8(1 2 253 252 5 6 249 248 9 246 11 244 243 242 15 240 17)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11 244 243 242 15 240)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11 244 243 242 15)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11 244 243 242)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11 244 243)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11 244)
+      #vu8(1 2 253 252 5 6 249 248 9 246 11)
+      #vu8(1 2 253 252 5 6 249 248 9 246)
+      #vu8(1 2 253 252 5 6 249 248 9)
+      #vu8(1 2 253 252 5 6 249 248)
+      #vu8(1 2 253 252 5 6 249)
+      #vu8(1 2 253 252 5 6)
+      #vu8(1 2 253 252 5)
+      #vu8(1 2 253 252)
+      #vu8(1 2 253)
       #vu8(1 2)
       #vu8(1)
       #vu8()))
+  (equal?
+    (let ([a -1] [c 3] [d 4] [e -5] [f -6] [h 8] [k -11] [l 12] [p 16] [q -17])
+      (letrec-syntax ([z (syntax-rules ()
+                           [(_) (list (bytevector))]
+                           [(_ x ... y) (cons (bytevector x ... y) (z x ...))])])
+        (z a -2 c d e f 7 h -9 10 k l 13 14 -15 p q)))
+    '(#vu8(255 254 3 4 251 250 7 8 247 10 245 12 13 14 241 16 239)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245 12 13 14 241 16)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245 12 13 14 241)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245 12 13 14)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245 12 13)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245 12)
+      #vu8(255 254 3 4 251 250 7 8 247 10 245)
+      #vu8(255 254 3 4 251 250 7 8 247 10)
+      #vu8(255 254 3 4 251 250 7 8 247)
+      #vu8(255 254 3 4 251 250 7 8)
+      #vu8(255 254 3 4 251 250 7)
+      #vu8(255 254 3 4 251 250)
+      #vu8(255 254 3 4 251)
+      #vu8(255 254 3 4)
+      #vu8(255 254 3)
+      #vu8(255 254)
+      #vu8(255)
+      #vu8()))
   (equal? (apply bytevector (make-list 20000 #xc7))
           (u8-list->bytevector (make-list 20000 #xc7)))
   (let ([n0 1] [n1 -2] [n4 5])
@@ -175,6 +225,187 @@
            (eqv? (bytevector-u8-ref x 3) 252)
            (eqv? (bytevector-s8-ref x 4) 5)
            (eqv? (bytevector-u8-ref x 4) 5))))
+  (begin
+    (define $bv-f
+      (lambda (a b c d e f g h i j k l m n o p q r s t u v w x y z)
+        (letrec-syntax ([foo (syntax-rules ()
+                               [(_) (list (bytevector))]
+                               [(_ x ... y) (cons (bytevector x ... y) (foo x ...))])])
+          (foo a b c d e f g h i j k l m n o p q r s t u v w x y z))))
+    #t)
+  (equal?
+    ($bv-f 101 -102 103 -104 -105 106 107 -108 -109 -110 111 112 113 114 -115 -116 -117 -118 119 120 121 -122 -123 124 -125 126)
+    '(#vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131 126)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111)
+      #vu8(101 154 103 152 151 106 107 148 147 146)
+      #vu8(101 154 103 152 151 106 107 148 147)
+      #vu8(101 154 103 152 151 106 107 148)
+      #vu8(101 154 103 152 151 106 107)
+      #vu8(101 154 103 152 151 106)
+      #vu8(101 154 103 152 151)
+      #vu8(101 154 103 152)
+      #vu8(101 154 103)
+      #vu8(101 154)
+      #vu8(101)
+      #vu8()))
+  (begin
+    (define $bv-g
+      (lambda (a c e g i k m o q s u w y)
+        (letrec-syntax ([foo (syntax-rules ()
+                               [(_) (list (bytevector))]
+                               [(_ x ... y) (cons (bytevector x ... y) (foo x ...))])])
+          (foo a -102 c -104 e 106 g -108 i -110 k 112 m 114 o -116 q -118 s 120 u -122 w 124 y 126))))
+    #t)
+  (equal?
+    ($bv-g 101 103 -105 107 -109 111 113 -115 -117 119 121 -123 -125)
+    '(#vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131 126)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111)
+      #vu8(101 154 103 152 151 106 107 148 147 146)
+      #vu8(101 154 103 152 151 106 107 148 147)
+      #vu8(101 154 103 152 151 106 107 148)
+      #vu8(101 154 103 152 151 106 107)
+      #vu8(101 154 103 152 151 106)
+      #vu8(101 154 103 152 151)
+      #vu8(101 154 103 152)
+      #vu8(101 154 103)
+      #vu8(101 154)
+      #vu8(101)
+      #vu8()))
+  (begin
+    (define $bv-h
+      (lambda (b d f h j l n p r t v x z)
+        (letrec-syntax ([foo (syntax-rules ()
+                               [(_) (list (bytevector))]
+                               [(_ x ... y) (cons (bytevector x ... y) (foo x ...))])])
+          (foo 101 b 103 d -105 f 107 h -109 j 111 l 113 n -115 p -117 r 119 t 121 v -123 x -125 z))))
+    #t)
+  (equal?
+    ($bv-h -102 -104 106 -108 -110 112 114 -116 -118 120 -122 124 126)
+    '(#vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131 126)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111)
+      #vu8(101 154 103 152 151 106 107 148 147 146)
+      #vu8(101 154 103 152 151 106 107 148 147)
+      #vu8(101 154 103 152 151 106 107 148)
+      #vu8(101 154 103 152 151 106 107)
+      #vu8(101 154 103 152 151 106)
+      #vu8(101 154 103 152 151)
+      #vu8(101 154 103 152)
+      #vu8(101 154 103)
+      #vu8(101 154)
+      #vu8(101)
+      #vu8()))
+  (begin
+    (define $bv-i-ls* '())
+    (define $bv-i
+      (lambda (b d f h j l n p r t v x z)
+        (define this)
+        (define (init!) (set! $bv-i-ls* (cons '() $bv-i-ls*)) (set! this 0))
+        (define (bump!) (set! this (fx+ this 1)) (set-car! $bv-i-ls* (cons this (car $bv-i-ls*))))
+        (define-syntax plink (syntax-rules () [(_ x) (begin (bump!) x)]))
+        (letrec-syntax ([foo (syntax-rules ()
+                               [(_) (list (bytevector))]
+                               [(_ x ... y) (cons (begin (init!) (bytevector (plink x) ... (plink y))) (foo x ...))])])
+          (foo 101 b 103 d -105 f 107 h -109 j 111 l 113 n -115 p -117 r 119 t 121 v -123 x -125 z))))
+    #t)
+  (equal?
+    ($bv-i -102 -104 106 -108 -110 112 114 -116 -118 120 -122 124 126)
+    '(#vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131 126)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124 131)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133 124)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134 133)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121 134)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120 121)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119 120)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138 119)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139 138)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140 139)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141 140)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114 141)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113 114)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112 113)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111 112)
+      #vu8(101 154 103 152 151 106 107 148 147 146 111)
+      #vu8(101 154 103 152 151 106 107 148 147 146)
+      #vu8(101 154 103 152 151 106 107 148 147)
+      #vu8(101 154 103 152 151 106 107 148)
+      #vu8(101 154 103 152 151 106 107)
+      #vu8(101 154 103 152 151 106)
+      #vu8(101 154 103 152 151)
+      #vu8(101 154 103 152)
+      #vu8(101 154 103)
+      #vu8(101 154)
+      #vu8(101)
+      #vu8()))
+  (equal?
+    (sort (lambda (ls1 ls2) (fx<= (length ls1) (length ls2))) $bv-i-ls*)
+    '((1)
+      (2 1)
+      (3 2 1)
+      (4 3 2 1)
+      (5 4 3 2 1)
+      (6 5 4 3 2 1)
+      (7 6 5 4 3 2 1)
+      (8 7 6 5 4 3 2 1)
+      (9 8 7 6 5 4 3 2 1)
+      (10 9 8 7 6 5 4 3 2 1)
+      (11 10 9 8 7 6 5 4 3 2 1)
+      (12 11 10 9 8 7 6 5 4 3 2 1)
+      (13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)
+      (26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1)))
 )
 
 (mat bytevector-syntax
diff --git a/mats/mat.ss b/mats/mat.ss
index f82e406c73..bef5de3b9e 100644
--- a/mats/mat.ss
+++ b/mats/mat.ss
@@ -464,3 +464,15 @@
     (with-output-to-file filename
       (lambda () (for-each pretty-print expr*))
       'replace)))
+
+(define touch
+  (lambda (objfn srcfn)
+    (let loop ()
+      (let ([p (open-file-input/output-port srcfn (file-options no-fail no-truncate))])
+        (put-u8 p (lookahead-u8 p))
+        (close-port p))
+      (when (file-exists? objfn)
+        (unless (time>? (file-modification-time srcfn) (file-modification-time objfn))
+          (sleep (make-time 'time-duration 1000000 1))
+          (loop))))
+    #t))
diff --git a/mats/patch-compile-0-f-t-f b/mats/patch-compile-0-f-t-f
index 1dd61d32ae..09d46d10ce 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	2019-02-07 11:07:08.000000000 -0800
---- errors-compile-0-f-t-f	2019-02-07 10:28:25.000000000 -0800
+*** errors-compile-0-f-f-f	2019-02-11 17:18:14.000000000 -0800
+--- errors-compile-0-f-t-f	2019-02-11 16:37:31.000000000 -0800
 ***************
 *** 125,131 ****
   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".
 ***************
-*** 3697,3703 ****
+*** 3702,3708 ****
   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".
---- 3697,3703 ----
+--- 3702,3708 ----
   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".
 ***************
-*** 7163,7170 ****
+*** 7169,7176 ****
   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)".
---- 7163,7170 ----
+--- 7169,7176 ----
   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)".
 ***************
-*** 7172,7186 ****
+*** 7178,7192 ****
   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".
---- 7172,7186 ----
+--- 7178,7192 ----
   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".
 ***************
-*** 7193,7218 ****
+*** 7199,7224 ****
   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".
---- 7193,7218 ----
+--- 7199,7224 ----
   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".
 ***************
-*** 7343,7381 ****
+*** 7349,7387 ****
   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".
---- 7343,7381 ----
+--- 7349,7387 ----
   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".
 ***************
-*** 7390,7446 ****
+*** 7396,7452 ****
   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".
---- 7390,7446 ----
+--- 7396,7452 ----
   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 73c03d4f76..9cc6c4a0ba 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	2019-02-07 11:07:08.000000000 -0800
---- errors-compile-0-t-f-f	2019-02-07 10:37:40.000000000 -0800
+*** errors-compile-0-f-f-f	2019-02-11 17:18:14.000000000 -0800
+--- errors-compile-0-t-f-f	2019-02-11 16:46:49.000000000 -0800
 ***************
 *** 93,99 ****
   3.mo:Expected error in mat case-lambda: "incorrect number of arguments to #<procedure foo>".
@@ -64,7 +64,7 @@
   4.mo:Expected error in mat apply: "apply: 4 is not a proper list".
   4.mo:Expected error in mat apply: "apply: (3 4 5 6 7 8 . 9) is not a proper list".
 ***************
-*** 531,538 ****
+*** 536,543 ****
   4.mo:Expected error in mat $primitive: "invalid primitive name fubar".
   4.mo:Expected error in mat $primitive: "incorrect argument count in call (car (quote a) (quote b))".
   4.mo:Expected error in mat $primitive: "car: 3 is not a pair".
@@ -73,7 +73,7 @@
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
---- 531,538 ----
+--- 536,543 ----
   4.mo:Expected error in mat $primitive: "invalid primitive name fubar".
   4.mo:Expected error in mat $primitive: "incorrect argument count in call (car (quote a) (quote b))".
   4.mo:Expected error in mat $primitive: "car: 3 is not a pair".
@@ -83,7 +83,7 @@
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
 ***************
-*** 542,549 ****
+*** 547,554 ****
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
@@ -92,7 +92,7 @@
   5_1.mo:Expected error in mat symbol=?: "symbol=?: 3 is not a symbol".
   5_1.mo:Expected error in mat symbol=?: "symbol=?: 3 is not a symbol".
   5_1.mo:Expected error in mat symbol=?: "symbol=?: 3 is not a symbol".
---- 542,549 ----
+--- 547,554 ----
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
   5_1.mo:Expected error in mat boolean=?: "boolean=?: 3 is not a boolean".
@@ -102,7 +102,7 @@
   5_1.mo:Expected error in mat symbol=?: "symbol=?: 3 is not a symbol".
   5_1.mo:Expected error in mat symbol=?: "symbol=?: 3 is not a symbol".
 ***************
-*** 585,592 ****
+*** 590,597 ****
   5_2.mo:Expected error in mat c....r-errors: "cddadr: incorrect list structure (a . b)".
   5_2.mo:Expected error in mat c....r-errors: "cdddar: incorrect list structure (a . b)".
   5_2.mo:Expected error in mat c....r-errors: "cddddr: incorrect list structure (a . b)".
@@ -111,7 +111,7 @@
   5_2.mo:Expected error in mat list-ref: "list-ref: a is not a proper list".
   5_2.mo:Expected error in mat list-ref: "list-ref: (a b . c) is not a proper list".
   5_2.mo:Expected error in mat list-ref: "list-ref: index 4 is out of range for list (a b)".
---- 585,592 ----
+--- 590,597 ----
   5_2.mo:Expected error in mat c....r-errors: "cddadr: incorrect list structure (a . b)".
   5_2.mo:Expected error in mat c....r-errors: "cdddar: incorrect list structure (a . b)".
   5_2.mo:Expected error in mat c....r-errors: "cddddr: incorrect list structure (a . b)".
@@ -121,7 +121,7 @@
   5_2.mo:Expected error in mat list-ref: "list-ref: (a b . c) is not a proper list".
   5_2.mo:Expected error in mat list-ref: "list-ref: index 4 is out of range for list (a b)".
 ***************
-*** 673,685 ****
+*** 678,690 ****
   5_2.mo:Expected error in mat append!: "append!: (b a b a b a ...) is circular".
   5_2.mo:Expected error in mat append!: "append!: (c d a b a b ...) is circular".
   5_2.mo:Expected error in mat append!: "append!: (a b . c) is not a proper list".
@@ -135,7 +135,7 @@
   5_2.mo:Expected error in mat reverse!: "reverse!: a is not a proper list".
   5_2.mo:Expected error in mat reverse!: "reverse!: (a b . c) is not a proper list".
   5_2.mo:Expected error in mat reverse!: "reverse!: (a b a b a b ...) is circular".
---- 673,685 ----
+--- 678,690 ----
   5_2.mo:Expected error in mat append!: "append!: (b a b a b a ...) is circular".
   5_2.mo:Expected error in mat append!: "append!: (c d a b a b ...) is circular".
   5_2.mo:Expected error in mat append!: "append!: (a b . c) is not a proper list".
@@ -150,7 +150,7 @@
   5_2.mo:Expected error in mat reverse!: "reverse!: (a b . c) is not a proper list".
   5_2.mo:Expected error in mat reverse!: "reverse!: (a b a b a b ...) is circular".
 ***************
-*** 692,709 ****
+*** 697,714 ****
   5_2.mo:Expected error in mat find: "find: improper list (a b . c)".
   5_2.mo:Expected error in mat find: "find: improper list (a b c . d)".
   5_2.mo:Expected error in mat find: "find: a is not a procedure".
@@ -169,7 +169,7 @@
   5_2.mo:Expected error in mat member: "member: improper list a".
   5_2.mo:Expected error in mat member: "member: cyclic list (a b a b a b ...)".
   5_2.mo:Expected error in mat member: "member: improper list (a b . c)".
---- 692,709 ----
+--- 697,714 ----
   5_2.mo:Expected error in mat find: "find: improper list (a b . c)".
   5_2.mo:Expected error in mat find: "find: improper list (a b c . d)".
   5_2.mo:Expected error in mat find: "find: a is not a procedure".
@@ -189,7 +189,7 @@
   5_2.mo:Expected error in mat member: "member: cyclic list (a b a b a b ...)".
   5_2.mo:Expected error in mat member: "member: improper list (a b . c)".
 ***************
-*** 746,755 ****
+*** 751,760 ****
   5_2.mo:Expected error in mat assv: "assv: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
   5_2.mo:Expected error in mat assoc: "assoc: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
   5_2.mo:Expected error in mat assoc: "assoc: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
@@ -200,7 +200,7 @@
   5_2.mo:Expected error in mat sort: "sort: 3 is not a proper list".
   5_2.mo:Expected error in mat sort: "sort: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat sort: "sort: (1 2 . 3) is not a proper list".
---- 746,755 ----
+--- 751,760 ----
   5_2.mo:Expected error in mat assv: "assv: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
   5_2.mo:Expected error in mat assoc: "assoc: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
   5_2.mo:Expected error in mat assoc: "assoc: cyclic alist ((a . 1) (b . 2) (3.2 . 3) ("a" . 4) (a . 1) (b . 2) ...)".
@@ -212,7 +212,7 @@
   5_2.mo:Expected error in mat sort: "sort: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat sort: "sort: (1 2 . 3) is not a proper list".
 ***************
-*** 758,767 ****
+*** 763,772 ****
   5_2.mo:Expected error in mat sort: "sort: (q p a b a b ...) is circular".
   5_2.mo:Expected error in mat sort: "sort: (a b c) is not a procedure".
   5_2.mo:Expected error in mat sort: ">: b is not a real number".
@@ -223,7 +223,7 @@
   5_2.mo:Expected error in mat list-sort: "list-sort: 3 is not a proper list".
   5_2.mo:Expected error in mat list-sort: "list-sort: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat list-sort: "list-sort: (1 2 . 3) is not a proper list".
---- 758,767 ----
+--- 763,772 ----
   5_2.mo:Expected error in mat sort: "sort: (q p a b a b ...) is circular".
   5_2.mo:Expected error in mat sort: "sort: (a b c) is not a procedure".
   5_2.mo:Expected error in mat sort: ">: b is not a real number".
@@ -235,7 +235,7 @@
   5_2.mo:Expected error in mat list-sort: "list-sort: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat list-sort: "list-sort: (1 2 . 3) is not a proper list".
 ***************
-*** 770,779 ****
+*** 775,784 ****
   5_2.mo:Expected error in mat list-sort: "list-sort: (q p a b a b ...) is circular".
   5_2.mo:Expected error in mat list-sort: "list-sort: (a b c) is not a procedure".
   5_2.mo:Expected error in mat list-sort: ">: b is not a real number".
@@ -246,7 +246,7 @@
   5_2.mo:Expected error in mat sort!: "sort!: 3 is not a proper list".
   5_2.mo:Expected error in mat sort!: "sort!: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat sort!: "sort!: (1 2 . 3) is not a proper list".
---- 770,779 ----
+--- 775,784 ----
   5_2.mo:Expected error in mat list-sort: "list-sort: (q p a b a b ...) is circular".
   5_2.mo:Expected error in mat list-sort: "list-sort: (a b c) is not a procedure".
   5_2.mo:Expected error in mat list-sort: ">: b is not a real number".
@@ -258,7 +258,7 @@
   5_2.mo:Expected error in mat sort!: "sort!: #(1 2 3) is not a proper list".
   5_2.mo:Expected error in mat sort!: "sort!: (1 2 . 3) is not a proper list".
 ***************
-*** 802,819 ****
+*** 807,824 ****
   5_2.mo:Expected error in mat iota: "iota: -1 is not a nonnegative fixnum".
   5_2.mo:Expected error in mat iota: "iota: 1000000000000000000000000000000 is not a nonnegative fixnum".
   5_2.mo:Expected error in mat iota: "iota: 3/4 is not a nonnegative fixnum".
@@ -277,7 +277,7 @@
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: a is not a string".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 0 is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 37 is not a valid radix".
---- 802,819 ----
+--- 807,824 ----
   5_2.mo:Expected error in mat iota: "iota: -1 is not a nonnegative fixnum".
   5_2.mo:Expected error in mat iota: "iota: 1000000000000000000000000000000 is not a nonnegative fixnum".
   5_2.mo:Expected error in mat iota: "iota: 3/4 is not a nonnegative fixnum".
@@ -297,7 +297,7 @@
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 0 is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 37 is not a valid radix".
 ***************
-*** 824,830 ****
+*** 829,835 ****
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: <int> is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 36 is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: a is not a valid radix".
@@ -305,7 +305,7 @@
   5_3.mo:Expected error in mat number->string: "number->string: a is not a number".
   5_3.mo:Expected error in mat number->string: "number->string: a is not a number".
   5_3.mo:Expected error in mat number->string: "number->string: a is not a number".
---- 824,830 ----
+--- 829,835 ----
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: <int> is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: 36 is not a valid radix".
   5_3.mo:Expected error in mat r6rs:string->number: "string->number: a is not a valid radix".
@@ -314,7 +314,7 @@
   5_3.mo:Expected error in mat number->string: "number->string: a is not a number".
   5_3.mo:Expected error in mat number->string: "number->string: a is not a number".
 ***************
-*** 860,866 ****
+*** 865,871 ****
   5_3.mo:Expected error in mat r6rs:number->string: "number->string: a precision is specified and radix 16 is not 10".
   5_3.mo:Expected error in mat exact?: "exact?: a is not a number".
   5_3.mo:Expected error in mat inexact?: "inexact?: () is not a number".
@@ -322,7 +322,7 @@
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
---- 860,866 ----
+--- 865,871 ----
   5_3.mo:Expected error in mat r6rs:number->string: "number->string: a precision is specified and radix 16 is not 10".
   5_3.mo:Expected error in mat exact?: "exact?: a is not a number".
   5_3.mo:Expected error in mat inexact?: "inexact?: () is not a number".
@@ -331,7 +331,7 @@
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
 ***************
-*** 869,875 ****
+*** 874,880 ****
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
@@ -339,7 +339,7 @@
   5_3.mo:Expected error in mat <: "<: a is not a real number".
   5_3.mo:Expected error in mat <: "<: a is not a real number".
   5_3.mo:Expected error in mat <: "<: a is not a real number".
---- 869,875 ----
+--- 874,880 ----
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
   5_3.mo:Expected error in mat =: "=: a is not a number".
@@ -348,7 +348,7 @@
   5_3.mo:Expected error in mat <: "<: a is not a real number".
   5_3.mo:Expected error in mat <: "<: a is not a real number".
 ***************
-*** 889,895 ****
+*** 894,900 ****
   5_3.mo:Expected error in mat <: "<: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat <: "<: 2+1i is not a real number".
   5_3.mo:Expected error in mat <: "<: 3+1i is not a real number".
@@ -356,7 +356,7 @@
   5_3.mo:Expected error in mat <=: "<=: a is not a real number".
   5_3.mo:Expected error in mat <=: "<=: a is not a real number".
   5_3.mo:Expected error in mat <=: "<=: a is not a real number".
---- 889,895 ----
+--- 894,900 ----
   5_3.mo:Expected error in mat <: "<: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat <: "<: 2+1i is not a real number".
   5_3.mo:Expected error in mat <: "<: 3+1i is not a real number".
@@ -365,7 +365,7 @@
   5_3.mo:Expected error in mat <=: "<=: a is not a real number".
   5_3.mo:Expected error in mat <=: "<=: a is not a real number".
 ***************
-*** 909,915 ****
+*** 914,920 ****
   5_3.mo:Expected error in mat <=: "<=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat <=: "<=: 2+1i is not a real number".
   5_3.mo:Expected error in mat <=: "<=: 3+1i is not a real number".
@@ -373,7 +373,7 @@
   5_3.mo:Expected error in mat >: ">: a is not a real number".
   5_3.mo:Expected error in mat >: ">: a is not a real number".
   5_3.mo:Expected error in mat >: ">: a is not a real number".
---- 909,915 ----
+--- 914,920 ----
   5_3.mo:Expected error in mat <=: "<=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat <=: "<=: 2+1i is not a real number".
   5_3.mo:Expected error in mat <=: "<=: 3+1i is not a real number".
@@ -382,7 +382,7 @@
   5_3.mo:Expected error in mat >: ">: a is not a real number".
   5_3.mo:Expected error in mat >: ">: a is not a real number".
 ***************
-*** 929,935 ****
+*** 934,940 ****
   5_3.mo:Expected error in mat >: ">: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat >: ">: 2+1i is not a real number".
   5_3.mo:Expected error in mat >: ">: 3+1i is not a real number".
@@ -390,7 +390,7 @@
   5_3.mo:Expected error in mat >=: ">=: a is not a real number".
   5_3.mo:Expected error in mat >=: ">=: a is not a real number".
   5_3.mo:Expected error in mat >=: ">=: a is not a real number".
---- 929,935 ----
+--- 934,940 ----
   5_3.mo:Expected error in mat >: ">: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat >: ">: 2+1i is not a real number".
   5_3.mo:Expected error in mat >: ">: 3+1i is not a real number".
@@ -399,7 +399,7 @@
   5_3.mo:Expected error in mat >=: ">=: a is not a real number".
   5_3.mo:Expected error in mat >=: ">=: a is not a real number".
 ***************
-*** 949,956 ****
+*** 954,961 ****
   5_3.mo:Expected error in mat >=: ">=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat >=: ">=: 2+1i is not a real number".
   5_3.mo:Expected error in mat >=: ">=: 3+1i is not a real number".
@@ -408,7 +408,7 @@
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
---- 949,956 ----
+--- 954,961 ----
   5_3.mo:Expected error in mat >=: ">=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat >=: ">=: 2+1i is not a real number".
   5_3.mo:Expected error in mat >=: ">=: 3+1i is not a real number".
@@ -418,7 +418,7 @@
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
 ***************
-*** 958,965 ****
+*** 963,970 ****
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
@@ -427,7 +427,7 @@
   5_3.mo:Expected error in mat r6rs:<: "<: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: a is not a real number".
---- 958,965 ----
+--- 963,970 ----
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
   5_3.mo:Expected error in mat r6rs:=: "=: a is not a number".
@@ -437,7 +437,7 @@
   5_3.mo:Expected error in mat r6rs:<: "<: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: a is not a real number".
 ***************
-*** 970,977 ****
+*** 975,982 ****
   5_3.mo:Expected error in mat r6rs:<: "<: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: 3+1i is not a real number".
@@ -446,7 +446,7 @@
   5_3.mo:Expected error in mat r6rs:<=: "<=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: a is not a real number".
---- 970,977 ----
+--- 975,982 ----
   5_3.mo:Expected error in mat r6rs:<: "<: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:<: "<: 3+1i is not a real number".
@@ -456,7 +456,7 @@
   5_3.mo:Expected error in mat r6rs:<=: "<=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: a is not a real number".
 ***************
-*** 982,989 ****
+*** 987,994 ****
   5_3.mo:Expected error in mat r6rs:<=: "<=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: 3+1i is not a real number".
@@ -465,7 +465,7 @@
   5_3.mo:Expected error in mat r6rs:>: ">: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: a is not a real number".
---- 982,989 ----
+--- 987,994 ----
   5_3.mo:Expected error in mat r6rs:<=: "<=: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:<=: "<=: 3+1i is not a real number".
@@ -475,7 +475,7 @@
   5_3.mo:Expected error in mat r6rs:>: ">: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: a is not a real number".
 ***************
-*** 994,1001 ****
+*** 999,1006 ****
   5_3.mo:Expected error in mat r6rs:>: ">: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: 3+1i is not a real number".
@@ -484,7 +484,7 @@
   5_3.mo:Expected error in mat r6rs:>=: ">=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>=: ">=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>=: ">=: a is not a real number".
---- 994,1001 ----
+--- 999,1006 ----
   5_3.mo:Expected error in mat r6rs:>: ">: 2.0+1.0i is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: 2+1i is not a real number".
   5_3.mo:Expected error in mat r6rs:>: ">: 3+1i is not a real number".
@@ -494,7 +494,7 @@
   5_3.mo:Expected error in mat r6rs:>=: ">=: a is not a real number".
   5_3.mo:Expected error in mat r6rs:>=: ">=: a is not a real number".
 ***************
-*** 1015,1021 ****
+*** 1020,1026 ****
   5_3.mo:Expected error in mat +: "oops".
   5_3.mo:Expected error in mat +: "+: #f is not a number".
   5_3.mo:Expected error in mat +: "+: #f is not a number".
@@ -502,7 +502,7 @@
   5_3.mo:Expected error in mat -: "-: a is not a number".
   5_3.mo:Expected error in mat -: "-: a is not a number".
   5_3.mo:Expected error in mat -: "-: a is not a number".
---- 1015,1021 ----
+--- 1020,1026 ----
   5_3.mo:Expected error in mat +: "oops".
   5_3.mo:Expected error in mat +: "+: #f is not a number".
   5_3.mo:Expected error in mat +: "+: #f is not a number".
@@ -511,7 +511,7 @@
   5_3.mo:Expected error in mat -: "-: a is not a number".
   5_3.mo:Expected error in mat -: "-: a is not a number".
 ***************
-*** 1028,1034 ****
+*** 1033,1039 ****
   5_3.mo:Expected error in mat *: "*: a is not a number".
   5_3.mo:Expected error in mat *: "*: #f is not a number".
   5_3.mo:Expected error in mat *: "*: #f is not a number".
@@ -519,7 +519,7 @@
   5_3.mo:Expected error in mat /: "/: a is not a number".
   5_3.mo:Expected error in mat /: "/: a is not a number".
   5_3.mo:Expected error in mat /: "/: a is not a number".
---- 1028,1034 ----
+--- 1033,1039 ----
   5_3.mo:Expected error in mat *: "*: a is not a number".
   5_3.mo:Expected error in mat *: "*: #f is not a number".
   5_3.mo:Expected error in mat *: "*: #f is not a number".
@@ -528,7 +528,7 @@
   5_3.mo:Expected error in mat /: "/: a is not a number".
   5_3.mo:Expected error in mat /: "/: a is not a number".
 ***************
-*** 1042,1109 ****
+*** 1047,1114 ****
   5_3.mo:Expected error in mat infinite?: "infinite?: a is not a real number".
   5_3.mo:Expected error in mat infinite?: "infinite?: 3+4i is not a real number".
   5_3.mo:Expected error in mat infinite?: "infinite?: 3.0-0.0i is not a real number".
@@ -597,7 +597,7 @@
   5_3.mo:Expected error in mat quotient: "quotient: a is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: a is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2/5 is not an integer".
---- 1042,1109 ----
+--- 1047,1114 ----
   5_3.mo:Expected error in mat infinite?: "infinite?: a is not a real number".
   5_3.mo:Expected error in mat infinite?: "infinite?: 3+4i is not a real number".
   5_3.mo:Expected error in mat infinite?: "infinite?: 3.0-0.0i is not a real number".
@@ -667,7 +667,7 @@
   5_3.mo:Expected error in mat quotient: "quotient: a is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2/5 is not an integer".
 ***************
-*** 1116,1125 ****
+*** 1121,1130 ****
   5_3.mo:Expected error in mat quotient: "quotient: 2+1i is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2+1i is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2.0+1.0i is not an integer".
@@ -678,7 +678,7 @@
   5_3.mo:Expected error in mat remainder: "remainder: a is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: a is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: 2/5 is not an integer".
---- 1116,1125 ----
+--- 1121,1130 ----
   5_3.mo:Expected error in mat quotient: "quotient: 2+1i is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2+1i is not an integer".
   5_3.mo:Expected error in mat quotient: "quotient: 2.0+1.0i is not an integer".
@@ -690,7 +690,7 @@
   5_3.mo:Expected error in mat remainder: "remainder: a is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: 2/5 is not an integer".
 ***************
-*** 1130,1138 ****
+*** 1135,1143 ****
   5_3.mo:Expected error in mat remainder: "remainder: 2.5 is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: 2.5 is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: -3+2i is not an integer".
@@ -700,7 +700,7 @@
   5_3.mo:Expected error in mat modulo: "modulo: a is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: a is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: 3/5 is not an integer".
---- 1130,1138 ----
+--- 1135,1143 ----
   5_3.mo:Expected error in mat remainder: "remainder: 2.5 is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: 2.5 is not an integer".
   5_3.mo:Expected error in mat remainder: "remainder: -3+2i is not an integer".
@@ -711,7 +711,7 @@
   5_3.mo:Expected error in mat modulo: "modulo: a is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: 3/5 is not an integer".
 ***************
-*** 1142,1187 ****
+*** 1147,1192 ****
   5_3.mo:Expected error in mat modulo: "modulo: 3.2 is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: -3.2 is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: -3+2i is not an integer".
@@ -758,7 +758,7 @@
   5_3.mo:Expected error in mat min: "min: a is not a real number".
   5_3.mo:Expected error in mat min: "min: a is not a real number".
   5_3.mo:Expected error in mat min: "min: a is not a real number".
---- 1142,1187 ----
+--- 1147,1192 ----
   5_3.mo:Expected error in mat modulo: "modulo: 3.2 is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: -3.2 is not an integer".
   5_3.mo:Expected error in mat modulo: "modulo: -3+2i is not an integer".
@@ -806,7 +806,7 @@
   5_3.mo:Expected error in mat min: "min: a is not a real number".
   5_3.mo:Expected error in mat min: "min: a is not a real number".
 ***************
-*** 1240,1262 ****
+*** 1245,1267 ****
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
@@ -830,7 +830,7 @@
   5_3.mo:Expected error in mat random: "random: invalid argument a".
   5_3.mo:Expected error in mat random: "random: invalid argument -3".
   5_3.mo:Expected error in mat random: "random: invalid argument 0".
---- 1240,1262 ----
+--- 1245,1267 ----
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
   5_3.mo:Expected error in mat lcm: "lcm: +nan.0 is not an integer".
@@ -855,7 +855,7 @@
   5_3.mo:Expected error in mat random: "random: invalid argument -3".
   5_3.mo:Expected error in mat random: "random: invalid argument 0".
 ***************
-*** 1269,1307 ****
+*** 1274,1312 ****
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument 0".
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument -1".
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument <int>".
@@ -895,7 +895,7 @@
   5_3.mo:Expected error in mat imag-part: "imag-part: a is not a complex number".
   5_3.mo:Expected error in mat make-rectangular: "make-rectangular: a is not a real number".
   5_3.mo:Expected error in mat make-rectangular: "make-rectangular: b is not a real number".
---- 1269,1307 ----
+--- 1274,1312 ----
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument 0".
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument -1".
   5_3.mo:Expected error in mat random-seed: "random-seed: invalid argument <int>".
@@ -936,7 +936,7 @@
   5_3.mo:Expected error in mat make-rectangular: "make-rectangular: a is not a real number".
   5_3.mo:Expected error in mat make-rectangular: "make-rectangular: b is not a real number".
 ***************
-*** 1311,1387 ****
+*** 1316,1392 ****
   5_3.mo:Expected error in mat make-polar: "make-polar: b is not a real number".
   5_3.mo:Expected error in mat make-polar: "make-polar: 3.4+0.0i is not a real number".
   5_3.mo:Expected error in mat make-polar: "make-polar: 3.4+0.0i is not a real number".
@@ -1014,7 +1014,7 @@
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: 35.0 is not an exact integer".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid start index 5.0".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index 8.0".
---- 1311,1387 ----
+--- 1316,1392 ----
   5_3.mo:Expected error in mat make-polar: "make-polar: b is not a real number".
   5_3.mo:Expected error in mat make-polar: "make-polar: 3.4+0.0i is not a real number".
   5_3.mo:Expected error in mat make-polar: "make-polar: 3.4+0.0i is not a real number".
@@ -1093,7 +1093,7 @@
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid start index 5.0".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index 8.0".
 ***************
-*** 1392,1402 ****
+*** 1397,1407 ****
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index -8".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index 3".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index <int>".
@@ -1105,7 +1105,7 @@
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: a is not an exact integer".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid start index 0.0".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index 2.0".
---- 1392,1402 ----
+--- 1397,1407 ----
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index -8".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index 3".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-bit-field: invalid end index <int>".
@@ -1118,7 +1118,7 @@
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid start index 0.0".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index 2.0".
 ***************
-*** 1409,1419 ****
+*** 1414,1424 ****
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index 5".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index <int>".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index <int>".
@@ -1130,7 +1130,7 @@
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: a is not an exact integer".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid start index 0.0".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index 2.0".
---- 1409,1419 ----
+--- 1414,1424 ----
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index 5".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index <int>".
   5_3.mo:Expected error in mat bitwise-copy-bit-field: "bitwise-copy-bit-field: invalid end index <int>".
@@ -1143,7 +1143,7 @@
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid start index 0.0".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index 2.0".
 ***************
-*** 1427,1436 ****
+*** 1432,1441 ****
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index 5".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index <int>".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index <int>".
@@ -1154,7 +1154,7 @@
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: 35.0 is not an exact integer".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid start index 5.0".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid end index 8.0".
---- 1427,1436 ----
+--- 1432,1441 ----
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index 5".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index <int>".
   5_3.mo:Expected error in mat bitwise-rotate-bit-field: "bitwise-rotate-bit-field: invalid end index <int>".
@@ -1166,7 +1166,7 @@
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid start index 5.0".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid end index 8.0".
 ***************
-*** 1441,1464 ****
+*** 1446,1469 ****
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid end index -8".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: start index 5 is greater than end index 3".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: start index <int> is greater than end index <int>".
@@ -1191,7 +1191,7 @@
   5_3.mo:Expected error in mat bitwise-first-bit-set: "bitwise-first-bit-set: 3.0 is not an exact integer".
   5_3.mo:Expected error in mat bitwise-first-bit-set: "bitwise-first-bit-set: a is not an exact integer".
   5_3.mo:Expected error in mat $quotient-remainder: "incorrect number of arguments to #<procedure $quotient-remainder>".
---- 1441,1464 ----
+--- 1446,1469 ----
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: invalid end index -8".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: start index 5 is greater than end index 3".
   5_3.mo:Expected error in mat bitwise-bit-field: "bitwise-reverse-bit-field: start index <int> is greater than end index <int>".
@@ -1217,7 +1217,7 @@
   5_3.mo:Expected error in mat bitwise-first-bit-set: "bitwise-first-bit-set: a is not an exact integer".
   5_3.mo:Expected error in mat $quotient-remainder: "incorrect number of arguments to #<procedure $quotient-remainder>".
 ***************
-*** 1584,1639 ****
+*** 1589,1644 ****
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.4-2.3i is not an exact integer".
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.4-2.3i is not an exact integer".
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.0 is not an exact integer".
@@ -1274,7 +1274,7 @@
   5_3.mo:Expected error in mat real->flonum: "real->flonum: a is not a real number".
   5_3.mo:Expected error in mat real->flonum: "real->flonum: 3+4i is not a real number".
   5_3.mo:Expected error in mat div-and-mod: "div-and-mod: undefined for 0".
---- 1584,1639 ----
+--- 1589,1644 ----
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.4-2.3i is not an exact integer".
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.4-2.3i is not an exact integer".
   5_3.mo:Expected error in mat bitwise-xor: "bitwise-xor: 3.0 is not an exact integer".
@@ -1332,7 +1332,7 @@
   5_3.mo:Expected error in mat real->flonum: "real->flonum: 3+4i is not a real number".
   5_3.mo:Expected error in mat div-and-mod: "div-and-mod: undefined for 0".
 ***************
-*** 1666,1826 ****
+*** 1671,1831 ****
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for 0".
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for a".
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for (a)".
@@ -1494,7 +1494,7 @@
   5_4.mo:Expected error in mat integer->char: "integer->char: a is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: #f is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: #\a is not a valid unicode scalar value".
---- 1666,1826 ----
+--- 1671,1831 ----
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for 0".
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for a".
   5_3.mo:Expected error in mat div0-and-mod0: "mod0: undefined for (a)".
@@ -1657,7 +1657,7 @@
   5_4.mo:Expected error in mat integer->char: "integer->char: #f is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: #\a is not a valid unicode scalar value".
 ***************
-*** 1839,1851 ****
+*** 1844,1856 ****
   5_4.mo:Expected error in mat integer->char: "integer->char: 1114112 is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: 1179648 is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: <int> is not a valid unicode scalar value".
@@ -1671,7 +1671,7 @@
   5_4.mo:Expected error in mat string-for-each: "string-for-each: "" is not a procedure".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: "" is not a procedure".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: "" is not a procedure".
---- 1839,1851 ----
+--- 1844,1856 ----
   5_4.mo:Expected error in mat integer->char: "integer->char: 1114112 is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: 1179648 is not a valid unicode scalar value".
   5_4.mo:Expected error in mat integer->char: "integer->char: <int> is not a valid unicode scalar value".
@@ -1686,7 +1686,7 @@
   5_4.mo:Expected error in mat string-for-each: "string-for-each: "" is not a procedure".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: "" is not a procedure".
 ***************
-*** 1860,2005 ****
+*** 1865,2010 ****
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "" and "x" differ".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "y" and "" differ".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "y" and "" differ".
@@ -1833,7 +1833,7 @@
   5_5.mo:Expected error in mat r6rs:string>=?/r6rs:string-ci>=?: "string-ci>=?: a is not a string".
   5_5.mo:Expected error in mat r6rs:string>=?/r6rs:string-ci>=?: "string-ci>=?: a is not a string".
   5_5.mo:Expected error in mat r6rs:string>=?/r6rs:string-ci>=?: "string-ci>=?: a is not a string".
---- 1860,2005 ----
+--- 1865,2010 ----
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "" and "x" differ".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "y" and "" differ".
   5_4.mo:Expected error in mat string-for-each: "string-for-each: lengths of input string "y" and "" differ".
@@ -1981,7 +1981,7 @@
   5_5.mo:Expected error in mat r6rs:string>=?/r6rs:string-ci>=?: "string-ci>=?: a is not a string".
   5_5.mo:Expected error in mat r6rs:string>=?/r6rs:string-ci>=?: "string-ci>=?: a is not a string".
 ***************
-*** 2007,2045 ****
+*** 2012,2050 ****
   5_5.mo:Expected error in mat string: "string: a is not a character".
   5_5.mo:Expected error in mat string: "string: a is not a character".
   5_5.mo:Expected error in mat string: "string: a is not a character".
@@ -2021,7 +2021,7 @@
   5_5.mo:Expected error in mat string-copy!: "string-copy!: 0 is not a string".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: #vu8(1 2 3) is not a mutable string".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: invalid start value -1".
---- 2007,2045 ----
+--- 2012,2050 ----
   5_5.mo:Expected error in mat string: "string: a is not a character".
   5_5.mo:Expected error in mat string: "string: a is not a character".
   5_5.mo:Expected error in mat string: "string: a is not a character".
@@ -2062,7 +2062,7 @@
   5_5.mo:Expected error in mat string-copy!: "string-copy!: #vu8(1 2 3) is not a mutable string".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: invalid start value -1".
 ***************
-*** 2063,2071 ****
+*** 2068,2076 ****
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 4 + count 1 is beyond the end of "1234"".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 0 + count 500 is beyond the end of "abcdefghi"".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 500 + count 0 is beyond the end of "abcdefghi"".
@@ -2072,7 +2072,7 @@
   5_5.mo:Expected error in mat string-truncate!: "string-truncate!: 0 is not a mutable string".
   5_5.mo:Expected error in mat string-truncate!: "string-truncate!: #vu8(1 2 3) is not a mutable string".
   5_5.mo:Expected error in mat string-truncate!: "string-truncate!: invalid new length -1 for "abcdefghi"".
---- 2063,2071 ----
+--- 2068,2076 ----
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 4 + count 1 is beyond the end of "1234"".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 0 + count 500 is beyond the end of "abcdefghi"".
   5_5.mo:Expected error in mat string-copy!: "string-copy!: index 500 + count 0 is beyond the end of "abcdefghi"".
@@ -2083,7 +2083,7 @@
   5_5.mo:Expected error in mat string-truncate!: "string-truncate!: #vu8(1 2 3) is not a mutable string".
   5_5.mo:Expected error in mat string-truncate!: "string-truncate!: invalid new length -1 for "abcdefghi"".
 ***************
-*** 2077,2129 ****
+*** 2082,2134 ****
   5_5.mo:Expected error in mat string-append: "string-append: b is not a string".
   5_5.mo:Expected error in mat string-append: "string-append: b is not a string".
   5_5.mo:Expected error in mat string-append: "string-copy: a is not a string".
@@ -2137,7 +2137,7 @@
   bytevector.mo:Expected error in mat make-bytevector: "make-bytevector: -1 is not a valid bytevector length".
   bytevector.mo:Expected error in mat make-bytevector: "make-bytevector: -1 is not a valid bytevector length".
   bytevector.mo:Expected error in mat make-bytevector: "make-bytevector: <int> is not a valid bytevector length".
---- 2077,2129 ----
+--- 2082,2134 ----
   5_5.mo:Expected error in mat string-append: "string-append: b is not a string".
   5_5.mo:Expected error in mat string-append: "string-append: b is not a string".
   5_5.mo:Expected error in mat string-append: "string-copy: a is not a string".
@@ -2192,7 +2192,7 @@
   bytevector.mo:Expected error in mat make-bytevector: "make-bytevector: -1 is not a valid bytevector length".
   bytevector.mo:Expected error in mat make-bytevector: "make-bytevector: <int> is not a valid bytevector length".
 ***************
-*** 2140,2169 ****
+*** 2145,2174 ****
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value -500".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 1e100".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".
@@ -2223,7 +2223,7 @@
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: 3 is not a valid index for #vu8(3 4 5)".
---- 2140,2169 ----
+--- 2145,2174 ----
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value -500".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 1e100".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".
@@ -2255,7 +2255,7 @@
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: 3 is not a valid index for #vu8(3 4 5)".
 ***************
-*** 2172,2181 ****
+*** 2177,2186 ****
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value -129".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value 128".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value d".
@@ -2266,7 +2266,7 @@
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: 3 is not a valid index for #vu8(3 4 5)".
---- 2172,2181 ----
+--- 2177,2186 ----
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value -129".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value 128".
   bytevector.mo:Expected error in mat bytevector-s8-set!: "bytevector-s8-set!: invalid value d".
@@ -2278,7 +2278,7 @@
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: (3 4 5) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: 3 is not a valid index for #vu8(3 4 5)".
 ***************
-*** 2184,2192 ****
+*** 2189,2197 ****
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value 256".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value d".
@@ -2288,7 +2288,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index -1 for bytevector #vu8(3 252 5)".
---- 2184,2192 ----
+--- 2189,2197 ----
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value 256".
   bytevector.mo:Expected error in mat bytevector-u8-set!: "bytevector-u8-set!: invalid value d".
@@ -2299,7 +2299,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index -1 for bytevector #vu8(3 252 5)".
 ***************
-*** 2194,2202 ****
+*** 2199,2207 ****
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 2 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 3 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5)".
@@ -2309,7 +2309,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index -1 for bytevector #vu8(3 252 5)".
---- 2194,2202 ----
+--- 2199,2207 ----
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 2 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 3 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-s16-native-ref: "bytevector-s16-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5)".
@@ -2320,7 +2320,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index -1 for bytevector #vu8(3 252 5)".
 ***************
-*** 2204,2213 ****
+*** 2209,2218 ****
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 2 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 3 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5)".
@@ -2331,7 +2331,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2204,2213 ----
+--- 2209,2218 ----
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 2 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 3 for bytevector #vu8(3 252 5)".
   bytevector.mo:Expected error in mat bytevector-u16-native-ref: "bytevector-u16-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5)".
@@ -2343,7 +2343,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2221,2230 ****
+*** 2226,2235 ****
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value 32768".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value -32769".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value "hello"".
@@ -2354,7 +2354,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2221,2230 ----
+--- 2226,2235 ----
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value 32768".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value -32769".
   bytevector.mo:Expected error in mat bytevector-s16-native-set!: "bytevector-s16-native-set!: invalid value "hello"".
@@ -2366,7 +2366,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2238,2246 ****
+*** 2243,2251 ****
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value 65536".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value "hello"".
@@ -2376,7 +2376,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: invalid index -1 for bytevector #vu8(3 252 5)".
---- 2238,2246 ----
+--- 2243,2251 ----
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value 65536".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u16-native-set!: "bytevector-u16-native-set!: invalid value "hello"".
@@ -2387,7 +2387,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: invalid index -1 for bytevector #vu8(3 252 5)".
 ***************
-*** 2250,2258 ****
+*** 2255,2263 ****
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness #t".
@@ -2397,7 +2397,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: invalid index -1 for bytevector #vu8(3 252 5)".
---- 2250,2258 ----
+--- 2255,2263 ----
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s16-ref: "bytevector-s16-ref: unrecognized endianness #t".
@@ -2408,7 +2408,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: #(3 252 5) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: invalid index -1 for bytevector #vu8(3 252 5)".
 ***************
-*** 2262,2271 ****
+*** 2267,2276 ****
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness #t".
@@ -2419,7 +2419,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2262,2271 ----
+--- 2267,2276 ----
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u16-ref: "bytevector-u16-ref: unrecognized endianness #t".
@@ -2431,7 +2431,7 @@
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2281,2290 ****
+*** 2286,2295 ****
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness #t".
@@ -2442,7 +2442,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2281,2290 ----
+--- 2286,2295 ----
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s16-set!: "bytevector-s16-set!: unrecognized endianness #t".
@@ -2454,7 +2454,7 @@
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2300,2309 ****
+*** 2305,2314 ****
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness #t".
@@ -2465,7 +2465,7 @@
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2300,2309 ----
+--- 2305,2314 ----
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u16-set!: "bytevector-u16-set!: unrecognized endianness #t".
@@ -2477,7 +2477,7 @@
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2313,2322 ****
+*** 2318,2327 ****
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness #t".
@@ -2488,7 +2488,7 @@
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2313,2322 ----
+--- 2318,2327 ----
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s24-ref: "bytevector-s24-ref: unrecognized endianness #t".
@@ -2500,7 +2500,7 @@
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2326,2336 ****
+*** 2331,2341 ****
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness #t".
@@ -2512,7 +2512,7 @@
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2326,2336 ----
+--- 2331,2341 ----
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u24-ref: "bytevector-u24-ref: unrecognized endianness #t".
@@ -2525,7 +2525,7 @@
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2344,2354 ****
+*** 2349,2359 ****
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2537,7 +2537,7 @@
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2344,2354 ----
+--- 2349,2359 ----
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s24-set!: "bytevector-s24-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2550,7 +2550,7 @@
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2362,2370 ****
+*** 2367,2375 ****
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2560,7 +2560,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2362,2370 ----
+--- 2367,2375 ----
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u24-set!: "bytevector-u24-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2571,7 +2571,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2376,2384 ****
+*** 2381,2389 ****
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 6 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 7 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5 0 0 0 ...)".
@@ -2581,7 +2581,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2376,2384 ----
+--- 2381,2389 ----
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 6 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 7 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s32-native-ref: "bytevector-s32-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5 0 0 0 ...)".
@@ -2592,7 +2592,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2390,2399 ****
+*** 2395,2404 ****
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 6 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 7 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5 0 0 0 ...)".
@@ -2603,7 +2603,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2390,2399 ----
+--- 2395,2404 ----
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 6 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 7 for bytevector #vu8(3 252 5 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u32-native-ref: "bytevector-u32-native-ref: invalid index 4.0 for bytevector #vu8(3 252 5 0 0 0 ...)".
@@ -2615,7 +2615,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2420,2429 ****
+*** 2425,2434 ****
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value <-int>".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value "hello"".
@@ -2626,7 +2626,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2420,2429 ----
+--- 2425,2434 ----
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value <-int>".
   bytevector.mo:Expected error in mat bytevector-s32-native-set!: "bytevector-s32-native-set!: invalid value "hello"".
@@ -2638,7 +2638,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2450,2459 ****
+*** 2455,2464 ****
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value "hello"".
@@ -2649,7 +2649,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2450,2459 ----
+--- 2455,2464 ----
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u32-native-set!: "bytevector-u32-native-set!: invalid value "hello"".
@@ -2661,7 +2661,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2463,2472 ****
+*** 2468,2477 ****
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness #t".
@@ -2672,7 +2672,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2463,2472 ----
+--- 2468,2477 ----
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s32-ref: "bytevector-s32-ref: unrecognized endianness #t".
@@ -2684,7 +2684,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2476,2486 ****
+*** 2481,2491 ****
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness #t".
@@ -2696,7 +2696,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2476,2486 ----
+--- 2481,2491 ----
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u32-ref: "bytevector-u32-ref: unrecognized endianness #t".
@@ -2709,7 +2709,7 @@
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2495,2505 ****
+*** 2500,2510 ****
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2721,7 +2721,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2495,2505 ----
+--- 2500,2510 ----
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s32-set!: "bytevector-s32-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2734,7 +2734,7 @@
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2514,2523 ****
+*** 2519,2528 ****
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2745,7 +2745,7 @@
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2514,2523 ----
+--- 2519,2528 ----
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u32-set!: "bytevector-u32-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2757,7 +2757,7 @@
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2527,2536 ****
+*** 2532,2541 ****
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness #t".
@@ -2768,7 +2768,7 @@
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2527,2536 ----
+--- 2532,2541 ----
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s40-ref: "bytevector-s40-ref: unrecognized endianness #t".
@@ -2780,7 +2780,7 @@
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2540,2550 ****
+*** 2545,2555 ****
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness #t".
@@ -2792,7 +2792,7 @@
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2540,2550 ----
+--- 2545,2555 ----
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u40-ref: "bytevector-u40-ref: unrecognized endianness #t".
@@ -2805,7 +2805,7 @@
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2558,2568 ****
+*** 2563,2573 ****
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2817,7 +2817,7 @@
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2558,2568 ----
+--- 2563,2573 ----
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s40-set!: "bytevector-s40-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2830,7 +2830,7 @@
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2576,2585 ****
+*** 2581,2590 ****
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2841,7 +2841,7 @@
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2576,2585 ----
+--- 2581,2590 ----
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u40-set!: "bytevector-u40-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2853,7 +2853,7 @@
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2589,2598 ****
+*** 2594,2603 ****
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness #t".
@@ -2864,7 +2864,7 @@
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2589,2598 ----
+--- 2594,2603 ----
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s48-ref: "bytevector-s48-ref: unrecognized endianness #t".
@@ -2876,7 +2876,7 @@
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2602,2612 ****
+*** 2607,2617 ****
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness #t".
@@ -2888,7 +2888,7 @@
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2602,2612 ----
+--- 2607,2617 ----
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u48-ref: "bytevector-u48-ref: unrecognized endianness #t".
@@ -2901,7 +2901,7 @@
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2620,2630 ****
+*** 2625,2635 ****
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2913,7 +2913,7 @@
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2620,2630 ----
+--- 2625,2635 ----
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s48-set!: "bytevector-s48-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2926,7 +2926,7 @@
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2638,2647 ****
+*** 2643,2652 ****
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2937,7 +2937,7 @@
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2638,2647 ----
+--- 2643,2652 ----
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u48-set!: "bytevector-u48-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -2949,7 +2949,7 @@
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2651,2660 ****
+*** 2656,2665 ****
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness #t".
@@ -2960,7 +2960,7 @@
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
---- 2651,2660 ----
+--- 2656,2665 ----
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-s56-ref: "bytevector-s56-ref: unrecognized endianness #t".
@@ -2972,7 +2972,7 @@
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: invalid index -1 for bytevector #vu8(3 252 5 0 0 0 ...)".
 ***************
-*** 2664,2674 ****
+*** 2669,2679 ****
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness #t".
@@ -2984,7 +2984,7 @@
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2664,2674 ----
+--- 2669,2679 ----
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness bigger".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness "little"".
   bytevector.mo:Expected error in mat bytevector-u56-ref: "bytevector-u56-ref: unrecognized endianness #t".
@@ -2997,7 +2997,7 @@
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2682,2692 ****
+*** 2687,2697 ****
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -3009,7 +3009,7 @@
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2682,2692 ----
+--- 2687,2697 ----
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-s56-set!: "bytevector-s56-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -3022,7 +3022,7 @@
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2700,2708 ****
+*** 2705,2713 ****
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -3032,7 +3032,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2700,2708 ----
+--- 2705,2713 ----
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness huge".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness "tiny"".
   bytevector.mo:Expected error in mat bytevector-u56-set!: "bytevector-u56-set!: unrecognized endianness #vu8(173 173 173 173 173 173 ...)".
@@ -3043,7 +3043,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 2732,2740 ****
+*** 2737,2745 ****
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 102 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 103 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3053,7 +3053,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2732,2740 ----
+--- 2737,2745 ----
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 102 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 103 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-s64-native-ref: "bytevector-s64-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3064,7 +3064,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 2764,2773 ****
+*** 2769,2778 ****
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 102 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 103 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3075,7 +3075,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2764,2773 ----
+--- 2769,2778 ----
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 102 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 103 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-u64-native-ref: "bytevector-u64-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3087,7 +3087,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2801,2810 ****
+*** 2806,2815 ****
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value <-int>".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value "hello"".
@@ -3098,7 +3098,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2801,2810 ----
+--- 2806,2815 ----
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value <-int>".
   bytevector.mo:Expected error in mat bytevector-s64-native-set!: "bytevector-s64-native-set!: invalid value "hello"".
@@ -3110,7 +3110,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2838,2847 ****
+*** 2843,2852 ****
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value "hello"".
@@ -3121,7 +3121,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2838,2847 ----
+--- 2843,2852 ----
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value <int>".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value -1".
   bytevector.mo:Expected error in mat bytevector-u64-native-set!: "bytevector-u64-native-set!: invalid value "hello"".
@@ -3133,7 +3133,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 2857,2866 ****
+*** 2862,2871 ****
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness (quote bonkers)".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness get-real".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness 1e23".
@@ -3144,7 +3144,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2857,2866 ----
+--- 2862,2871 ----
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness (quote bonkers)".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness get-real".
   bytevector.mo:Expected error in mat bytevector-s64-ref: "bytevector-s64-ref: unrecognized endianness 1e23".
@@ -3156,7 +3156,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 2876,2886 ****
+*** 2881,2891 ****
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness (quote bonkers)".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness get-real".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness 1e23".
@@ -3168,7 +3168,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2876,2886 ----
+--- 2881,2891 ----
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness (quote bonkers)".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness get-real".
   bytevector.mo:Expected error in mat bytevector-u64-ref: "bytevector-u64-ref: unrecognized endianness 1e23".
@@ -3181,7 +3181,7 @@
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2899,2909 ****
+*** 2904,2914 ****
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness gorgeous".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness #(ravenous)".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness #t".
@@ -3193,7 +3193,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
---- 2899,2909 ----
+--- 2904,2914 ----
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness gorgeous".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness #(ravenous)".
   bytevector.mo:Expected error in mat bytevector-s64-set!: "bytevector-s64-set!: unrecognized endianness #t".
@@ -3206,7 +3206,7 @@
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: #(0 0 0 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: invalid index -1 for bytevector #vu8(173 173 173 173 173 173 ...)".
 ***************
-*** 2922,2930 ****
+*** 2927,2935 ****
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness gorgeous".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness #(ravenous)".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness #t".
@@ -3216,7 +3216,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2922,2930 ----
+--- 2927,2935 ----
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness gorgeous".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness #(ravenous)".
   bytevector.mo:Expected error in mat bytevector-u64-set!: "bytevector-u64-set!: unrecognized endianness #t".
@@ -3227,7 +3227,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 2960,2968 ****
+*** 2965,2973 ****
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 38 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 39 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3237,7 +3237,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 2960,2968 ----
+--- 2965,2973 ----
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 38 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 39 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-ref: "bytevector-ieee-single-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3248,7 +3248,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3002,3011 ****
+*** 3007,3016 ****
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 70 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 71 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3259,7 +3259,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
---- 3002,3011 ----
+--- 3007,3016 ----
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 70 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 71 for bytevector #vu8(0 0 0 0 0 0 ...)".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-ref: "bytevector-ieee-double-native-ref: invalid index 4.0 for bytevector #vu8(0 0 0 0 0 0 ...)".
@@ -3271,7 +3271,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
 ***************
-*** 3039,3048 ****
+*** 3044,3053 ****
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: 1.0+0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: 1.0-0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: "oops" is not a real number".
@@ -3282,7 +3282,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
---- 3039,3048 ----
+--- 3044,3053 ----
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: 1.0+0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: 1.0-0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-single-native-set!: "bytevector-ieee-single-native-set!: "oops" is not a real number".
@@ -3294,7 +3294,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
 ***************
-*** 3088,3097 ****
+*** 3093,3102 ****
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: 1.0+0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: 1.0-0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: "oops" is not a real number".
@@ -3305,7 +3305,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: invalid index -1 for bytevector #vu8(0 0 0 0 199 0 ...)".
---- 3088,3097 ----
+--- 3093,3102 ----
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: 1.0+0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: 1.0-0.0i is not a real number".
   bytevector.mo:Expected error in mat bytevector-ieee-double-native-set!: "bytevector-ieee-double-native-set!: "oops" is not a real number".
@@ -3317,7 +3317,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: invalid index -1 for bytevector #vu8(0 0 0 0 199 0 ...)".
 ***************
-*** 3103,3112 ****
+*** 3108,3117 ****
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness "nuts"".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness crazy".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness 35".
@@ -3328,7 +3328,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 3103,3112 ----
+--- 3108,3117 ----
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness "nuts"".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness crazy".
   bytevector.mo:Expected error in mat bytevector-ieee-single-ref: "bytevector-ieee-single-ref: unrecognized endianness 35".
@@ -3340,7 +3340,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3122,3132 ****
+*** 3127,3137 ****
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness "nuts"".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness crazy".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness 35".
@@ -3352,7 +3352,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
---- 3122,3132 ----
+--- 3127,3137 ----
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness "nuts"".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness crazy".
   bytevector.mo:Expected error in mat bytevector-ieee-double-ref: "bytevector-ieee-double-ref: unrecognized endianness 35".
@@ -3365,7 +3365,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
 ***************
-*** 3143,3153 ****
+*** 3148,3158 ****
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness "ouch"".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness what?".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness #\newline".
@@ -3377,7 +3377,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
---- 3143,3153 ----
+--- 3148,3158 ----
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness "ouch"".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness what?".
   bytevector.mo:Expected error in mat bytevector-ieee-single-set!: "bytevector-ieee-single-set!: unrecognized endianness #\newline".
@@ -3390,7 +3390,7 @@
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: invalid index -1 for bytevector #vu8(235 235 235 235 235 235 ...)".
 ***************
-*** 3168,3178 ****
+*** 3173,3183 ****
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness "ouch"".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness what?".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness #\newline".
@@ -3402,7 +3402,7 @@
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 3168,3178 ----
+--- 3173,3183 ----
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness "ouch"".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness what?".
   bytevector.mo:Expected error in mat bytevector-ieee-double-set!: "bytevector-ieee-double-set!: unrecognized endianness #\newline".
@@ -3415,7 +3415,7 @@
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3207,3217 ****
+*** 3212,3222 ****
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size byte".
@@ -3427,7 +3427,7 @@
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 3207,3217 ----
+--- 3212,3222 ----
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-sint-ref: "bytevector-sint-ref: invalid size byte".
@@ -3440,7 +3440,7 @@
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: #(3 252 5 0 0 0 ...) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3249,3260 ****
+*** 3254,3265 ****
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size <int> for bytevector #vu8(1 2 3 4)".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size byte".
@@ -3453,7 +3453,7 @@
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 3249,3260 ----
+--- 3254,3265 ----
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size <int> for bytevector #vu8(1 2 3 4)".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-uint-ref: "bytevector-uint-ref: invalid size byte".
@@ -3467,7 +3467,7 @@
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3313,3324 ****
+*** 3318,3329 ****
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size byte".
@@ -3480,7 +3480,7 @@
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
---- 3313,3324 ----
+--- 3318,3329 ----
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-sint-set!: "bytevector-sint-set!: invalid size byte".
@@ -3494,7 +3494,7 @@
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: #(3 252 5 0 0 0 ...) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid index -1 for bytevector #vu8(0 0 0 0 0 0 ...)".
 ***************
-*** 3377,3392 ****
+*** 3382,3397 ****
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size byte".
@@ -3511,7 +3511,7 @@
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: 0 is not a bytevector".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: #(1 2 3) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: invalid start value -1".
---- 3377,3392 ----
+--- 3382,3397 ----
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size 0".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size -1".
   bytevector.mo:Expected error in mat bytevector-uint-set!: "bytevector-uint-set!: invalid size byte".
@@ -3529,7 +3529,7 @@
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: #(1 2 3) is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: invalid start value -1".
 ***************
-*** 3410,3418 ****
+*** 3415,3423 ****
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 4 + count 1 is beyond the end of #vu8(1 2 3 4)".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 0 + count 500 is beyond the end of #vu8(255 254 253 252 251 250 ...)".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 500 + count 0 is beyond the end of #vu8(255 254 253 252 251 250 ...)".
@@ -3539,7 +3539,7 @@
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: 0 is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: "abc" is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length -1 for #vu8(1 2 3 4 5 6 ...)".
---- 3410,3418 ----
+--- 3415,3423 ----
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 4 + count 1 is beyond the end of #vu8(1 2 3 4)".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 0 + count 500 is beyond the end of #vu8(255 254 253 252 251 250 ...)".
   bytevector.mo:Expected error in mat bytevector-copy!: "bytevector-copy!: index 500 + count 0 is beyond the end of #vu8(255 254 253 252 251 250 ...)".
@@ -3550,7 +3550,7 @@
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: "abc" is not a mutable bytevector".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length -1 for #vu8(1 2 3 4 5 6 ...)".
 ***************
-*** 3420,3460 ****
+*** 3425,3465 ****
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length 1000 for #vu8(1 2 3 4 5 6 ...)".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length <int> for #vu8(1 2 3 4 5 6 ...)".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length a for #vu8(1 2 3 4 5 6 ...)".
@@ -3592,7 +3592,7 @@
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: (1 2 . 3) is not a proper list".
---- 3420,3460 ----
+--- 3425,3465 ----
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length 1000 for #vu8(1 2 3 4 5 6 ...)".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length <int> for #vu8(1 2 3 4 5 6 ...)".
   bytevector.mo:Expected error in mat bytevector-truncate!: "bytevector-truncate!: invalid new length a for #vu8(1 2 3 4 5 6 ...)".
@@ -3635,7 +3635,7 @@
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: (1 2 . 3) is not a proper list".
 ***************
-*** 3493,3501 ****
+*** 3498,3506 ****
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size 0".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size 1.0".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size "oops"".
@@ -3645,7 +3645,7 @@
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: (1 2 . 3) is not a proper list".
---- 3493,3501 ----
+--- 3498,3506 ----
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size 0".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size 1.0".
   bytevector.mo:Expected error in mat sint-list->bytevector: "sint-list->bytevector: invalid size "oops"".
@@ -3656,7 +3656,7 @@
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: #(a b c) is not a proper list".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: (1 2 . 3) is not a proper list".
 ***************
-*** 3534,3542 ****
+*** 3539,3547 ****
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size 0".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size 1.0".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size "oops"".
@@ -3666,7 +3666,7 @@
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: unrecognized endianness spam".
---- 3534,3542 ----
+--- 3539,3547 ----
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size 0".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size 1.0".
   bytevector.mo:Expected error in mat uint-list->bytevector: "uint-list->bytevector: invalid size "oops"".
@@ -3677,7 +3677,7 @@
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: unrecognized endianness spam".
 ***************
-*** 3556,3564 ****
+*** 3561,3569 ****
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 10".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 11".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 50".
@@ -3687,7 +3687,7 @@
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: unrecognized endianness spam".
---- 3556,3564 ----
+--- 3561,3569 ----
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 10".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 11".
   bytevector.mo:Expected error in mat bytevector->sint-list: "bytevector->sint-list: bytevector length 12 is not a multiple of size 50".
@@ -3698,7 +3698,7 @@
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: #(a b c) is not a bytevector".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: unrecognized endianness spam".
 ***************
-*** 3578,3586 ****
+*** 3583,3591 ****
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 10".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 11".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 50".
@@ -3708,7 +3708,7 @@
   bytevector.mo:Expected error in mat bytevector=?: "bytevector=?: a is not a bytevector".
   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"".
---- 3578,3586 ----
+--- 3583,3591 ----
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 10".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 11".
   bytevector.mo:Expected error in mat bytevector->uint-list: "bytevector->uint-list: bytevector length 12 is not a multiple of size 50".
@@ -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"".
 ***************
-*** 3627,3638 ****
+*** 3632,3643 ****
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: bytevector #vu8(255 255 255 255 255 255 ...) claims invalid uncompressed size <int>".
   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".
@@ -3732,7 +3732,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".
---- 3627,3638 ----
+--- 3632,3643 ----
   bytevector.mo:Expected error in mat bytevector-compress: "bytevector-uncompress: bytevector #vu8(255 255 255 255 255 255 ...) claims invalid uncompressed size <int>".
   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".
@@ -3746,7 +3746,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".
 ***************
-*** 3704,3724 ****
+*** 3709,3729 ****
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to assign undefined variable b".
   misc.mo:Expected error in mat compile-profile: "compile-profile: invalid mode src [must be #f, #t, source, or block]".
@@ -3768,7 +3768,7 @@
   misc.mo:Expected error in mat compile-profile: "profile-dump-data: #t is not a string".
   misc.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump 17".
   misc.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump (17)".
---- 3704,3724 ----
+--- 3709,3729 ----
   misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
   misc.mo:Expected error in mat cpletrec: "attempt to assign undefined variable b".
   misc.mo:Expected error in mat compile-profile: "compile-profile: invalid mode src [must be #f, #t, source, or block]".
@@ -3791,7 +3791,7 @@
   misc.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump 17".
   misc.mo:Expected error in mat compile-profile: "profile-dump-data: invalid dump (17)".
 ***************
-*** 3751,3757 ****
+*** 3756,3762 ****
   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 2".
@@ -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".
---- 3751,3757 ----
+--- 3756,3762 ----
   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 2".
@@ -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".
 ***************
-*** 3805,3812 ****
+*** 3810,3817 ****
   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".
---- 3805,3812 ----
+--- 3810,3817 ----
   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".
 ***************
-*** 3834,3842 ****
+*** 3839,3847 ****
   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".
---- 3834,3842 ----
+--- 3839,3847 ----
   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".
 ***************
-*** 3900,3908 ****
+*** 3905,3913 ****
   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".
---- 3900,3908 ----
+--- 3905,3913 ----
   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".
 ***************
-*** 3917,3925 ****
+*** 3922,3930 ****
   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".
---- 3917,3925 ----
+--- 3922,3930 ----
   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".
 ***************
-*** 3934,3951 ****
+*** 3939,3956 ****
   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".
---- 3934,3951 ----
+--- 3939,3956 ----
   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".
 ***************
-*** 3956,3964 ****
+*** 3961,3969 ****
   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)".
---- 3956,3964 ----
+--- 3961,3969 ----
   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)".
 ***************
-*** 3987,3994 ****
+*** 3992,3999 ****
   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".
---- 3987,3994 ----
+--- 3992,3999 ----
   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".
 ***************
-*** 4026,4047 ****
+*** 4031,4052 ****
   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".
---- 4026,4047 ----
+--- 4031,4052 ----
   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".
 ***************
-*** 4050,4056 ****
+*** 4055,4061 ****
   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".
---- 4050,4056 ----
+--- 4055,4061 ----
   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".
 ***************
-*** 4067,4074 ****
+*** 4072,4079 ****
   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".
@@ -4042,7 +4042,7 @@
   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".
---- 4067,4074 ----
+--- 4072,4079 ----
   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".
@@ -4052,7 +4052,7 @@
   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".
 ***************
-*** 6552,6583 ****
+*** 6557,6588 ****
   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".
---- 6552,6583 ----
+--- 6557,6588 ----
   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".
 ***************
-*** 6588,6594 ****
+*** 6593,6599 ****
   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".
---- 6588,6594 ----
+--- 6593,6599 ----
   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".
 ***************
-*** 6771,6783 ****
+*** 6776,6788 ****
   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".
---- 6771,6783 ----
+--- 6776,6788 ----
   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".
 ***************
-*** 6785,6800 ****
+*** 6790,6805 ****
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: 1024.0 is not a positive fixnum".
   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".
---- 6785,6800 ----
+--- 6790,6805 ----
   io.mo:Expected error in mat custom-port-buffer-size: "custom-port-buffer-size: 1024.0 is not a positive fixnum".
   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".
 ***************
-*** 6866,6881 ****
+*** 6871,6886 ****
   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>".
---- 6866,6881 ----
+--- 6871,6886 ----
   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>".
 ***************
-*** 7046,7052 ****
+*** 7052,7058 ****
   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 visit: library (testfile-wpo-lib) is not visible
   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
---- 7046,7052 ----
+--- 7052,7058 ----
   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
 ***************
-*** 7061,7087 ****
+*** 7067,7093 ****
   7.mo:Expected error in mat compile-whole-library: "separate-eval: Exception: library (testfile-cwl-c6) not found
   7.mo:Expected error in mat compile-whole-library: "separate-compile: Exception in compile-whole-library: encountered visit-only run-time library (testfile-cwl-a9) while processing file "testfile-cwl-a9.wpo"
   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".
---- 7061,7087 ----
+--- 7067,7093 ----
   7.mo:Expected error in mat compile-whole-library: "separate-eval: Exception: library (testfile-cwl-c6) not found
   7.mo:Expected error in mat compile-whole-library: "separate-compile: Exception in compile-whole-library: encountered visit-only run-time library (testfile-cwl-a9) while processing file "testfile-cwl-a9.wpo"
   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".
 ***************
-*** 7486,7596 ****
+*** 7492,7602 ****
   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".
---- 7486,7596 ----
+--- 7492,7602 ----
   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".
 ***************
-*** 7610,7716 ****
+*** 7616,7722 ****
   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".
---- 7610,7716 ----
+--- 7616,7722 ----
   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".
 ***************
-*** 7718,7733 ****
+*** 7724,7739 ****
   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>".
---- 7718,7733 ----
+--- 7724,7739 ----
   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>".
 ***************
-*** 7843,7850 ****
+*** 7849,7856 ****
   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>".
---- 7843,7850 ----
+--- 7849,7856 ----
   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>".
 ***************
-*** 8432,8447 ****
+*** 8439,8454 ****
   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*>".
---- 8432,8447 ----
+--- 8439,8454 ----
   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*>".
 ***************
-*** 8540,8562 ****
+*** 8547,8569 ****
   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".
---- 8540,8562 ----
+--- 8547,8569 ----
   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".
 ***************
-*** 8588,8600 ****
+*** 8595,8607 ****
   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".
---- 8588,8600 ----
+--- 8595,8607 ----
   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".
 ***************
-*** 8644,8656 ****
+*** 8651,8663 ****
   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".
---- 8644,8656 ----
+--- 8651,8663 ----
   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".
 ***************
-*** 8748,8757 ****
+*** 8755,8764 ****
   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".
---- 8748,8757 ----
+--- 8755,8764 ----
   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".
 ***************
-*** 8765,8798 ****
+*** 8772,8805 ****
   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".
---- 8765,8798 ----
+--- 8772,8805 ----
   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".
 ***************
-*** 8802,8845 ****
+*** 8809,8852 ****
   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".
---- 8802,8845 ----
+--- 8809,8852 ----
   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".
 ***************
-*** 8848,8858 ****
+*** 8855,8865 ****
   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".
---- 8848,8858 ----
+--- 8855,8865 ----
   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".
 ***************
-*** 8912,8921 ****
+*** 8919,8928 ****
   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".
---- 8912,8921 ----
+--- 8919,8928 ----
   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".
 ***************
-*** 8931,8940 ****
+*** 8938,8947 ****
   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".
---- 8931,8940 ----
+--- 8938,8947 ----
   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".
 ***************
-*** 8950,8959 ****
+*** 8957,8966 ****
   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".
---- 8950,8959 ----
+--- 8957,8966 ----
   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".
 ***************
-*** 8969,8979 ****
+*** 8976,8986 ****
   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".
---- 8969,8979 ----
+--- 8976,8986 ----
   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".
 ***************
-*** 8996,9005 ****
+*** 9003,9012 ****
   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".
---- 8996,9005 ----
+--- 9003,9012 ----
   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".
 ***************
-*** 9015,9032 ****
+*** 9022,9039 ****
   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".
---- 9015,9032 ----
+--- 9022,9039 ----
   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".
 ***************
-*** 9034,9040 ****
+*** 9041,9047 ****
   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".
---- 9034,9040 ----
+--- 9041,9047 ----
   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".
 ***************
-*** 9042,9048 ****
+*** 9049,9055 ****
   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".
---- 9042,9048 ----
+--- 9049,9055 ----
   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".
 ***************
-*** 9050,9056 ****
+*** 9057,9063 ****
   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".
---- 9050,9056 ----
+--- 9057,9063 ----
   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".
 ***************
-*** 9058,9064 ****
+*** 9065,9071 ****
   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".
---- 9058,9064 ----
+--- 9065,9071 ----
   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".
 ***************
-*** 9066,9105 ****
+*** 9073,9112 ****
   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".
---- 9066,9105 ----
+--- 9073,9112 ----
   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".
 ***************
-*** 9109,9115 ****
+*** 9116,9122 ****
   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".
---- 9109,9115 ----
+--- 9116,9122 ----
   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".
 ***************
-*** 9119,9201 ****
+*** 9126,9208 ****
   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".
---- 9119,9201 ----
+--- 9126,9208 ----
   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".
 ***************
-*** 9215,9250 ****
+*** 9222,9257 ****
   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".
---- 9215,9250 ----
+--- 9222,9257 ----
   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".
 ***************
-*** 9252,9259 ****
+*** 9259,9266 ****
   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".
---- 9252,9259 ----
+--- 9259,9266 ----
   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".
 ***************
-*** 9261,9267 ****
+*** 9268,9274 ****
   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".
---- 9261,9267 ----
+--- 9268,9274 ----
   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".
 ***************
-*** 9269,9275 ****
+*** 9276,9282 ****
   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".
---- 9269,9275 ----
+--- 9276,9282 ----
   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".
 ***************
-*** 9277,9290 ****
+*** 9284,9297 ****
   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".
---- 9277,9290 ----
+--- 9284,9297 ----
   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".
 ***************
-*** 9330,9336 ****
+*** 9337,9343 ****
   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".
---- 9330,9336 ----
+--- 9337,9343 ----
   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".
 ***************
-*** 9340,9353 ****
+*** 9347,9360 ****
   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"".
---- 9340,9353 ----
+--- 9347,9360 ----
   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"".
 ***************
-*** 9382,9389 ****
+*** 9389,9396 ****
   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"".
---- 9382,9389 ----
+--- 9389,9396 ----
   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"".
 ***************
-*** 9881,9893 ****
+*** 9888,9900 ****
   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".
---- 9881,9893 ----
+--- 9888,9900 ----
   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".
 ***************
-*** 9915,9986 ****
+*** 9922,9993 ****
   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".
---- 9915,9986 ----
+--- 9922,9993 ----
   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".
 ***************
-*** 9988,10001 ****
+*** 9995,10008 ****
   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".
---- 9988,10001 ----
+--- 9995,10008 ----
   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".
 ***************
-*** 10021,10081 ****
+*** 10028,10088 ****
   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".
---- 10021,10081 ----
+--- 10028,10088 ----
   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-interpret-0-f-f-f b/mats/patch-interpret-0-f-f-f
index 2c9152df2f..f0420ea20d 100644
--- a/mats/patch-interpret-0-f-f-f
+++ b/mats/patch-interpret-0-f-f-f
@@ -1,5 +1,5 @@
-*** errors-compile-0-f-f-f	2019-02-07 11:07:08.000000000 -0800
---- errors-interpret-0-f-f-f	2019-02-07 10:46:19.000000000 -0800
+*** errors-compile-0-f-f-f	2019-02-11 17:18:14.000000000 -0800
+--- errors-interpret-0-f-f-f	2019-02-11 16:56:11.000000000 -0800
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -196,7 +196,7 @@
   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".
 ***************
-*** 4071,4086 ****
+*** 4076,4091 ****
   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)".
@@ -213,26 +213,26 @@
   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)".
---- 4077,4086 ----
+--- 4082,4091 ----
 ***************
-*** 7026,7032 ****
+*** 7032,7038 ****
   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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+  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
 ! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   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".
---- 7026,7032 ----
+--- 7032,7038 ----
   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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+  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
 ! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   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".
 ***************
-*** 7354,7360 ****
+*** 7360,7366 ****
   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".
@@ -240,7 +240,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".
---- 7354,7360 ----
+--- 7360,7366 ----
   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".
@@ -249,7 +249,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".
 ***************
-*** 8588,8600 ****
+*** 8595,8607 ****
   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".
@@ -263,7 +263,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".
---- 8588,8600 ----
+--- 8595,8607 ----
   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".
@@ -278,7 +278,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".
 ***************
-*** 9355,9379 ****
+*** 9362,9386 ****
   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".
@@ -304,7 +304,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".
---- 9355,9379 ----
+--- 9362,9386 ----
   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".
@@ -331,7 +331,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".
 ***************
-*** 9386,9417 ****
+*** 9393,9424 ****
   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".
@@ -364,7 +364,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>".
---- 9386,9417 ----
+--- 9393,9424 ----
   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".
@@ -398,7 +398,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>".
 ***************
-*** 9419,9444 ****
+*** 9426,9451 ****
   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>".
@@ -425,7 +425,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>".
---- 9419,9444 ----
+--- 9426,9451 ----
   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>".
@@ -453,7 +453,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>".
 ***************
-*** 9449,9483 ****
+*** 9456,9490 ****
   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>".
@@ -489,7 +489,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>".
---- 9449,9483 ----
+--- 9456,9490 ----
   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>".
@@ -526,7 +526,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>".
 ***************
-*** 10084,10093 ****
+*** 10091,10100 ****
   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 ...)))".
@@ -537,7 +537,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".
---- 10084,10093 ----
+--- 10091,10100 ----
   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 70d91f99fc..e615899cac 100644
--- a/mats/patch-interpret-0-f-t-f
+++ b/mats/patch-interpret-0-f-t-f
@@ -1,5 +1,5 @@
-*** errors-compile-0-f-t-f	2019-02-07 10:28:25.000000000 -0800
---- errors-interpret-0-f-t-f	2019-02-07 10:55:02.000000000 -0800
+*** errors-compile-0-f-t-f	2019-02-11 16:37:31.000000000 -0800
+--- errors-interpret-0-f-t-f	2019-02-11 17:05:28.000000000 -0800
 ***************
 *** 1,7 ****
   primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
@@ -169,7 +169,7 @@
   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".
 ***************
-*** 4071,4086 ****
+*** 4076,4091 ****
   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)".
@@ -186,26 +186,26 @@
   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)".
---- 4077,4086 ----
+--- 4082,4091 ----
 ***************
-*** 7026,7032 ****
+*** 7032,7038 ****
   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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+  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
 ! 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
   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".
---- 7026,7032 ----
+--- 7032,7038 ----
   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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-  7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
+  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
 ! 7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
   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".
 ***************
-*** 7163,7170 ****
+*** 7169,7176 ****
   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".
@@ -214,7 +214,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)".
---- 7163,7170 ----
+--- 7169,7176 ----
   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".
@@ -224,7 +224,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)".
 ***************
-*** 7172,7186 ****
+*** 7178,7192 ****
   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".
@@ -240,7 +240,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".
---- 7172,7186 ----
+--- 7178,7192 ----
   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".
@@ -257,7 +257,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".
 ***************
-*** 7193,7218 ****
+*** 7199,7224 ****
   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>".
@@ -284,7 +284,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".
---- 7193,7218 ----
+--- 7199,7224 ----
   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>".
@@ -312,7 +312,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".
 ***************
-*** 7343,7381 ****
+*** 7349,7387 ****
   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>".
@@ -352,7 +352,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".
---- 7343,7381 ----
+--- 7349,7387 ----
   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>".
@@ -393,7 +393,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".
 ***************
-*** 7390,7446 ****
+*** 7396,7452 ****
   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".
@@ -451,7 +451,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".
---- 7390,7446 ----
+--- 7396,7452 ----
   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".
@@ -510,7 +510,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".
 ***************
-*** 8588,8600 ****
+*** 8595,8607 ****
   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".
@@ -524,7 +524,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".
---- 8588,8600 ----
+--- 8595,8607 ----
   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".
@@ -539,7 +539,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".
 ***************
-*** 10084,10093 ****
+*** 10091,10100 ****
   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 ...)))".
@@ -550,7 +550,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".
---- 10084,10093 ----
+--- 10091,10100 ----
   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 8f80b0e022..4e96f08ae3 100644
--- a/mats/patch-interpret-3-f-f-f
+++ b/mats/patch-interpret-3-f-f-f
@@ -1,5 +1,5 @@
-*** errors-compile-3-f-f-f	2019-02-07 10:23:48.000000000 -0800
---- errors-interpret-3-f-f-f	2019-02-07 11:13:51.000000000 -0800
+*** errors-compile-3-f-f-f	2019-02-11 16:33:03.000000000 -0800
+--- errors-interpret-3-f-f-f	2019-02-11 17:25:17.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
diff --git a/mats/patch-interpret-3-f-t-f b/mats/patch-interpret-3-f-t-f
index 380ab7b860..a95808cbdc 100644
--- a/mats/patch-interpret-3-f-t-f
+++ b/mats/patch-interpret-3-f-t-f
@@ -1,5 +1,5 @@
-*** errors-compile-3-f-t-f	2019-02-07 10:32:58.000000000 -0800
---- errors-interpret-3-f-t-f	2019-02-07 10:59:14.000000000 -0800
+*** errors-compile-3-f-t-f	2019-02-11 16:41:58.000000000 -0800
+--- errors-interpret-3-f-t-f	2019-02-11 17:10:00.000000000 -0800
 ***************
 *** 1,3 ****
 --- 1,9 ----
diff --git a/mats/primvars.ms b/mats/primvars.ms
index ebf6b7c151..b199577964 100644
--- a/mats/primvars.ms
+++ b/mats/primvars.ms
@@ -109,7 +109,7 @@
            separate-compile separate-eval run-script patch-exec-path $record->vector
            $cat_flush
            test-cp0-expansion
-           mkfile rm-rf)))
+           mkfile rm-rf touch)))
     (let loop ([ls (remp gensym? (oblist))] [bad '()])
       (if (null? ls)
           (or (null? bad)
@@ -370,6 +370,7 @@
               [(char) #\a 0 #f]
               [(codec) latin-1-codec 0 #f]
               [(code) (closure-code 'values) 0 #f]
+              [(compile-time-value) (make-compile-time-value 17)]
               [(condition) (make-who-condition 'me) 'the-who]
               [(continuation-condition) (call/cc make-continuation-condition) (make-who-condition 'who) #f]
               [(cost-center) *cost-center '(a) #f]
diff --git a/mats/root-experr-compile-0-f-f-f b/mats/root-experr-compile-0-f-f-f
index 1c5428574c..e34d3644fa 100644
--- a/mats/root-experr-compile-0-f-f-f
+++ b/mats/root-experr-compile-0-f-f-f
@@ -527,6 +527,11 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat dynamic-wind: "variable gook is not bound".
 4.mo:Expected error in mat dynamic-wind: "variable gook is not bound".
 4.mo:Expected error in mat call/1cc: "attempt to invoke shot one-shot continuation".
+4.mo:Expected error in mat refcount-guardians: "unrecognized ftype name NO!".
+4.mo:Expected error in mat refcount-guardians: "first field must be a word-sized integer with native endianness (ftype-guardian A)".
+4.mo:Expected error in mat refcount-guardians: "first field must be a word-sized integer with native endianness (ftype-guardian A)".
+4.mo:Expected error in mat refcount-guardians: "ftype-guardian: (ka . blooie) is not an ftype pointer of the expected type #<ftd A>".
+4.mo:Expected error in mat refcount-guardians: "ftype-guardian: <ftype-pointer> is not an ftype pointer of the expected type #<ftd A>".
 4.mo:Expected error in mat $primitive: "fx+: a is not a fixnum".
 4.mo:Expected error in mat $primitive: "invalid primitive name fubar".
 4.mo:Expected error in mat $primitive: "incorrect argument count in call (car (quote a) (quote b))".
@@ -7024,8 +7029,9 @@ format.mo:Expected error in mat format-dollar: "format: expected real number for
 7.mo:Expected error in mat maybe-compile: "invalid syntax (if) at line 2, char 1 of testfile-mc.ss".
 7.mo:Expected error in mat maybe-compile: "invalid syntax (define) at line 4, char 3 of testfile-mc.ss".
 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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: 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-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
 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
 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".
@@ -8284,6 +8290,7 @@ enum.mo:Expected error in mat enumeration: "make-record-type: cannot extend seal
 8.mo:Expected error in mat make-compile-time-value: "first argument to lookup procedure is not an identifier (a)".
 8.mo:Expected error in mat make-compile-time-value: "second argument to lookup procedure is not an identifier "frip"".
 8.mo:Expected error in mat make-compile-time-value: "incorrect number of arguments to #<procedure rho>".
+8.mo:Expected error in mat make-compile-time-value: "compile-time-value-value: 17 is not a compile-time value".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
diff --git a/mats/root-experr-compile-2-f-f-f b/mats/root-experr-compile-2-f-f-f
index 2d93ae2012..e34d3644fa 100644
--- a/mats/root-experr-compile-2-f-f-f
+++ b/mats/root-experr-compile-2-f-f-f
@@ -527,6 +527,11 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 4.mo:Expected error in mat dynamic-wind: "variable gook is not bound".
 4.mo:Expected error in mat dynamic-wind: "variable gook is not bound".
 4.mo:Expected error in mat call/1cc: "attempt to invoke shot one-shot continuation".
+4.mo:Expected error in mat refcount-guardians: "unrecognized ftype name NO!".
+4.mo:Expected error in mat refcount-guardians: "first field must be a word-sized integer with native endianness (ftype-guardian A)".
+4.mo:Expected error in mat refcount-guardians: "first field must be a word-sized integer with native endianness (ftype-guardian A)".
+4.mo:Expected error in mat refcount-guardians: "ftype-guardian: (ka . blooie) is not an ftype pointer of the expected type #<ftd A>".
+4.mo:Expected error in mat refcount-guardians: "ftype-guardian: <ftype-pointer> is not an ftype pointer of the expected type #<ftd A>".
 4.mo:Expected error in mat $primitive: "fx+: a is not a fixnum".
 4.mo:Expected error in mat $primitive: "invalid primitive name fubar".
 4.mo:Expected error in mat $primitive: "incorrect argument count in call (car (quote a) (quote b))".
@@ -3832,6 +3837,8 @@ cp0.mo:Expected error in mat cp0-regression: "source-object-bfp: #f is not a sou
 cp0.mo:Expected error in mat cp0-regression: "source-object-efp: #f is not a source object".
 cp0.mo:Expected error in mat cp0-regression: "source-object-sfd: #f is not a source object".
 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".
 cp0.mo:Expected error in mat expand/optimize: "incorrect argument count in call (expand/optimize)".
 cp0.mo:Expected error in mat expand/optimize: "expand/optimize: b is not an environment".
 cp0.mo:Expected error in mat expand/optimize: "incorrect argument count in call (expand/optimize (quote a) (quote b) (quote c))".
@@ -7022,8 +7029,9 @@ format.mo:Expected error in mat format-dollar: "format: expected real number for
 7.mo:Expected error in mat maybe-compile: "invalid syntax (if) at line 2, char 1 of testfile-mc.ss".
 7.mo:Expected error in mat maybe-compile: "invalid syntax (define) at line 4, char 3 of testfile-mc.ss".
 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 maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
-7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: 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-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
 7.mo:Expected error in mat eval: "compile: 7 is not an environment".
 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".
@@ -7553,14 +7561,31 @@ hash.mo:Expected error in mat hashtable-arguments: "hashtable-clear!: #<eq hasht
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-clear!: #<eq hashtable> is not mutable".
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-clear!: invalid size argument #t".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-keys)".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-keys $ht 72 43)".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-keys: (hash . table) is not a hashtable".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-keys: -79 is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-keys: not-an-unsigned-integer is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-keys)".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-keys $ht 72)".
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-keys: (hash . table) is not a hashtable".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-values)".
-hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-values $ht 72)".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-values $ht 72 43)".
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-values: (hash . table) is not a hashtable".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-values: -79 is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-values: not-an-unsigned-integer is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-entries)".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-entries $ht 72 43)".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-entries: (hash . table) is not a hashtable".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-entries: -79 is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-entries: not-an-unsigned-integer is not a valid length".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-entries)".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-entries $ht 72)".
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-entries: (hash . table) is not a hashtable".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-cells)".
+hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-cells $ht 72 43)".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-cells: (hash . table) is not a hashtable".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-cells: -79 is not a valid length".
+hash.mo:Expected error in mat hashtable-arguments: "hashtable-cells: not-an-unsigned-integer is not a valid length".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-hash-function)".
 hash.mo:Expected error in mat hashtable-arguments: "incorrect argument count in call (hashtable-hash-function $ht $ht)".
 hash.mo:Expected error in mat hashtable-arguments: "hashtable-hash-function: (hash . table) is not an eq hashtable".
@@ -8265,6 +8290,7 @@ enum.mo:Expected error in mat enumeration: "make-record-type: cannot extend seal
 8.mo:Expected error in mat make-compile-time-value: "first argument to lookup procedure is not an identifier (a)".
 8.mo:Expected error in mat make-compile-time-value: "second argument to lookup procedure is not an identifier "frip"".
 8.mo:Expected error in mat make-compile-time-value: "incorrect number of arguments to #<procedure rho>".
+8.mo:Expected error in mat make-compile-time-value: "compile-time-value-value: 17 is not a compile-time value".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
 8.mo:Expected error in mat make-compile-time-value: "invalid syntax frob".
diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex
index 2331f99328..ab54a07326 100644
--- a/release_notes/release_notes.stex
+++ b/release_notes/release_notes.stex
@@ -58,6 +58,33 @@ Online versions of both books can be found at
 %-----------------------------------------------------------------------------
 \section{Functionality Changes}\label{section:functionality}
 
+\subsection{Ftype guardians (9.5.1)}
+
+Applications that manage memory outside the Scheme heap can leverage
+new support for ftype guardians to help perform reference counting.
+An ftype guardian is like an ordinary guardian except that it does
+not necessarily save from collection each ftype pointer registered
+with it but instead decrements (atomically) a reference count at
+the head of the object to which the ftype pointer points.
+If the reference count becomes zero as a result of the decrement,
+it preserves the object so that it can be retrieved from the guardian
+and freed; otherwise it allows it to be collected.
+
+\subsection{Recompile information and whole-program optimization (9.5.1)}
+
+\scheme{compile-whole-program} and \scheme{compile-whole-library}
+now propagate recompile information from the named \scheme{wpo}
+file to the object file to support \scheme{maybe-compile-program}
+and \scheme{maybe-compile-library} in the case where the new object
+file overwrites the original object file.
+
+\subsection{Directly accessing the value of compile-time values (9.5.1)}
+
+The value of a compile-time value created by \scheme{make-compile-time-value}
+can be retrieved via the new procedure \scheme{compile-time-value-value}.
+The new predicate \scheme{compile-time-value?} can be used to determine if
+an object is a compile-time value.
+
 \subsection{Extracting a subset of hashtable entries (9.5.1)}
 
 The new \scheme{hashtable-cells} function is similar to
@@ -1613,6 +1640,16 @@ in fasl files does not generally make sense.
 %-----------------------------------------------------------------------------
 \section{Bug Fixes}\label{section:bugfixes}
 
+\subsection{Automatic recompilation and missing include files (9.5.1)}
+
+A bug in automatic recompilation involving missing include files
+has been fixed.
+The bug caused automatic recompilation to fail, often with an
+exception in \scheme{file-modification-time}, when a file specified
+by an absolute pathname or pathname starting with "./" or "../" was
+included via \scheme{include} during a previous compilation run and
+is no longer present.
+
 \subsection{Invalid memory reference instantiating \protect\scheme{foreign-callable} code object (9.5.1)}
 
 A bug that caused evaluation of a \scheme{foreign-callable} expression in
@@ -1928,6 +1965,21 @@ x86\_64 has been fixed.
 %-----------------------------------------------------------------------------
 \section{Performance Enhancements}\label{section:performance}
 
+\subsection{Better code for \protect\scheme{bytevector} (9.5.1)}
+
+The compiler now generates better inline code for the \scheme{bytevector}
+procedure.
+Instead of one byte memory write for each argument, it writes up
+to four (32-bit machines) or eight (64-bit machines) bytes at a
+time, which almost always results in fewer instructions and fewer
+writes.
+
+\subsection{\protect\scheme{vector-for-each} and \protect\scheme{string-for-each} improvement (9.5.1)}
+
+The last call to the procedure passed to \scheme{vector-for-each}
+or \scheme{string-for-each} is now reliably implemented as tail
+call, as was already the case for \scheme{for-each}.
+
 \subsection{Lambda commonization (9.5.1)}
 
 After running the main source optimization pass (cp0), the
diff --git a/s/7.ss b/s/7.ss
index c012aed2a6..ab0ed35726 100644
--- a/s/7.ss
+++ b/s/7.ss
@@ -219,16 +219,17 @@
          [(visit-stuff? x) (when (memq situation '(load visit)) (run-inner (visit-stuff-inner x)))]
          [else (run-inner x)])))
     (define run-vector
-      (lambda (x i)
-        (cond
-         [(fx= (fx+ i 1) (vector-length x))
-          (run-outer (vector-ref x i))]
-         [else
-          (run-outer (vector-ref x i))
-          (run-vector x (fx+ i 1))])))
+      (lambda (v)
+        (let ([n (vector-length v)])
+          (unless (fx= n 0)
+            (let loop ([i 0])
+              (let ([x (vector-ref v i)] [i (fx+ i 1)])
+                (if (fx= i n)
+                    (run-outer x) ; return value(s) of last form for load-compiled-from-port
+                    (begin (run-outer x) (loop i)))))))))
     (lambda (x)
       (cond
-       [(vector? x) (run-vector x 0)]
+       [(vector? x) (run-vector x)]
        [(Lexpand? x) ($interpret-backend x situation for-import? fn)]
        [else (run-outer x)])))
 
@@ -1355,7 +1356,7 @@
 
   (set! $pass-stats
     (lambda ()
-      (let-values ([(namev psv) (with-tc-mutex (hashtable-entries stats-ht))])
+      (define (build-result namev psv)
         (vector->list
           (vector-map
             (lambda (name ps) 
@@ -1365,7 +1366,23 @@
                 (pass-stats-gc-cpu ps)
                 (pass-stats-bytes ps)))
             namev
-            psv)))))
+            psv)))
+      (with-tc-mutex
+        (if outer-ps
+            (let ([cpu (current-time 'time-thread)]
+                  [gc-cpu (current-time 'time-collector-cpu)]
+                  [bytes (+ (bytes-deallocated) (bytes-allocated))])
+              (set-time-type! cpu 'time-duration)
+              (set-time-type! gc-cpu 'time-duration)
+              (pass-stats-cpu-set! outer-ps (add-duration (pass-stats-cpu outer-ps) cpu))
+              (pass-stats-gc-cpu-set! outer-ps (add-duration (pass-stats-gc-cpu outer-ps) gc-cpu))
+              (pass-stats-bytes-set! outer-ps (+ (pass-stats-bytes outer-ps) bytes))
+              (let ([result (call-with-values (lambda () (hashtable-entries stats-ht)) build-result)])
+                (pass-stats-cpu-set! outer-ps (subtract-duration (pass-stats-cpu outer-ps) cpu))
+                (pass-stats-gc-cpu-set! outer-ps (subtract-duration (pass-stats-gc-cpu outer-ps) gc-cpu))
+                (pass-stats-bytes-set! outer-ps (- (pass-stats-bytes outer-ps) bytes))
+                result))
+              (call-with-values (lambda () (hashtable-entries stats-ht)) build-result)))))
 
   (let ()
     (define who '$print-pass-stats)
diff --git a/s/cmacros.ss b/s/cmacros.ss
index d72bea8c68..d4b1e1b4a3 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -695,17 +695,18 @@
 
 ;;; note: for type-char, leave at least fixnum-offset zeros at top of
 ;;; type byte to simplify char->integer conversion
-(define-constant type-boolean       #b00000110)
-(define-constant ptr sfalse         #b00000110)
-(define-constant ptr strue          #b00001110)
-(define-constant type-char          #b00010110)
-(define-constant ptr sunbound       #b00011110)
-(define-constant ptr snil           #b00100110)
-(define-constant ptr forward-marker #b00101110)
-(define-constant ptr seof           #b00110110)
-(define-constant ptr svoid          #b00111110)
-(define-constant ptr black-hole     #b01000110)
-(define-constant ptr sbwp           #b01001110)
+(define-constant type-boolean           #b00000110)
+(define-constant ptr sfalse             #b00000110)
+(define-constant ptr strue              #b00001110)
+(define-constant type-char              #b00010110)
+(define-constant ptr sunbound           #b00011110)
+(define-constant ptr snil               #b00100110)
+(define-constant ptr forward-marker     #b00101110)
+(define-constant ptr seof               #b00110110)
+(define-constant ptr svoid              #b00111110)
+(define-constant ptr black-hole         #b01000110)
+(define-constant ptr sbwp               #b01001110)
+(define-constant ptr ftype-guardian-rep #b01010110)
 
 ;;; on 32-bit machines, vectors get two primary tag bits, including
 ;;; one for the immutable flag, and so do bytevectors, so their maximum
diff --git a/s/compile.ss b/s/compile.ss
index 10a961e66b..f71afffc1d 100644
--- a/s/compile.ss
+++ b/s/compile.ss
@@ -839,7 +839,7 @@
               [(find-library who path "wpo" (map (lambda (ext) (cons (car ext) (string-append (path-root (cdr ext)) ".wpo"))) (library-extensions))) =>
                (lambda (fn)
                  (let*-values ([(hash-bang-line ir*) (read-input-file who fn)]
-                               [(no-program node*) (process-ir*! ir* fn #f libs-visible?)])
+                               [(no-program node* ignore-rcinfo*) (process-ir*! ir* fn #f libs-visible?)])
                    (values fn node*)))]
               [(find-library who path "so" (library-extensions)) =>
                (lambda (fn) (values fn (read-binary-file path fn libs-visible?)))]
@@ -888,10 +888,10 @@
                       ($oops who "malformed binary input file ~s" fn)))))))
         (define process-ir*!
           (lambda (ir* ifn capture-program? libs-visible?)
-            (let ([libs-in-file '()] [maybe-program #f])
+            (let ([libs-in-file '()] [maybe-program #f] [rcinfo* '()])
               (define-pass process-ir! : Lexpand (ir) -> * ()
                 (Outer : Outer (ir situation) -> * ()
-                  [,rcinfo (values)]
+                  [,rcinfo (set! rcinfo* (cons rcinfo rcinfo*)) (values)]
                   [(group ,[] ,[]) (values)]
                   [(visit-only ,[inner 'visit ->]) (values)]
                   [(revisit-only ,[inner 'revisit ->]) (values)])
@@ -942,7 +942,7 @@
                   (unless (library-node-rtir node)
                     ($oops who "missing run-time code for ~s" (library-node-path node))))
                 libs-in-file)
-              (values maybe-program libs-in-file))))
+              (values maybe-program libs-in-file rcinfo*))))
         (define record-ct-lib!
           (lambda (linfo/ct binary? situation ifn libs-visible?)
             (when (eq? situation 'revisit) ($oops who "encountered revisit-only compile-time library ~s while processing file ~s" (library-info-path linfo/ct) ifn))
@@ -1015,14 +1015,14 @@
                   (library-node-invoke-req* node)))
             (unless (node-depend* node)
               (node-depend*-set! node (find-dependencies (library-node-invoke-req* node))))))
-        (let-values ([(maybe-program node*) (process-ir*! ir* ifn capture-program? libs-visible?)])
+        (let-values ([(maybe-program node* rcinfo*) (process-ir*! ir* ifn capture-program? libs-visible?)])
           (when capture-program?
             (unless maybe-program ($oops who "missing entry program in file ~a" ifn))
             (unless (program-node-ir maybe-program) ($oops who "loading ~a did not define expected program pieces" ifn))
             (chase-program-dependencies! maybe-program))
           (for-each chase-library-dependencies! node*)
           (let-values ([(visible* invisible*) (partition library-node-visible? (vector->list (hashtable-values libs)))])
-            (values maybe-program visible* invisible* wpo*))))))
+            (values maybe-program visible* invisible* rcinfo* wpo*))))))
 
   (define topological-sort
     (lambda (program-entry library-entry*)
@@ -1289,6 +1289,14 @@
         (make-patch-env node*)))))
 
   (with-output-language (Lexpand Outer)
+    (define add-recompile-info
+      (lambda (rcinfo* body)
+        (fold-left
+          (lambda (body rcinfo)
+            `(group ,rcinfo ,body))
+          body
+          rcinfo*)))
+
     (define add-library-records
       (lambda (node* visit-lib* body)
         (fold-left
@@ -1333,18 +1341,20 @@
             body visit-lib*)))
 
     (define build-program-body
-      (lambda (program-entry node* visit-lib* invisible*)
-        (add-library-records node* visit-lib*
-          (add-library-records node* invisible*
-            (add-visit-lib-install* visit-lib*
-              (add-visit-lib-install* invisible*
-                `(revisit-only ,(build-combined-program-ir program-entry node*))))))))
+      (lambda (program-entry node* visit-lib* invisible* rcinfo*)
+        (add-recompile-info rcinfo*
+          (add-library-records node* visit-lib*
+            (add-library-records node* invisible*
+              (add-visit-lib-install* visit-lib*
+                (add-visit-lib-install* invisible*
+                  `(revisit-only ,(build-combined-program-ir program-entry node*)))))))))
 
     (define build-library-body
-      (lambda (node* visit-lib*)
-        (add-library-records node* visit-lib*
-          (add-visit-lib-install* visit-lib*
-            `(revisit-only ,(build-combined-library-ir node*)))))))
+      (lambda (node* visit-lib* rcinfo*)
+        (add-recompile-info rcinfo*
+          (add-library-records node* visit-lib*
+            (add-visit-lib-install* visit-lib*
+              `(revisit-only ,(build-combined-library-ir node*))))))))
 
   (define finish-compile
     (lambda (who msg ifn ofn hash-bang-line x1)
@@ -1407,12 +1417,12 @@
          (unless (string? ifn) ($oops who "~s is not a string" ifn))
          (unless (string? ofn) ($oops who "~s is not a string" ofn))
          (let*-values ([(hash-bang-line ir*) (read-input-file who ifn)]
-                       [(program-entry lib* invisible* no-wpo*) (build-graph who ir* ifn #t #f libs-visible?)])
+                       [(program-entry lib* invisible* rcinfo* no-wpo*) (build-graph who ir* ifn #t #f libs-visible?)])
            (safe-assert program-entry)
            (safe-assert (null? no-wpo*))
            (let ([node* (topological-sort program-entry lib*)])
              (finish-compile who "whole program" ifn ofn hash-bang-line
-               (build-program-body program-entry node* lib* invisible*))
+               (build-program-body program-entry node* lib* invisible* rcinfo*))
              (build-required-library-list node* lib*)))])))
 
   (set-who! compile-whole-library
@@ -1420,7 +1430,7 @@
       (unless (string? ifn) ($oops who "~s is not a string" ifn))
       (unless (string? ofn) ($oops who "~s is not a string" ofn))
       (let*-values ([(hash-bang-line ir*) (read-input-file who ifn)]
-                    [(no-program lib* invisible* wpo*) (build-graph who ir* ifn #f (generate-wpo-files) #t)])
+                    [(no-program lib* invisible* rcinfo* wpo*) (build-graph who ir* ifn #f (generate-wpo-files) #t)])
         (safe-assert (not no-program))
         (safe-assert (null? invisible*))
         (safe-assert (or (not (generate-wpo-files)) (not (null? wpo*))))
@@ -1428,7 +1438,7 @@
         (let ([node* (topological-sort #f lib*)])
           (write-wpo-file who ofn wpo*)
           (finish-compile who "whole library" ifn ofn hash-bang-line
-            (build-library-body node* lib*))
+            (build-library-body node* lib* rcinfo*))
           (build-required-library-list node* lib*))))))
 
 (set! $c-make-code
diff --git a/s/cp0.ss b/s/cp0.ss
index 206d8d5382..c680292523 100644
--- a/s/cp0.ss
+++ b/s/cp0.ss
@@ -3935,26 +3935,29 @@
                     (let ([p (cp0-make-temp #t)]
                           [n (cp0-make-temp #t)]
                           [i (cp0-make-temp #t)]
+                          [j (cp0-make-temp #t)]
                           [do (cp0-make-temp #t)]
                           [v (cp0-make-temp #t)]
                           [v* (map (lambda (x) (cp0-make-temp #f)) ?v*)])
                       (build-lambda (cons* p v v*)
-                        (build-let (list n)
-                          (list (build-primcall 3 'vector-length
-                                  (list (build-ref v))))
-                          (build-named-let do (list i) (list `(quote 0))
-                            `(if ,(build-primcall 3 'fx=
-                                    (list (build-ref i) (build-ref n)))
-                                 ,void-rec
-                                 ,(make-seq 'value
-                                    `(call ,(app-preinfo ctxt) (ref #f ,p)
-                                       ,(map (lambda (x)
-                                               (build-primcall 3 'vector-ref
-                                                 (list (build-ref x) (build-ref i))))
-                                          (cons v v*)) ...)
-                                    `(call ,(make-preinfo) (ref #f ,do)
-                                       ,(build-primcall 3 'fx1+
-                                          (list (build-ref i))))))))))
+                        (build-let (list n) (list (build-primcall 3 'vector-length (list (build-ref v))))
+                          `(if ,(build-primcall 3 'fx= (list (build-ref n) `(quote 0)))
+                               ,void-rec
+                               ,(build-named-let do (list i) (list `(quote 0))
+                                  (build-let (list j) (list (build-primcall 3 'fx1+ (list (build-ref i))))
+                                    `(if ,(build-primcall 3 'fx= (list (build-ref j) (build-ref n)))
+                                         (call ,(app-preinfo ctxt) (ref #f ,p)
+                                           ,(map (lambda (x)
+                                                   (build-primcall 3 'vector-ref
+                                                     (list (build-ref x) (build-ref i))))
+                                              (cons v v*)) ...)
+                                         ,(make-seq 'value
+                                            `(call ,(app-preinfo ctxt) (ref #f ,p)
+                                               ,(map (lambda (x)
+                                                       (build-primcall 3 'vector-ref
+                                                         (list (build-ref x) (build-ref i))))
+                                                  (cons v v*)) ...)
+                                            `(call ,(make-preinfo) (ref #f ,do) (ref #f ,j))))))))))
                     ctxt empty-env sc wd name moi))])])
 
       (define-inline 3 string-for-each ; should combine with vector-for-each
@@ -4007,26 +4010,29 @@
                     (let ([p (cp0-make-temp #t)]
                           [n (cp0-make-temp #t)]
                           [i (cp0-make-temp #t)]
+                          [j (cp0-make-temp #t)]
                           [do (cp0-make-temp #t)]
                           [s (cp0-make-temp #t)]
                           [s* (map (lambda (x) (cp0-make-temp #f)) ?s*)])
                       (build-lambda (cons* p s s*)
-                        (build-let (list n)
-                          (list (build-primcall 3 'string-length
-                                  (list (build-ref s))))
-                          (build-named-let do (list i) (list `(quote 0))
-                            `(if ,(build-primcall 3 'fx=
-                                    (list (build-ref i) (build-ref n)))
-                                 ,void-rec
-                                 ,(make-seq 'value
-                                    `(call ,(app-preinfo ctxt) (ref #f ,p)
-                                       ,(map (lambda (x)
-                                               (build-primcall 3 'string-ref
-                                                 (list (build-ref x) (build-ref i))))
-                                          (cons s s*)) ...)
-                                    `(call ,(make-preinfo) (ref #f ,do)
-                                       ,(build-primcall 3 'fx1+
-                                          (list (build-ref i))))))))))
+                        (build-let (list n) (list (build-primcall 3 'string-length (list (build-ref s))))
+                          `(if ,(build-primcall 3 'fx= (list (build-ref n) `(quote 0)))
+                               ,void-rec
+                               ,(build-named-let do (list i) (list `(quote 0))
+                                  (build-let (list j) (list (build-primcall 3 'fx1+ (list (build-ref i))))
+                                    `(if ,(build-primcall 3 'fx= (list (build-ref j) (build-ref n)))
+                                         (call ,(app-preinfo ctxt) (ref #f ,p)
+                                           ,(map (lambda (x)
+                                                   (build-primcall 3 'string-ref
+                                                     (list (build-ref x) (build-ref i))))
+                                              (cons s s*)) ...)
+                                         ,(make-seq 'value
+                                            `(call ,(app-preinfo ctxt) (ref #f ,p)
+                                               ,(map (lambda (x)
+                                                       (build-primcall 3 'string-ref
+                                                         (list (build-ref x) (build-ref i))))
+                                                  (cons s s*)) ...)
+                                            `(call ,(make-preinfo) (ref #f ,do) (ref #f ,j))))))))))
                     ctxt empty-env sc wd name moi))])])
 
       (define-inline 3 fold-right
@@ -4382,18 +4388,20 @@
               [(?x) (mtp ctxt empty-env sc wd name moi #f 3)]
               [(?x ?p) (mtp ctxt empty-env sc wd name moi ?p 3)]))))
 
-      (define-inline 2 make-guardian
-        [() (and likely-to-be-compiled?
+      (let ()
+        (define inline-make-guardian
+          (lambda (ctxt empty-env sc wd name moi formal* make-setter-clauses)
+            (and likely-to-be-compiled?
                  (cp0
                    (let* ([tc (cp0-make-temp #t)] [ref-tc (build-ref tc)])
-                     (build-lambda '()
+                     (build-lambda formal*
                        (build-let (list tc)
                          (list (let* ([x (cp0-make-temp #t)] [ref-x (build-ref x)])
                                  (let ([zero `(quote 0)])
                                    (build-let (list x) (list (build-primcall 3 'cons (list zero zero)))
                                      (build-primcall 3 'cons (list ref-x ref-x))))))
                          (build-case-lambda (preinfo-call->preinfo-lambda (app-preinfo ctxt))
-                           (list
+                           (cons
                              (list '()
                                (let* ([x (cp0-make-temp #t)] [ref-x (build-ref x)])
                                  (let ([y (cp0-make-temp #f)])
@@ -4407,19 +4415,46 @@
                                                 (seq
                                                   (seq
                                                     ,(build-primcall 3 'set-car! (list ref-tc
-                                                                                       (build-primcall 3 'cdr (list ref-x))))
+                                                                                   (build-primcall 3 'cdr (list ref-x))))
                                                     ,(build-primcall 3 'set-car! (list ref-x false-rec)))
                                                   ,(build-primcall 3 'set-cdr! (list ref-x false-rec)))
                                                 (ref #f ,y))))))))
-                             (let* ([obj (cp0-make-temp #t)] [ref-obj (build-ref obj)])
-                               (list (list obj)
-                                 (build-primcall 3 '$install-guardian
-                                   (list ref-obj ref-obj ref-tc))))
-                             (let ([obj (cp0-make-temp #f)] [rep (cp0-make-temp #f)])
-                               (list (list obj rep)
-                                 (build-primcall 3 '$install-guardian
-                                   (list (build-ref obj) (build-ref rep) ref-tc)))))))))
-                   ctxt empty-env sc wd name moi))]))
+                             (make-setter-clauses ref-tc))))))
+                   ctxt empty-env sc wd name moi))))
+
+        (define-inline 2 make-guardian
+          [() (inline-make-guardian ctxt empty-env sc wd name moi
+                '()
+                (lambda (ref-tc)
+                  (list 
+                    (let* ([obj (cp0-make-temp #t)] [ref-obj (build-ref obj)])
+                      (list (list obj)
+                        (build-primcall 3 '$install-guardian
+                          (list ref-obj ref-obj ref-tc))))
+                    (let ([obj (cp0-make-temp #f)] [rep (cp0-make-temp #f)])
+                      (list (list obj rep)
+                        (build-primcall 3 '$install-guardian
+                          (list (build-ref obj) (build-ref rep) ref-tc)))))))])
+      
+        (define-inline 2 $make-ftype-guardian
+          [(?ftd)
+           (let ([ftd (cp0-make-temp #f)])
+             (inline-make-guardian ctxt empty-env sc wd name moi
+               (list ftd)
+               (lambda (ref-tc)
+                 (list
+                   (let* ([obj (cp0-make-temp #t)] [ref-obj (build-ref obj)])
+                     (list (list obj)
+                       (let ([e (build-primcall 3 '$install-ftype-guardian
+                                  (list ref-obj ref-tc))])
+                         (if (fx= level 3)
+                             e
+                             (let ([ref-ftd (build-ref ftd)])
+                               `(seq
+                                  (if ,(build-primcall 3 'record? (list ref-obj ref-ftd))
+                                      ,void-rec
+                                      ,(build-primcall 3 '$ftype-guardian-oops (list ref-ftd ref-obj)))
+                                  ,e))))))))))])))
     ) ; with-output-language
 
   (define-pass cp0 : Lsrc (ir ctxt env sc wd name moi) -> Lsrc ()
diff --git a/s/cpnanopass.ss b/s/cpnanopass.ss
index ef62973de9..b05cff4993 100644
--- a/s/cpnanopass.ss
+++ b/s/cpnanopass.ss
@@ -5385,6 +5385,17 @@
                  (set! ,(%mref ,t ,(constant guardian-entry-next-disp)) ,(%tc-ref guardian-entries))
                  (set! ,(%tc-ref guardian-entries) ,t))))])
 
+        (define-inline 3 $install-ftype-guardian
+          [(e-obj e-tconc)
+           (bind #f (e-obj e-tconc)
+             (bind #t ([t (%constant-alloc typemod (constant size-guardian-entry))])
+               (%seq
+                 (set! ,(%mref ,t ,(constant guardian-entry-obj-disp)) ,e-obj)
+                 (set! ,(%mref ,t ,(constant guardian-entry-rep-disp)) (immediate ,(constant ftype-guardian-rep)))
+                 (set! ,(%mref ,t ,(constant guardian-entry-tconc-disp)) ,e-tconc)
+                 (set! ,(%mref ,t ,(constant guardian-entry-next-disp)) ,(%tc-ref guardian-entries))
+                 (set! ,(%tc-ref guardian-entries) ,t))))])
+
         (define-inline 2 virtual-register-count
           [() `(quote ,(constant virtual-register-count))])
         (let ()
@@ -8059,6 +8070,50 @@
         (let ()
           (define build-bytevector
             (lambda (e*)
+              (define (find-k n)
+                (let loop ([bytes (constant-case ptr-bits [(32) 4] [(64) 8])]
+                           [type* (constant-case ptr-bits
+                                    [(32) '(unsigned-32 unsigned-16 unsigned-8)]
+                                    [(64) '(unsigned-64 unsigned-32 unsigned-16 unsigned-8)])])
+                  (let ([bytes/2 (fxsrl bytes 1)])
+                    (if (fx<= n bytes/2)
+                        (loop bytes/2 (cdr type*))
+                        (values bytes (car type*))))))
+              (define (build-chunk k n e*)
+                (define (build-shift e shift)
+                  (if (fx= shift 0) e (%inline sll ,e (immediate ,shift))))
+                (let loop ([k (constant-case native-endianness
+                                [(little) (fxmin k n)]
+                                [(big) k])]
+                           [e* (constant-case native-endianness
+                                 [(little) (reverse (if (fx<= n k) e* (list-head e* k)))]
+                                 [(big) e*])]
+                           [constant-part 0]
+                           [expression-part #f]
+                           [expression-shift 0]
+                           [mask? #f]) ; no need to mask the high-order byte
+                  (if (fx= k 0)
+                      (if expression-part
+                          (let ([expression-part (build-shift expression-part expression-shift)])
+                            (if (= constant-part 0)
+                                expression-part
+                                (%inline logor ,expression-part (immediate ,constant-part))))
+                          `(immediate ,constant-part))
+                      (let ([k (fx- k 1)]
+                            [constant-part (ash constant-part 8)]
+                            [expression-shift (fx+ expression-shift 8)])
+                        (if (null? e*)
+                            (loop k e* constant-part expression-part expression-shift #t)
+                            (let ([e (car e*)] [e* (cdr e*)])
+                              (if (fixnum-constant? e)
+                                  (loop k e* (logor constant-part (logand (constant-value e) #xff)) expression-part expression-shift #t)
+                                  (loop k e* constant-part
+                                    (let* ([e (build-unfix e)]
+                                           [e (if mask? (%inline logand ,e (immediate #xff)) e)])
+                                      (if expression-part
+                                          (%inline logor ,(build-shift expression-part expression-shift) ,e)
+                                          e))
+                                    0 #t))))))))
               (let ([len (length e*)])
                 (if (fx= len 0)
                     `(quote ,(bytevector))
@@ -8068,16 +8123,19 @@
                         `(seq
                            (set! ,(%mref ,t ,(constant bytevector-type-disp))
                              (immediate ,(+ (* len (constant bytevector-length-factor))
-                                               (constant type-bytevector))))
-                           ,(let f ([e* e*] [offset (constant bytevector-data-disp)])
-                              (let ([e (car e*)] [e* (cdr e*)])
+                                            (constant type-bytevector))))
+                           ;  build and store k-octet (k = 4 on 32-bit machines, k = 8 on 64-bit
+                           ;  machines) chunks, taking endianness into account.  for the last
+                           ;  chunk, set k = 1, 2, 4, or 8 depending on the number of octets
+                           ;  remaining, padding with zeros as necessary.
+                           ,(let f ([e* e*] [n (length e*)] [offset (constant bytevector-data-disp)])
+                              (let-values ([(k type) (find-k n)])
                                 `(seq
-                                   (inline ,(make-info-load 'unsigned-8 #f) ,%store
-                                     ,t ,%zero (immediate ,offset)
-                                     ,(if (fixnum-constant? e)
-                                          `(immediate ,(constant-value e))
-                                          (build-unfix e)))
-                                   ,(if (null? e*) t (f e* (fx+ offset 1)))))))))))))
+                                   (inline ,(make-info-load type #f) ,%store ,t ,%zero (immediate ,offset)
+                                     ,(build-chunk k n e*))
+                                   ,(if (fx<= n k)
+                                        t
+                                        (f (list-tail e* k) (fx- n k) (fx+ offset k)))))))))))))
 
           (define-inline 2 bytevector
             [e* (and (andmap
diff --git a/s/ftype.ss b/s/ftype.ss
index 0304320b1b..3f4e3d0aa1 100644
--- a/s/ftype.ss
+++ b/s/ftype.ss
@@ -1307,7 +1307,33 @@ ftype operators:
            (trans #'ftype #'(a ...) #'fptr-expr 0)]
           [(_ ftype (a ...) fptr-expr ?idx)
            (identifier? #'ftype)
-           (trans #'ftype #'(a ...) #'fptr-expr #'?idx)]))))
+           (trans #'ftype #'(a ...) #'fptr-expr #'?idx)])))
+    (set! $trans-ftype-guardian
+      (lambda (q)
+        (lambda (r)
+          (syntax-case q ()
+            [(_ ftype)
+             (identifier? #'ftype)
+             (let ([ftd (expand-ftype-name r #'ftype)])
+               (unless (let lockable? ([ftd ftd])
+                         (cond
+                           [(ftd-base? ftd)
+                            (let ([type (filter-foreign-type (ftd-base-type ftd))])
+                              (and (memq type
+                                     (constant-case ptr-bits
+                                       [(64) '(unsigned-64 integer-64)]
+                                       [(32) '(unsigned-32 integer-32)]))
+                                   (not (ftd-base-swap? ftd))))]
+                           [(ftd-struct? ftd)
+                            (let ([ls (ftd-struct-field* ftd)])
+                              (if (null? ls)
+                                  #f
+                                  (lockable? (caddr (car ls)))))]
+                           [(ftd-union? ftd) (ormap lockable? (map cdr (ftd-union-field* ftd)))]
+                           [(ftd-array? ftd) (lockable? (ftd-array-ftd ftd))]
+                           [else #f]))
+                 (syntax-error q "first field must be a word-sized integer with native endianness"))
+               #`(($primitive #,(if (fx= (optimize-level) 3) 3 2) $make-ftype-guardian) '#,ftd))])))))
  ; procedural entry point for inspector to simplify bootstrapping
   (set! $ftype-pointer? (lambda (x) ($fptr? x)))
   (set! $make-fptr
@@ -2015,6 +2041,7 @@ ftype operators:
 (define-syntax make-ftype-pointer (lambda (x) ($trans-make-ftype-pointer x)))
 (define-syntax ftype-pointer? (lambda (x) ($trans-ftype-pointer? x)))
 (define-syntax ftype-sizeof (lambda (x) ($trans-ftype-sizeof x)))
+(define-syntax ftype-guardian (lambda (x) ($trans-ftype-guardian x)))
 (define-syntax ftype-&ref (lambda (x) ($trans-ftype-&ref x)))
 (define-syntax ftype-ref (lambda (x) ($trans-ftype-ref x)))
 (define-syntax ftype-locked-incr! (lambda (x) ($trans-ftype-locked-op! #'ftype-locked-incr! x #'$fptr-locked-incr!)))
diff --git a/s/interpret.ss b/s/interpret.ss
index 97612fd321..c9e973e34d 100644
--- a/s/interpret.ss
+++ b/s/interpret.ss
@@ -649,18 +649,21 @@
   (definitions
     (define (ibeval x1)
       ($rt (parameterize ([$target-machine (machine-type)] [$sfd #f])
-             (let* ([x2 ($cpvalid x1)]
+             (let* ([x2 ($pass-time 'cpvalid (lambda () ($cpvalid x1)))]
                     [x2a (let ([cpletrec-ran? #f])
                            (let ([x ((run-cp0)
                                      (lambda (x)
                                        (set! cpletrec-ran? #t)
-                                       ($cpletrec ($cp0 x #f)))
+                                       (let ([x ($pass-time 'cp0 (lambda () ($cp0 x #f)))])
+                                         ($pass-time 'cpletrec
+                                           (lambda () ($cpletrec x)))))
                                      x2)])
-                             (if cpletrec-ran? x ($cpletrec x))))]
-                    [x2b ($cpcheck x2a)]
-                    [x2b ($cpcommonize x2b)])
+                             (if cpletrec-ran? x ($pass-time 'cpletrec (lambda () ($cpletrec x))))))]
+                    [x2b ($pass-time 'cpcheck (lambda () ($cpcheck x2a)))]
+                    [x2b ($pass-time 'cpcommonize (lambda () ($cpcommonize x2b)))])
                (when eoo (pretty-print ($uncprep x2b) eoo))
-               (ip2 (ip1 x2b))))
+               (let ([x ($pass-time 'ip1 (lambda () (ip1 x2b)))])
+                 ($pass-time 'ip2 (lambda () (ip2 x))))))
         ([a0 0] [a1 0] [fp 0] [cp 0]))))
   (Inner : Inner (ir) -> * (val)
     [,lsrc (ibeval lsrc)]
@@ -694,8 +697,10 @@
              (interaction-environment)))]
       [(x0 env-spec)
        (unless (environment? env-spec) ($oops 'interpret "~s is not an environment" env-spec))
-       (let ([x1 (parameterize ([$target-machine (machine-type)] [$sfd #f])
-                   (expand x0 env-spec #t))])
+       (let ([x1 ($pass-time 'expand
+                   (lambda ()
+                     (parameterize ([$target-machine (machine-type)] [$sfd #f])
+                       (expand x0 env-spec #t))))])
          ($uncprep x1 #t) ; populate preinfo sexpr fields
          (when (and (expand-output) (not ($noexpand? x0)))
            (pretty-print ($uncprep x1) (expand-output)))
diff --git a/s/patch.ss b/s/patch.ss
index 5193d9ce7a..5bf1f9a39b 100644
--- a/s/patch.ss
+++ b/s/patch.ss
@@ -13,11 +13,6 @@
 ;;; See the License for the specific language governing permissions and
 ;;; limitations under the License.
 
-(define generate-procedure-source-information
-  (case-lambda
-   [() #f]
-   [(v) (void)]))
-
 (printf "loading ~s cross compiler~%" (constant machine-type-name))
 
 ; (current-expand (lambda args (apply sc-expand args)))
diff --git a/s/primdata.ss b/s/primdata.ss
index a01b641c9e..c10676f5f3 100644
--- a/s/primdata.ss
+++ b/s/primdata.ss
@@ -1050,6 +1050,7 @@
   (fluid-let-syntax [flags])
   (foreign-callable [flags])
   (foreign-procedure [flags])
+  (ftype-guardian [flags])
   (ftype-init-lock! [flags])
   (ftype-lock! [flags])
   (ftype-locked-decr! [flags])
@@ -1207,6 +1208,8 @@
   (compile-port [sig [(textual-input-port binary-output-port) (textual-input-port binary-output-port maybe-sfd) (textual-input-port binary-output-port maybe-sfd maybe-binary-output-port) (textual-input-port binary-output-port maybe-sfd maybe-binary-output-port sub-symbol) (textual-input-port binary-output-port maybe-sfd maybe-binary-output-port sub-symbol maybe-binary-output-port) -> (void)]] [flags true])
   (compile-program [sig [(pathname) (pathname pathname) (pathname pathname sub-symbol) -> (list)]] [flags true])
   (compile-script [sig [(pathname) (pathname pathname) (pathname pathname sub-symbol) -> (void)]] [flags true])
+  (compile-time-value? [sig [(ptr) -> (boolean)]] [flags pure unrestricted mifoldable discard])
+  (compile-time-value-value [sig [(compile-time-value) -> (ptr)]] [flags pure mifoldable discard])
   (compile-to-file [sig [(list pathname) (list pathname maybe-sfd) -> (ptr)]] [flags true])
   (compile-to-port [sig [(list binary-output-port) (list binary-output-port maybe-sfd) (list binary-output-port maybe-sfd maybe-binary-output-port) (list binary-output-port maybe-sfd maybe-binary-output-port sub-symbol)  (list binary-output-port maybe-sfd maybe-binary-output-port sub-symbol maybe-binary-output-port) (list binary-output-port maybe-sfd maybe-binary-output-port sub-symbol maybe-binary-output-port maybe-pathname) -> (ptr)]] [flags true])
   (compile-whole-program [sig [(string string) (string string ptr) -> (void)]] [flags])
@@ -1423,7 +1426,7 @@
   (make-annotation [sig [(ptr source-object ptr) (ptr source-object ptr annotation-options) -> (annotation)]] [flags pure true mifoldable discard])
   (make-boot-file [sig [(pathname sub-list pathname ...) -> (void)]] [flags true])
   (make-boot-header [sig [(pathname pathname pathname ...) -> (void)]] [flags true])
-  (make-compile-time-value [sig [(ptr) (ptr ptr) -> (ptr)]] [flags pure unrestricted alloc])
+  (make-compile-time-value [sig [(ptr) -> (compile-time-value)]] [flags pure unrestricted alloc])
   (make-condition [feature pthreads] [sig [() -> (condition-object)]] [flags pure unrestricted alloc])
   (make-continuation-condition [sig [(ptr) -> (condition)]] [flags pure unrestricted mifoldable discard])
   (make-cost-center [sig [() -> (cost-center)]] [flags unrestricted alloc])
@@ -1990,6 +1993,7 @@
   ($ftd-compound? [flags])
   ($ftd-size [flags])
   ($ftd->members [flags])
+  ($ftype-guardian-oops [flags])
   ($ftype-pointer? [flags])
   ($fxaddress [flags unrestricted alloc])
   ($fx-? [flags])
@@ -2016,6 +2020,7 @@
   ($inexactnum? [flags])
   ($inexactnum-imag-part [flags])
   ($inexactnum-real-part [flags])
+  ($install-ftype-guardian [flags])
   ($install-guardian [flags])
   ($install-library-clo-info [flags])
   ($install-library/ct-code [flags])
@@ -2079,6 +2084,7 @@
   ($make-foreign-callable [flags])
   ($make-foreign-procedure [flags])
   ($make-fptr [flags pure mifoldable discard true])
+  ($make-ftype-guardian [flags alloc cp02])
   ($make-graph-env [flags])
   ($make-library-requirements-options [flags pure discard true])
   ($make-load-binary [flags])
@@ -2231,6 +2237,7 @@
   ($track-static-closure-counts [flags alloc]) ; added for closure instrumentation
   ($trans-define-ftype [flags])
   ($transformer->binding [flags])
+  ($trans-ftype-guardian [flags])
   ($trans-ftype-locked-op! [flags])
   ($trans-ftype-pointer? [flags])
   ($trans-ftype-&ref [flags])
diff --git a/s/prims.ss b/s/prims.ss
index a56fde1174..4adac96a68 100644
--- a/s/prims.ss
+++ b/s/prims.ss
@@ -1409,11 +1409,22 @@
 
 (define-who $install-guardian
   (lambda (obj rep tconc)
-    (unless (and (pair? tconc) (pair? (car tconc)) (pair? (cdr tconc))) ($oops who "~s is not a tconc" tconc))
+    ; tconc is assumed to be valid at all call sites
     (#3%$install-guardian obj rep tconc)))
 
+(define-who $install-ftype-guardian
+  (lambda (obj tconc)
+    ; tconc is assumed to be valid at all call sites
+    (#3%$install-ftype-guardian obj tconc)))
+
+(define-who $ftype-guardian-oops
+  (lambda (ftd obj)
+    ($oops 'ftype-guardian "~s is not an ftype pointer of the expected type ~s" obj ftd)))
+
 (define make-guardian (lambda () (#2%make-guardian)))
 
+(define $make-ftype-guardian (lambda (ftd) (#2%$make-ftype-guardian ftd)))
+
 (define $address-in-heap?
   (foreign-procedure "(cs)s_addr_in_heap" (uptr) boolean))
 
diff --git a/s/read.ss b/s/read.ss
index 08569f8945..ed7a53b61c 100644
--- a/s/read.ss
+++ b/s/read.ss
@@ -21,18 +21,25 @@
 (let ()
 (include "types.ss")
 
+(define-record-type rcb
+  (nongenerative)
+  (sealed #t)
+  (fields
+    ip      ; input port
+    sfd     ; a source-file descriptor or #f
+    a?      ; if true, wrap s-expressions with source annotations
+    who     ; who's calling (read, read-token)
+    ))
+
 ;;; xdefine, xcall, xmvlet, and xvalues manage implicit arguments and
 ;;; return values for most of the procedures defined in this file.  This
 ;;; simplifies the code and makes it much easier to add new arguments
 ;;; universally.  The implicit variables are:
-;;;   [i ] ip       input port
+;;;   [i ] rcb      reader control block
 ;;;   [io] fp       current file position or #f
 ;;;   [i ] bfp      beginning file position or #f
 ;;;   [io] tb       token buffer
 ;;;   [io] it       insert table (for marks and references)
-;;;   [i ] sfd      a source file descriptor or #f
-;;;   [i ] a?       if true, wrap s-expressions with source annotations
-;;;   [i ] who      who's calling (read, read-token)
 ;;; i: input (xcall argument)
 ;;; o: output (xvalues return value)
 
@@ -40,22 +47,22 @@
   (lambda (x)
     (syntax-case x ()
       ((key args b1 b2 ...)
-       (with-implicit (key ip fp bfp tb it sfd a? who)
-         #'(lambda (ip fp bfp tb it sfd a? who . args) b1 b2 ...))))))
+       (with-implicit (key rcb fp bfp tb it)
+         #'(lambda (rcb fp bfp tb it . args) b1 b2 ...))))))
 
 (define-syntax xdefine
   (lambda (x)
     (syntax-case x ()
       ((key (name . args) b1 b2 ...)
-       (with-implicit (key ip fp bfp tb it sfd a? who)
-         #'(define (name ip fp bfp tb it sfd a? who . args) b1 b2 ...))))))
+       (with-implicit (key rcb fp bfp tb it)
+         #'(define (name rcb fp bfp tb it . args) b1 b2 ...))))))
 
 (define-syntax xcall
   (lambda (x)
     (syntax-case x ()
       ((key p arg ...)
-       (with-implicit (key ip fp bfp tb it sfd a? who)
-         #'(p ip fp bfp tb it sfd a? who arg ...))))))
+       (with-implicit (key rcb fp bfp tb it)
+         #'(p rcb fp bfp tb it arg ...))))))
 
 (define-syntax xmvlet
   (lambda (x)
@@ -150,24 +157,26 @@
     (syntax-case x ()
       ((key id b1 b2 ...)
        (identifier? #'id)
-       (with-implicit (key ip fp)
-         #'(let ((id (read-char ip)) (fp (and fp (+ fp 1)))) b1 b2 ...))))))
+       (with-implicit (key rcb fp)
+         #'(let ([id (read-char (rcb-ip rcb))])
+             (let ((fp (and fp (+ fp 1))))
+               b1 b2 ...)))))))
 
 (define-syntax with-peek-char
   (lambda (x)
     (syntax-case x ()
       ((key id b1 b2 ...)
        (identifier? #'id)
-       (with-implicit (key ip)
-         #'(let ((id (peek-char ip))) b1 b2 ...))))))
+       (with-implicit (key rcb)
+         #'(let ((id (peek-char (rcb-ip rcb)))) b1 b2 ...))))))
 
 (define-syntax with-unread-char
   (lambda (x)
     (syntax-case x ()
       [(key ?c b1 b2 ...)
-       (with-implicit (key ip fp)
+       (with-implicit (key rcb fp)
          #'(let ([c ?c])
-             (unless (eof-object? c) (unread-char c ip))
+             (unless (eof-object? c) (unread-char c (rcb-ip rcb)))
              (let ([fp (and fp (- fp 1))]) b1 b2 ...)))])))
 
 (define-record-type delayed-record
@@ -267,11 +276,12 @@
                (make-source sfd bfp efp)))])))
 
 (xdefine (rd-error ir? start? msg . args)
-  (cond
-    [(eq? ip (console-input-port)) ($lexical-error who msg args ip ir?)]
-    [(not fp) ($lexical-error who "~? on ~s" (list msg args ip) ip ir?)]
-    [sfd ($lexical-error who msg args ip ($make-source-object sfd bfp fp) start? ir?)]
-    [else ($lexical-error who "~? at char ~a of ~s" (list msg args (if start? bfp fp) ip) ip ir?)]))
+  (let ([ip (rcb-ip rcb)])
+    (cond
+      [(eq? ip (console-input-port)) ($lexical-error (rcb-who rcb) msg args ip ir?)]
+      [(not fp) ($lexical-error (rcb-who rcb) "~? on ~s" (list msg args ip) ip ir?)]
+      [(rcb-sfd rcb) ($lexical-error (rcb-who rcb) msg args ip ($make-source-object (rcb-sfd rcb) bfp fp) start? ir?)]
+      [else ($lexical-error (rcb-who rcb) "~? at char ~a of ~s" (list msg args (if start? bfp fp) ip) ip ir?)])))
 
 (xdefine (rd-eof-error s)
   (xcall rd-error #f #t "unexpected end-of-file reading ~a" s))
@@ -286,8 +296,8 @@
   (lambda (x)
     (syntax-case x ()
       [(k str)
-       (with-implicit (k ip xcall)
-         #'(when ($port-flags-set? ip (constant port-flag-r6rs))
+       (with-implicit (k rcb xcall)
+         #'(when ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs))
              (xcall rd-nonstandard-error str)))])))
 
 (xdefine (rd-nonstandard-delimiter-error c)
@@ -297,8 +307,8 @@
   (lambda (x)
     (syntax-case x ()
       [(k c)
-       (with-implicit (k ip xcall)
-         #'(when ($port-flags-set? ip (constant port-flag-r6rs))
+       (with-implicit (k rcb xcall)
+         #'(when ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs))
              (xcall rd-nonstandard-delimiter-error c)))])))
 
 (define-state (rd-token)
@@ -440,7 +450,7 @@
       [#\[ (nonstandard "#[...] record") (state-return record-brack #f)]
       [#\{ (nonstandard "#{...} gensym") (*state rd-token-gensym)]
       [#\& (nonstandard "#& box") (state-return box #f)]
-      [#\; (if (eq? who 'read-token)
+      [#\; (if (eq? (rcb-who rcb) 'read-token)
                (state-return quote 'datum-comment)
                (xmvlet (() (xcall rd-expression-comment)) (*state rd-token)))]
       [#\! (*state rd-token-hash-bang)]
@@ -453,12 +463,12 @@
            (with-read-char c
              (*state rd-token-symbol c 0 #f
                (state-lambda (n slashed?)
-                 (state-return atomic (list '$primitive (maybe-fold/intern ip tb n slashed?))))))]
+                 (state-return atomic (list '$primitive (maybe-fold/intern (rcb-ip rcb) tb n slashed?))))))]
       [#\: (nonstandard "#: gensym")
            (with-read-char c
              (*state rd-token-symbol c 0 #f
                (state-lambda (n slashed?)
-                 (state-return atomic (maybe-fold/gensym ip tb n slashed?)))))]
+                 (state-return atomic (maybe-fold/gensym (rcb-ip rcb) tb n slashed?)))))]
       [#\| (*state rd-token-block-comment 0)]
       [else (xcall rd-error #f #t "invalid sharp-sign prefix #~c" c)])))
 
@@ -489,7 +499,7 @@
                       (with-read-char c
                         (state-case c
                           [eof (xcall rd-eof-error "gensym")]
-                          [(#\}) (state-return atomic (maybe-fold/intern ip tb n m slashed1? slashed2?))]
+                          [(#\}) (state-return atomic (maybe-fold/intern (rcb-ip rcb) tb n m slashed1? slashed2?))]
                           [else (with-unread-char c
                                   (xcall rd-error #f #f
                                     "expected close brace terminating gensym syntax"))]))))])))))])))
@@ -539,7 +549,7 @@
        (with-read-char c
          (*state rd-token-symbol c 0 #f
            (state-lambda (m slashed?)
-             (state-return atomic (list '$primitive n (maybe-fold/intern ip tb m slashed?))))))]
+             (state-return atomic (list '$primitive n (maybe-fold/intern (rcb-ip rcb) tb m slashed?))))))]
       [else (xcall rd-error #f #t "invalid sharp-sign prefix ~a~a"
                       (substring tb 0 i)
                       c)])))
@@ -624,15 +634,15 @@
       [else #f]))
   (with-unread-char c
     (state-return atomic
-      (or (let ([x (maybe-fold/intern ip tb n #f)])
-            (if ($port-flags-set? ip (constant port-flag-r6rs))
+      (or (let ([x (maybe-fold/intern (rcb-ip rcb) tb n #f)])
+            (if ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs))
                 (r6rs-char-name x)
                 (char-name x)))
           (let ([s (substring tb 0 n)])
             (if (and (with-peek-char c (eof-object? c))
                      (valid-prefix? s
                        (map symbol->string
-                         (if ($port-flags-set? ip (constant port-flag-r6rs))
+                         (if ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs))
                              (map car r6rs-char-names)
                              (let-values ([(keys vals) (hashtable-entries char-name-table)])
                                (apply append (vector->list vals)))))))
@@ -665,18 +675,19 @@
   (cond
     [(ormap (lambda (a) (and (fx= (string-length (car a)) i) a)) undelimited*) =>
      (lambda (a)
-       (case (cdr a)
-         [(r6rs) ($set-port-flags! ip (constant port-flag-r6rs)) (*state rd-token)]
-         [(fold-case)
-          ($reset-port-flags! ip (constant port-flag-no-fold-case))
-          ($set-port-flags! ip (constant port-flag-fold-case))
-          (*state rd-token)]
-         [(no-fold-case)
-          ($reset-port-flags! ip (constant port-flag-fold-case))
-          ($set-port-flags! ip (constant port-flag-no-fold-case))
-          (*state rd-token)]
-         [(chezscheme) ($reset-port-flags! ip (constant port-flag-r6rs)) (*state rd-token)]
-         [else (xcall rd-error #f #t "unexpected #!~s" (car a))]))]
+       (let ([ip (rcb-ip rcb)])
+         (case (cdr a)
+           [(r6rs) ($set-port-flags! ip (constant port-flag-r6rs)) (*state rd-token)]
+           [(fold-case)
+            ($reset-port-flags! ip (constant port-flag-no-fold-case))
+            ($set-port-flags! ip (constant port-flag-fold-case))
+            (*state rd-token)]
+           [(no-fold-case)
+            ($reset-port-flags! ip (constant port-flag-fold-case))
+            ($set-port-flags! ip (constant port-flag-no-fold-case))
+            (*state rd-token)]
+           [(chezscheme) ($reset-port-flags! ip (constant port-flag-r6rs)) (*state rd-token)]
+           [else (xcall rd-error #f #t "unexpected #!~s" (car a))])))]
     [else
      (with-read-char c
        (state-case c
@@ -874,14 +885,14 @@
            (xcall rd-error #f #t "invalid character ~c in string hex escape" c1)))])))
 
 (xdefine (rd-make-number-or-symbol n)
-  (let ([z ($str->num tb n 10 #f ($port-flags-set? ip (constant port-flag-r6rs)))])
+  (let ([z ($str->num tb n 10 #f ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs)))])
     (cond
       [(number? z) z]
       [(eq? z 'norep) (xcall rd-error #t #t "cannot represent ~a" (substring tb 0 n))]
       [(eq? z '!r6rs) (xcall rd-nonstandard-error (format "~a number" (substring tb 0 n)))]
       [else
        (nonstandard (format "~a symbol" (substring tb 0 n)))
-       (maybe-fold/intern ip tb n #f)])))
+       (maybe-fold/intern (rcb-ip rcb) tb n #f)])))
 
 (define-state (rd-token-number-or-symbol i)
   (with-read-char c
@@ -907,7 +918,7 @@
       [else (*state rd-token-symbol c i #f rd-token-intern-nonstandard)])))
 
 (xdefine (rd-make-number n)
-  (let ([z ($str->num tb n 10 #f ($port-flags-set? ip (constant port-flag-r6rs)))])
+  (let ([z ($str->num tb n 10 #f ($port-flags-set? (rcb-ip rcb) (constant port-flag-r6rs)))])
     (cond
       [(number? z) z]
       [(and (eq? z #f) (with-peek-char c (eof-object? c))) (xcall rd-eof-error "number")]
@@ -938,11 +949,11 @@
          (*state rd-token-number (fx+ i 1)))])))
 
 (define-state (rd-token-intern n slashed?)
-  (state-return atomic (maybe-fold/intern ip tb n slashed?)))
+  (state-return atomic (maybe-fold/intern (rcb-ip rcb) tb n slashed?)))
 
 (define-state (rd-token-intern-nonstandard n slashed?)
   (nonstandard (format "~a symbol" (substring tb 0 n)))
-  (state-return atomic (maybe-fold/intern ip tb n slashed?)))
+  (state-return atomic (maybe-fold/intern (rcb-ip rcb) tb n slashed?)))
 
 (define-state (rd-token-symbol c i slashed? next)
   (state-case c
@@ -1026,7 +1037,7 @@
         [else #f])
       (values value fp)
       (if (and (or (eq? type 'rparen) (eq? type 'rbrack))
-               (eq? ip (console-input-port)))
+               (eq? (rcb-ip rcb) (console-input-port)))
           (call-with-token rd-top-level)
           (xmvlet ((x stripped-x) (xcall rd type value))
             (values (if it (xcall rd-fix-graph x) x) fp)))))
@@ -1142,8 +1153,8 @@
 (xdefine (rd type value)
   (xmvlet ((x stripped) (xcall rd-help type value))
     (xvalues
-      (if (and a? (not (procedure? x))) ; don't annotate code
-          (make-annotation x ($make-source-object sfd bfp fp) stripped)
+      (if (rcb-a? rcb)
+          (make-annotation x ($make-source-object (rcb-sfd rcb) bfp fp) stripped)
           x)
       stripped)))
 
@@ -1191,7 +1202,7 @@
            (xmvlet ((rest stripped-rest) (xcall rd-paren-tail expr-bfp))
              (xvalues
                (cons first rest)
-               (and a? (cons stripped-first stripped-rest)))))]))))
+               (and (rcb-a? rcb) (cons stripped-first stripped-rest)))))]))))
 
 (xdefine (rd-paren-tail expr-bfp)
   (with-token (type value)
@@ -1218,7 +1229,7 @@
          (xmvlet ((rest stripped-rest) (xcall rd-paren-tail expr-bfp))
            (xvalues
              (cons first rest)
-             (and a? (cons stripped-first stripped-rest)))))])))
+             (and (rcb-a? rcb) (cons stripped-first stripped-rest)))))])))
 
 (xdefine (rd-brack-list)
   (let ([expr-bfp bfp])
@@ -1232,7 +1243,7 @@
            (xmvlet ((rest stripped-rest) (xcall rd-brack-tail expr-bfp))
              (xvalues
                (cons first rest)
-               (and a? (cons stripped-first stripped-rest)))))]))))
+               (and (rcb-a? rcb) (cons stripped-first stripped-rest)))))]))))
 
 (xdefine (rd-brack-tail expr-bfp)
   (with-token (type value)
@@ -1259,7 +1270,7 @@
          (xmvlet ((rest stripped-rest) (xcall rd-brack-tail expr-bfp))
            (xvalues
              (cons first rest)
-             (and a? (cons stripped-first stripped-rest)))))])))
+             (and (rcb-a? rcb) (cons stripped-first stripped-rest)))))])))
 
 (xdefine (rd-quote kind)
   (let ([expr-bfp bfp])
@@ -1269,7 +1280,7 @@
         [else (xmvlet ((x stripped-x) (xcall rd type value))
                 (xvalues
                   (list kind x)
-                  (and a? (list kind stripped-x))))]))))
+                  (and (rcb-a? rcb) (list kind stripped-x))))]))))
 
 (xdefine (rd-record)
   (let ([expr-bfp bfp])
@@ -1302,7 +1313,7 @@
                       (if (null? fds)
                           (xvalues
                             (apply (record-constructor rtd) vals)
-                            (and a? (apply (record-constructor rtd) stripped-vals)))
+                            (and (rcb-a? rcb) (apply (record-constructor rtd) stripped-vals)))
                           (if (and (apply (lambda (m t n)
                                             (or (eq? m 'immutable)
                                                 (not (eq? (filter-foreign-type t) 'scheme-object))))
@@ -1311,7 +1322,7 @@
                                        (delayed-record? (car vs))))
                               (xvalues
                                 (make-delayed-record rtd vals expr-bfp fp)
-                                (and a? (make-delayed-record rtd stripped-vals expr-bfp fp)))
+                                (and (rcb-a? rcb) (make-delayed-record rtd stripped-vals expr-bfp fp)))
                               (loop (cdr fds) (cdr vs)))))))))]
            [else (xcall rd-error #f #t "unrecognized record name ~s" name)])]))))
 
@@ -1332,25 +1343,25 @@
              (xmvlet ((rest stripped-rest) (xcall rd-record-tail expr-bfp (- n 1) name))
                (xvalues
                  (cons first rest)
-                 (and a? (cons stripped-first stripped-rest))))))])))
+                 (and (rcb-a? rcb) (cons stripped-first stripped-rest))))))])))
 
 (xdefine (rd-vector expr-bfp i)
   (with-token (type value)
     (case type
-      [(rparen) (xvalues (make-vector i) (and a? (make-vector i)))]
+      [(rparen) (xvalues (make-vector i) (and (rcb-a? rcb) (make-vector i)))]
       [(eof) (let ([bfp expr-bfp]) (xcall rd-eof-error "vector"))]
       [else
        (xmvlet ((x stripped-x) (xcall rd type value))
          (xmvlet ((v stripped-v) (xcall rd-vector expr-bfp (fx+ i 1)))
            (vector-set! v i x)
-           (when a? (vector-set! stripped-v i stripped-x))
+           (when (rcb-a? rcb) (vector-set! stripped-v i stripped-x))
            (xvalues v stripped-v)))])))
 
 (xdefine (rd-sized-vector n)
   (unless (and (fixnum? n) (fxnonnegative? n))
     (let ([bfp (and bfp (+ bfp 1))] [fp (and fp (- fp 1))])
       (xcall rd-error #f #t "invalid vector length ~s" n)))
-  (xcall rd-fill-vector bfp (make-vector n) (and a? (make-vector n)) 0 n))
+  (xcall rd-fill-vector bfp (make-vector n) (and (rcb-a? rcb) (make-vector n)) 0 n))
 
 (xdefine (rd-fill-vector expr-bfp v stripped-v i n)
   (with-token (type value)
@@ -1468,24 +1479,24 @@
         [(eof) (let ([bfp expr-bfp]) (xcall rd-eof-error "box"))]
         [else
          (xmvlet ((x stripped-x) (xcall rd type value))
-           (xvalues (box x) (and a? (box stripped-x))))]))))
+           (xvalues (box x) (and (rcb-a? rcb) (box stripped-x))))]))))
 
 (xdefine (rd-mark n)
   (let ([a (eq-hashtable-cell it n #f)])
    ; set up insert(s) if not already present
-    (unless (cdr a) (set-cdr! a (cons (make-insert n bfp fp) (and a? (make-insert n bfp fp)))))
+    (unless (cdr a) (set-cdr! a (cons (make-insert n bfp fp) (and (rcb-a? rcb) (make-insert n bfp fp)))))
    ; check for duplicate marks
     (when (insert-seen (cadr a)) (xcall rd-error #f #t "duplicate mark #~s= seen" n))
    ; mark seen before reading so that error comes from second duplicate
     (insert-seen-set! (cadr a) #t)
-    (when a? (insert-seen-set! (cddr a) #t))
+    (when (rcb-a? rcb) (insert-seen-set! (cddr a) #t))
     (let ([expr-bfp bfp])
       (with-token (type value)
         (case type
           [(eof) (let ([bfp expr-bfp]) (xcall rd-eof-error "graph mark"))]
           [else
            (xmvlet ((obj stripped-obj) (xcall rd type value))
-             (if a?
+             (if (rcb-a? rcb)
                  (let ([ins (cadr a)] [stripped-ins (cddr a)])
                    (if (eq? stripped-obj stripped-ins)
                        (begin
@@ -1503,8 +1514,8 @@
 (xdefine (rd-insert n)
   (let ([a (eq-hashtable-cell it n #f)])
    ; set up insert(s) if not already present
-    (unless (cdr a) (set-cdr! a (cons (make-insert n bfp fp) (and a? (make-insert n bfp fp)))))
-    (xvalues (cadr a) (and a? (cddr a)))))
+    (unless (cdr a) (set-cdr! a (cons (make-insert n bfp fp) (and (rcb-a? rcb) (make-insert n bfp fp)))))
+    (xvalues (cadr a) (and (rcb-a? rcb) (cddr a)))))
 
 (xdefine (rd-expression-comment) ; called from scanner
   (let ([expr-bfp bfp])
@@ -1524,7 +1535,7 @@
         (let ([fp (and (port-has-port-position? ip)
                        ($port-flags-set? ip (constant port-flag-char-positions))
                        (port-position ip))])
-          (let ([tb ""] [bfp fp] [it #f] [a? #f])
+          (let ([rcb (make-rcb ip sfd #f who)] [tb ""] [bfp fp] [it #f])
             (with-token (type value)
               (values type value bfp fp))))))
     (case-lambda
@@ -1549,7 +1560,7 @@
                     (and (port-has-port-position? ip)
                          ($port-flags-set? ip (constant port-flag-char-positions))
                          (port-position ip)))])
-        (let ([tb ""] [bfp fp] [it #f] [a? (and a? sfd fp #t)])
+        (let ([rcb (make-rcb ip sfd (and a? sfd fp #t) who)] [tb ""] [bfp fp] [it #f])
           (call-with-token rd-top-level)))))
   (set-who! get-datum
     (lambda (ip)
@@ -1651,17 +1662,17 @@
             (let loop ([fp 0] [accum '(0)])
               (let ([ch (read-char ip)])
                 (cond
-                 [(eof-object? ch)
-                  (close-input-port ip)
-                  (list->vector (reverse accum))]
-                 [(eqv? ch #\newline)
-                  (let ([fp (fx+ fp 1)])
-                    (loop fp (cons fp accum)))]
-                 [else
-                  (loop (fx+ fp 1) accum)]))))
+                  [(eof-object? ch)
+                   (close-input-port ip)
+                   (list->vector (reverse accum))]
+                  [(eqv? ch #\newline)
+                   (let ([fp (fx+ fp 1)])
+                     (loop fp (cons fp accum)))]
+                  [else
+                    (loop (fx+ fp 1) accum)]))))
           (when use-cache?
             (with-tc-mutex
-             (hashtable-set! source-lines-cache sfd (cons name table))))
+              (hashtable-set! source-lines-cache sfd (cons name table))))
           (binary-search table name))]
        [else (values)])))
 
@@ -1781,7 +1792,6 @@
             ; make c entry for x
             ($sputprop x '*char-name* c))
            (else ($oops 'char-name "~s is not a character" c))))])))
-
 ) ;let
 
 (define source-directories
diff --git a/s/syntax.ss b/s/syntax.ss
index 239bb23d67..491eb0f3c5 100644
--- a/s/syntax.ss
+++ b/s/syntax.ss
@@ -966,8 +966,8 @@
   (nongenerative #{g0 cz18zz6lfwg7mc7m-a})
   (sealed #t))
 
-(define-record-type (compile-time-value $make-compile-time-value compile-time-value?)
-  (fields (immutable value))
+(define-record-type (compile-time-value $make-compile-time-value $compile-time-value?)
+  (fields (immutable value $compile-time-value-value))
   (nongenerative #{g0 c0f3a5187l98t2ef-a})
   (sealed #t))
 
@@ -1077,7 +1077,7 @@
       [(procedure? x) (make-binding 'macro x)]
       [(core-transformer? x) (core-transformer-binding x)]
       [(variable-transformer? x) (make-binding 'macro! (variable-transformer-procedure x))]
-      [(compile-time-value? x) (make-binding 'ctv x)]
+      [($compile-time-value? x) (make-binding 'ctv x)]
       [else ($oops who "invalid transformer ~s" x)])))
 
 (define defer-or-eval-transformer
@@ -3660,7 +3660,7 @@
                           "first argument to lookup procedure is not an identifier"))
                       (let ([b (lookup (id->label id empty-wrap) r)])
                         (case (binding-type b)
-                          [(ctv) (compile-time-value-value (binding-value b))]
+                          [(ctv) ($compile-time-value-value (binding-value b))]
                           [else #f]))]
                      [(id key-id)
                       (unless (identifier? id)
@@ -4841,70 +4841,77 @@
                                                                ($oops/c #f ($make-recompile-condition path)
                                                                  "can't find include file ~a included by ~a when building ~a"
                                                                  include-req src-path obj-path))])
+                                               ; with-source-path tries to open include-req if it has to search for it ...
                                                (with-source-path 'include include-req
                                                  (lambda (include-req)
-                                                   (lambda ()
-                                                     (when (time>? (file-modification-time include-req) obj-time)
-                                                       (with-message (format "include file ~a is newer than ~a" include-req obj-path)
-                                                         ($oops/c #f ($make-recompile-condition path)
-                                                           "include file ~a is newer than ~a"
-                                                           include-req obj-path)))))))))
+                                                   ; ... but not if it is an absolute path or begins with "./" or "..", so we
+                                                   ; call file-modification time before leaving the "missing include file"
+                                                   ; guard in case it doesn't actually exist.
+                                                   (let ([t (file-modification-time include-req)])
+                                                     (lambda ()
+                                                       (when (time>? t obj-time)
+                                                         (with-message (format "include file ~a is newer than ~a" include-req obj-path)
+                                                           ($oops/c #f ($make-recompile-condition path)
+                                                             "include file ~a is newer than ~a"
+                                                             include-req obj-path))))))))))
                                           (libdesc-include-req* (get-library-descriptor found-uid))))))
                                   found-uid)]
                                [else ($oops #f "loading ~a did not define library ~s" src-path path)]))])
             (verify-uid found-uid src-path)
             found-uid)))
-      (cond
-        [(search-loaded-libraries path) =>
-         (lambda (found-uid)
-           (verify-version path version-ref found-uid #f #f)
-           (verify-uid found-uid #f)
-           (let ([desc (get-library-descriptor found-uid)])
-             (if ct?
-                 (unless (libdesc-ctdesc desc)
-                   (with-message (format "attempting to 'visit' previously 'revisited' ~s for library ~s compile-time info" (libdesc-outfn desc) path)
-                     ($visit #f (libdesc-outfn desc))))
-                 (unless (libdesc-rtdesc desc)
-                   (with-message (format "attempting to 'revisit' previously 'visited' ~s for library ~s run-time info" (libdesc-outfn desc) path)
-                     ($revisit #f (libdesc-outfn desc))))))
-          ; need to call load-deps even if our library was already loaded,
-          ; since we might, say, have previously loaded its invoke dependencies and
-          ; now want to load its import dependencies
-           (load-deps found-uid)
-           found-uid)]
-        [else
-         (let-values ([(src-path obj-path obj-exists?) (library-search 'import path (library-directories) (library-extensions))])
-           (if src-path
-               (if obj-exists?
-                   (if (equal? obj-path src-path)
-                       (with-message "source path and object path are the same"
-                         (with-message (format "loading ~s" src-path)
-                           (do-load-library src-path 'load)))
-                       (if (time>=? (file-modification-time obj-path) (file-modification-time src-path))
-                           (with-message "object file is not older"
-                             (with-message (format "loading object file ~s" obj-path)
-                               (do-load/reload/recompile-library src-path obj-path
-                                 (and (compile-imported-libraries) $compiler-is-loaded?))))
-                           (with-message "object file is older"
-                             (if (and (compile-imported-libraries) $compiler-is-loaded?)
-                                 (with-message (format "compiling ~s to ~s" src-path obj-path)
-                                   (do-compile-library src-path obj-path))
-                                 (with-message (format "loading source file ~s" src-path)
-                                   (do-load-library src-path 'load))))))
-                   (if (and (compile-imported-libraries) $compiler-is-loaded?)
-                       (with-message (format "compiling ~s to ~s" src-path obj-path)
-                         (let f ([p obj-path])
-                           (let ([p (path-parent p)])
-                             (unless (or (string=? p "") (file-exists? p))
-                               (f p)
-                               (with-message (format "creating subdirectory ~s" p) (mkdir p)))))
-                         (do-compile-library src-path obj-path))
-                       (with-message (format "loading source file ~s" src-path)
-                         (do-load-library src-path 'load))))
-               (if obj-exists?
-                   (with-message (format "loading object file ~s" obj-path)
-                     (do-load-library obj-path (if ct? 'load 'revisit)))
-                   ($oops #f "library ~s not found" path))))])))
+      ($pass-time 'load-library
+        (lambda ()
+          (cond
+            [(search-loaded-libraries path) =>
+             (lambda (found-uid)
+               (verify-version path version-ref found-uid #f #f)
+               (verify-uid found-uid #f)
+               (let ([desc (get-library-descriptor found-uid)])
+                 (if ct?
+                     (unless (libdesc-ctdesc desc)
+                       (with-message (format "attempting to 'visit' previously 'revisited' ~s for library ~s compile-time info" (libdesc-outfn desc) path)
+                         ($visit #f (libdesc-outfn desc))))
+                     (unless (libdesc-rtdesc desc)
+                       (with-message (format "attempting to 'revisit' previously 'visited' ~s for library ~s run-time info" (libdesc-outfn desc) path)
+                         ($revisit #f (libdesc-outfn desc))))))
+              ; need to call load-deps even if our library was already loaded,
+              ; since we might, say, have previously loaded its invoke dependencies and
+              ; now want to load its import dependencies
+               (load-deps found-uid)
+               found-uid)]
+            [else
+             (let-values ([(src-path obj-path obj-exists?) (library-search 'import path (library-directories) (library-extensions))])
+               (if src-path
+                   (if obj-exists?
+                       (if (equal? obj-path src-path)
+                           (with-message "source path and object path are the same"
+                             (with-message (format "loading ~s" src-path)
+                               (do-load-library src-path 'load)))
+                           (if (time>=? (file-modification-time obj-path) (file-modification-time src-path))
+                               (with-message "object file is not older"
+                                 (with-message (format "loading object file ~s" obj-path)
+                                   (do-load/reload/recompile-library src-path obj-path
+                                     (and (compile-imported-libraries) $compiler-is-loaded?))))
+                               (with-message "object file is older"
+                                 (if (and (compile-imported-libraries) $compiler-is-loaded?)
+                                     (with-message (format "compiling ~s to ~s" src-path obj-path)
+                                       (do-compile-library src-path obj-path))
+                                     (with-message (format "loading source file ~s" src-path)
+                                       (do-load-library src-path 'load))))))
+                       (if (and (compile-imported-libraries) $compiler-is-loaded?)
+                           (with-message (format "compiling ~s to ~s" src-path obj-path)
+                             (let f ([p obj-path])
+                               (let ([p (path-parent p)])
+                                 (unless (or (string=? p "") (file-exists? p))
+                                   (f p)
+                                   (with-message (format "creating subdirectory ~s" p) (mkdir p)))))
+                             (do-compile-library src-path obj-path))
+                           (with-message (format "loading source file ~s" src-path)
+                             (do-load-library src-path 'load))))
+                   (if obj-exists?
+                       (with-message (format "loading object file ~s" obj-path)
+                         (do-load-library obj-path (if ct? 'load 'revisit)))
+                       ($oops #f "library ~s not found" path))))])))))
 
   (define version-okay?
     (lambda (version-ref version)
@@ -5247,9 +5254,16 @@
                                  (lambda (rcinfo)
                                    (andmap
                                      (lambda (x)
-                                       (with-source-path who x
-                                         (lambda (x)
-                                           (time<=? (with-new-who who (lambda () (file-modification-time x))) ofn-mod-time))))
+                                       ((guard (c [else (with-message (with-output-to-string
+                                                                        (lambda ()
+                                                                          (display-string "failed to find include file: ")
+                                                                          (display-condition c)))
+                                                          (lambda () #f))])
+                                          (with-source-path who x
+                                            (lambda (x)
+                                              (lambda ()
+                                                (and (file-exists? x)
+                                                     (time<=? (file-modification-time x) ofn-mod-time))))))))
                                      (recompile-info-include-req* rcinfo)))
                                  rcinfo*))
                           (if (compile-imported-libraries)
@@ -6459,7 +6473,7 @@
 (record-writer (type-descriptor compile-time-value)
   (lambda (x p wr)
     (display "#<compile-time-value " p)
-    (wr (compile-time-value-value x) p)
+    (wr ($compile-time-value-value x) p)
     (display ">" p)))
 
 (record-writer syntax-object-rtd ; from types.ss
@@ -6983,6 +6997,15 @@
   (lambda (x)
     ($make-compile-time-value x)))
 
+(set-who! compile-time-value?
+  (lambda (x)
+    ($compile-time-value? x)))
+
+(set-who! compile-time-value-value
+  (lambda (x)
+    (unless ($compile-time-value? x) ($oops who "~s is not a compile-time value" x))
+    ($compile-time-value-value x)))
+
 (set! $syntax->src
   (lambda (x)
     (let f ([x x] [n 0] [k (lambda () (values #f #t))])