From 81ea967aeafb48f7a4f613ee4819f869ef970850 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 3 Jan 2020 17:09:28 -0700
Subject: [PATCH] add stencil vectors and fxpopcount

original commit: ec766fca869b5e0407c4f54230b72619af73b40b
---
 c/Mf-base                        |   4 +-
 c/alloc.c                        |  14 +
 c/externs.h                      |   1 +
 c/fasl.c                         |  10 +
 c/gc.c                           |  26 ++
 c/gcwrapper.c                    |   4 +-
 c/popcount.h                     |  35 +++
 c/types.h                        |   1 +
 c/vfasl.c                        |  13 +
 csug/numeric.stex                |  15 +
 csug/objects.stex                | 142 +++++++++
 makefiles/Mf-install.in          |   2 +-
 mats/5_3.ms                      |  27 ++
 mats/5_6.ms                      | 150 +++++++++
 mats/hash.ms                     |   5 +
 mats/misc.ms                     |   8 +-
 mats/patch-compile-0-t-f-f       | 524 +++++++++++++++----------------
 mats/primvars.ms                 |   1 +
 mats/root-experr-compile-0-f-f-f |  41 +++
 s/5_1.ss                         |  32 ++
 s/5_6.ss                         | 178 +++++++++++
 s/a6fb.def                       |   1 +
 s/a6le.def                       |   1 +
 s/a6nb.def                       |   1 +
 s/a6nt.def                       |   1 +
 s/a6ob.def                       |   1 +
 s/a6osx.def                      |   1 +
 s/a6s2.def                       |   1 +
 s/arm32le.def                    |   1 +
 s/cmacros.ss                     |  33 +-
 s/cp0.ss                         |   6 +-
 s/cpnanopass.ss                  | 197 +++++++++++-
 s/fasl.ss                        |  20 ++
 s/i3fb.def                       |   1 +
 s/i3le.def                       |   1 +
 s/i3nb.def                       |   1 +
 s/i3nt.def                       |   1 +
 s/i3ob.def                       |   1 +
 s/i3osx.def                      |   1 +
 s/i3qnx.def                      |   1 +
 s/i3s2.def                       |   1 +
 s/inspect.ss                     |  64 +++-
 s/library.ss                     |   9 +
 s/mathprims.ss                   |  12 +
 s/mkheader.ss                    |  10 +
 s/newhash.ss                     |  10 +
 s/np-languages.ss                |   1 +
 s/ppc32le.def                    |   1 +
 s/primdata.ss                    |  15 +
 s/prims.ss                       |  15 +
 s/print.ss                       |  29 +-
 s/ta6fb.def                      |   1 +
 s/ta6le.def                      |   1 +
 s/ta6nb.def                      |   1 +
 s/ta6nt.def                      |   1 +
 s/ta6ob.def                      |   1 +
 s/ta6osx.def                     |   1 +
 s/ta6s2.def                      |   1 +
 s/ti3fb.def                      |   1 +
 s/ti3le.def                      |   1 +
 s/ti3nb.def                      |   1 +
 s/ti3nt.def                      |   1 +
 s/ti3ob.def                      |   1 +
 s/ti3osx.def                     |   1 +
 s/ti3s2.def                      |   1 +
 s/tppc32le.def                   |   1 +
 s/x86_64.ss                      |  45 ++-
 67 files changed, 1446 insertions(+), 285 deletions(-)
 create mode 100644 c/popcount.h

diff --git a/c/Mf-base b/c/Mf-base
index f345b2db22..52cc7e9644 100644
--- a/c/Mf-base
+++ b/c/Mf-base
@@ -41,7 +41,7 @@ kernelsrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-ocd.c gc-
 
 kernelobj=${kernelsrc:%.c=%.$o} ${mdobj}
 
-kernelhdr=system.h types.h version.h globals.h externs.h segment.h gc.c sort.h thread.h config.h compress-io.h itest.c nocurses.h
+kernelhdr=system.h types.h version.h globals.h externs.h segment.h gc.c sort.h thread.h config.h compress-io.h itest.c nocurses.h popcount.h
 
 mainsrc=main.c
 
@@ -64,7 +64,7 @@ endif
 
 scheme.o: itest.c
 scheme.o main.o: config.h
-${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h compress-io.h nocurses.h
+${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h compress-io.h nocurses.h popcount.h
 ${kernelobj}: ${Include}/equates.h ${Include}/scheme.h
 ${mainobj}: ${Include}/scheme.h
 ${kernelobj}: ${zlibHeaderDep} ${LZ4HeaderDep}
diff --git a/c/alloc.c b/c/alloc.c
index a44f0495e6..25d2bf84b3 100644
--- a/c/alloc.c
+++ b/c/alloc.c
@@ -15,6 +15,7 @@
  */
 
 #include "system.h"
+#include "popcount.h"
 
 /* locally defined functions */
 static void maybe_fire_collector PROTO((void));
@@ -596,6 +597,19 @@ ptr S_null_immutable_string() {
   return v;
 }
 
+ptr S_stencil_vector(mask) uptr mask; {
+    ptr tc;
+    ptr p; iptr d;
+    iptr n = Spopcount(mask);
+
+    tc = get_thread_context();
+
+    d = size_stencil_vector(n);
+    thread_find_room(tc, type_typed_object, d, p);
+    VECTTYPE(p) = (mask << stencil_vector_mask_offset) | type_stencil_vector;
+    return p;
+}
+
 ptr S_record(n) iptr n; {
     ptr tc = get_thread_context();
     ptr p;
diff --git a/c/externs.h b/c/externs.h
index e0bf4a0a00..b66cfacab3 100644
--- a/c/externs.h
+++ b/c/externs.h
@@ -82,6 +82,7 @@ extern ptr S_null_immutable_vector PROTO((void));
 extern ptr S_null_immutable_fxvector PROTO((void));
 extern ptr S_null_immutable_bytevector PROTO((void));
 extern ptr S_null_immutable_string PROTO((void));
+extern ptr S_stencil_vector PROTO((uptr mask));
 extern ptr S_record PROTO((iptr n));
 extern ptr S_closure PROTO((ptr cod, iptr n));
 extern ptr S_mkcontinuation PROTO((ISPC s, IGEN g, ptr nuate, ptr stack,
diff --git a/c/fasl.c b/c/fasl.c
index a8c4e07cf7..5326bdb8b3 100644
--- a/c/fasl.c
+++ b/c/fasl.c
@@ -178,6 +178,7 @@
 
 #include "system.h"
 #include "zlib.h"
+#include "popcount.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -721,6 +722,15 @@ static void faslin(ptr tc, ptr *x, ptr t, ptr *pstrbuf, faslFile f) {
             }
             return;
         }
+        case fasl_type_stencil_vector: {
+            uptr mask; iptr n; ptr *p;
+            mask = uptrin(f);
+            *x = S_stencil_vector(mask);
+            p = &INITSTENVECTIT(*x, 0);
+            n = Spopcount(mask);
+            while (n--) faslin(tc, p++, t, pstrbuf, f);
+            return;
+        }
         case fasl_type_base_rtd: {
             ptr rtd;
             if ((rtd = S_G.base_rtd) == Sfalse) {
diff --git a/c/gc.c b/c/gc.c
index 7a63972f96..cc3e802fdb 100644
--- a/c/gc.c
+++ b/c/gc.c
@@ -19,6 +19,7 @@
 #ifndef WIN32
 #include <sys/wait.h>
 #endif /* WIN32 */
+#include "popcount.h"
 
 #define enable_object_counts do_not_use_enable_object_counts_in_this_file_use_ifdef_ENABLE_OBJECT_COUNTS_instead
 
@@ -390,6 +391,21 @@ static ptr copy(pp, si) ptr pp; seginfo *si; {
           copy_ptrs(type_typed_object, p, pp, n);
         /* pad if necessary */
           if ((len & 1) == 0) INITVECTIT(p, len) = FIX(0);
+      } else if (TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+          iptr len, n;
+          ISPC s;
+          len = Sstencil_vector_length(pp);
+          n = size_stencil_vector(len);
+#ifdef ENABLE_OBJECT_COUNTS
+          S_G.countof[tg][countof_stencil_vector] += 1;
+          S_G.bytesof[tg][countof_stencil_vector] += n;
+#endif /* ENABLE_OBJECT_COUNTS */
+        /* assumes stencil types look like immediate; if not, stencil vectors will need their own space */
+          s = (BACKREFERENCES_ENABLED ? space_impure_typed_object : space_impure);
+          find_room(s, tg, type_typed_object, n, p);
+          copy_ptrs(type_typed_object, p, pp, n);
+        /* pad if necessary */
+          if ((len & 1) == 0) INITSTENVECTIT(p, len) = FIX(0);
       } else if (TYPEP(tf, mask_string, type_string)) {
           iptr n;
           n = size_string(Sstring_length(pp));
@@ -733,6 +749,8 @@ static void sweep(ptr tc, ptr p, IBOOL sweep_pure) {
  /* typed objects */
   } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_vector, type_vector)) {
     sweep_ptrs(&INITVECTIT(p, 0), Svector_length(p));
+  } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+    sweep_ptrs(&INITVECTIT(p, 0), Sstencil_vector_length(p));
   } else if (TYPEP(tf, mask_string, type_string) || TYPEP(tf, mask_bytevector, type_bytevector) || TYPEP(tf, mask_fxvector, type_fxvector)) {
     /* nothing to sweep */;
   } else if (TYPEP(tf, mask_record, type_record)) {
@@ -831,6 +849,11 @@ static void sweep_in_old(ptr tc, ptr p) {
       relocate(&p)
       return;
     }
+  } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+    if (scan_ptrs_for_self(&INITSTENVECTIT(p, 0), Sstencil_vector_length(p), p)) {
+      relocate(&p)
+      return;
+    }
   } else if (TYPEP(tf, mask_string, type_string) || TYPEP(tf, mask_bytevector, type_bytevector) || TYPEP(tf, mask_fxvector, type_fxvector)) {
     /* nothing to sweep */
     return;
@@ -1741,6 +1764,8 @@ static iptr size_object(p) ptr p; {
   /* typed objects */
     } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_vector, type_vector)) {
         return size_vector(Svector_length(p));
+    } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+        return size_vector(Sstencil_vector_length(p));
     } else if (TYPEP(tf, mask_string, type_string)) {
         return size_string(Sstring_length(p));
     } else if (TYPEP(tf, mask_bytevector, type_bytevector)) {
@@ -2503,6 +2528,7 @@ IGEN sweep_dirty_intersecting(ptr lst, ptr *pp, ptr *ppend, IGEN tg, IGEN younge
       } else {
         ptr tf = TYPEFIELD(p);
         if (TYPEP(tf, mask_vector, type_vector)
+            || TYPEP(tf, mask_stencil_vector, type_stencil_vector)
             || TYPEP(tf, mask_box, type_box)
             || ((iptr)tf == type_tlc)) {
           /* impure objects */
diff --git a/c/gcwrapper.c b/c/gcwrapper.c
index 8886db5aaa..bcc64d9409 100644
--- a/c/gcwrapper.c
+++ b/c/gcwrapper.c
@@ -126,8 +126,10 @@ void S_gc_init() {
     S_G.countof_size[countof_guardian] = size_guardian_entry;
   INITVECTIT(S_G.countof_names, countof_oblist) = S_intern((const unsigned char *)"oblist");
     S_G.countof_size[countof_guardian] = 0;
-  INITVECTIT(S_G.countof_names, countof_ephemeron) = S_intern((const unsigned char *)"ephemron");
+  INITVECTIT(S_G.countof_names, countof_ephemeron) = S_intern((const unsigned char *)"ephemeron");
     S_G.countof_size[countof_ephemeron] = 0;
+  INITVECTIT(S_G.countof_names, countof_stencil_vector) = S_intern((const unsigned char *)"stencil-vector");
+    S_G.countof_size[countof_stencil_vector] = 0;
   for (i = 0; i < countof_types; i += 1) {
     if (Svector_ref(S_G.countof_names, i) == FIX(0)) {
       fprintf(stderr, "uninitialized countof_name at index %d\n", i);
diff --git a/c/popcount.h b/c/popcount.h
new file mode 100644
index 0000000000..134b6b3681
--- /dev/null
+++ b/c/popcount.h
@@ -0,0 +1,35 @@
+
+#if __GNUC__ >= 5
+static int Spopcount_32(U32 x)
+{
+  return __builtin_popcount(x);
+}
+#else
+static int Spopcount_32(U32 x)
+{
+  /* http://bits.stephan-brumme.com/countBits.html */
+  /* count bits of each 2-bit chunk */
+  x  = x - ((x >> 1) & 0x55555555);
+  /* count bits of each 4-bit chunk */
+  x  = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+  /* count bits of each 8-bit chunk */
+  x  = x + (x >> 4);
+  /* mask out junk */
+  x &= 0xF0F0F0F;
+  /* add all four 8-bit chunks */
+  return (x * 0x01010101) >> 24;
+}
+#endif
+
+#if ptr_bits == 32
+static int Spopcount(uptr x)
+{
+  return Spopcount_32((U32)x);
+}
+#elif ptr_bits == 64
+static int Spopcount(uptr x)
+{
+  return Spopcount_32((U32)(x & 0xFFFFFFFF)) + Spopcount_32((U32)(x >> 32));
+}
+#endif
+
diff --git a/c/types.h b/c/types.h
index 847cff42ba..0fb3810dea 100644
--- a/c/types.h
+++ b/c/types.h
@@ -227,6 +227,7 @@ typedef struct _bucket_pointer_list {
 /* size macros for variable-sized objects */
 
 #define size_vector(n) ptr_align(header_size_vector + (n)*ptr_bytes)
+#define size_stencil_vector(n) ptr_align(header_size_stencil_vector + (n)*ptr_bytes)
 #define size_closure(n) ptr_align(header_size_closure + (n)*ptr_bytes)
 #define size_string(n) ptr_align(header_size_string + (n)*string_char_bytes)
 #define size_fxvector(n) ptr_align(header_size_fxvector + (n)*ptr_bytes)
diff --git a/c/vfasl.c b/c/vfasl.c
index 09b397569d..02e2291bbf 100644
--- a/c/vfasl.c
+++ b/c/vfasl.c
@@ -15,6 +15,7 @@
  */
 
 #include "system.h"
+#include "popcount.h"
 
 /*
 
@@ -1030,6 +1031,14 @@ static ptr copy(vfasl_info *vfi, ptr pp, seginfo *si) {
           copy_ptrs(type_typed_object, p, pp, n);
           /* pad if necessary */
           if ((len & 1) == 0) INITVECTIT(p, len) = FIX(0);
+      } else if (TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+          iptr len, n;
+          len = Sstencil_vector_length(pp);
+          n = size_stencil_vector(len);
+          FIND_ROOM(vfi, vspace_impure, type_typed_object, n, p);
+          copy_ptrs(type_typed_object, p, pp, n);
+          /* pad if necessary */
+          if ((len & 1) == 0) INITSTENVECTIT(p, len) = FIX(0);
       } else if (TYPEP(tf, mask_string, type_string)) {
           iptr n;
           n = size_string(Sstring_length(pp));
@@ -1238,6 +1247,10 @@ static uptr sweep(vfasl_info *vfi, ptr p) {
     uptr len = Svector_length(p);
     sweep_ptrs(vfi, &INITVECTIT(p, 0), len);
     return size_vector(len);
+  } else if (tf = TYPEFIELD(p), TYPEP(tf, mask_stencil_vector, type_stencil_vector)) {
+    uptr len = Sstencil_vector_length(p);
+    sweep_ptrs(vfi, &INITSTENVECTIT(p, 0), len);
+    return size_stencil_vector(len);
   } else if (TYPEP(tf, mask_record, type_record)) {
     return sweep_record(vfi, p);
   } else if (TYPEP(tf, mask_box, type_box)) {
diff --git a/csug/numeric.stex b/csug/numeric.stex
index a468ce0461..00c45d44c8 100644
--- a/csug/numeric.stex
+++ b/csug/numeric.stex
@@ -1376,6 +1376,21 @@ bits in a fixnum, i.e.,
 (fxsra -64 3) ;=> -8
 \endschemedisplay
 
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{fxpopcount}{\categoryprocedure}{(fxpopcount \var{fixnum} \dots)}
+\formdef{fxpopcount32}{\categoryprocedure}{(fxpopcount32 \var{fixnum} \dots)}
+\formdef{fxpopcount16}{\categoryprocedure}{(fxpopcount16 \var{fixnum} \dots)}
+\returns number of bits set in \var{fixnum}
+\listlibraries
+\endentryheader
+
+\noindent
+\var{fixnum} must be non-negative, and it must have a width of no more than 32 for
+\scheme{fxpopcount32} or no more than 16 for \scheme{fxpopcount16}.
+\var{fixnum} is treated as a two's complement integer, regardless
+of the underlying representation.
+
 
 \section{Random Number Generation\label{SECTNUMERICRANDOM}}
 
diff --git a/csug/objects.stex b/csug/objects.stex
index cdd055bacb..3e6d06f39a 100644
--- a/csug/objects.stex
+++ b/csug/objects.stex
@@ -1211,6 +1211,148 @@ Uncompresses a \var{bytevector} produced by
 as the original given to \scheme{bytevector-compress}.
 
 
+\section{Stencil Vectors}
+
+\index{stencil vectors}Stencil vectors are like vectors, but a stencil
+vector has a mask fixnum that is accessible via
+\scheme{stencil-vector-mask} and that also determines the stencil
+vector's size. Since the size is limited to
+\scheme{(stencil-vector-mask-width)}, which is no more than the number
+of bits in a fixnum, the size of a stencil vector is limited.
+
+A stencil vector provides a more compact representation than a vector
+with one element dedicated to the mask. It also provides more
+efficient functional update through the \scheme{stencil-vector-update}
+function. A stencil vector is useful, for example, to implement
+sparse nodes in a trie.
+
+\index{\scheme{#stencil}}Stencil vectors are written with
+the prefix \scheme{#stencil}, followed by a hexadecimal mask mask in square
+brackets, and followed by a parenthesized sequence of elements.
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-mask-width}{\categoryprocedure}{(stencil-vector-mask-width)}
+\returns a fixnum: the number of bits in a stencil vector mask
+\listlibraries
+\endentryheader
+
+\noindent
+The result is always less than \scheme{(fixnum-width)]}.
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector?}{\categoryprocedure}{(stencil-vector? \var{obj})}
+\returns \scheme{#t} if \var{obj} is a stencil vector, \scheme{#f} otherwise
+\listlibraries
+\endentryheader
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector}{\categoryprocedure}{(stencil-vector \var{mask} \var{obj} \dots)}
+\returns a stencil vector with the given mask and content
+\listlibraries
+\endentryheader
+
+\noindent
+\var{mask} must be a nonnegative fixnum less than
+\scheme{(fxsll 1 (stencil-vector-mask-width))},
+and the number of supplied \var{obj}s must be the
+same as \scheme{(fxpopcount mask)}.
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-mask}{\categoryprocedure}{(stencil-vector-mask \var{stencil-vector})}
+\formdef{stencil-vector-length}{\categoryprocedure}{(stencil-vector-length \var{stencil-vector})}
+\returns the mask or length (as determined by the mask) of \var{stencil-vector}
+\listlibraries
+\endentryheader
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-ref}{\categoryprocedure}{(stencil-vector-ref \var{stencil-vector} \var{n})}
+\returns the object at position \var{n} in \var{stencil-vector}
+\listlibraries
+\endentryheader
+
+\noindent
+\var{n} must be a nonnegative fixnum that is less than the length of \var{stencil-vector}.
+
+Stencil vector elements are accessed by position---unrelated to the
+stencil vector's mask, except that the number of valid positions is
+determined by the mask.
+
+Conceptually, each stensil vector element corresponds to a bit in the
+stencil vector's mask. To convert a a bit position \var{bit} to an
+index, where the lowest set bit corresponds to the first element of
+the stencil vector, use the following calculation:
+
+\scheme{(fxpopcount (fxand (stencil-vector-mask \var{stencil-vector}) (fx- \var{bit} 1)))}
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-set!}{\categoryprocedure}{(stencil-vector-set! \var{stencil-vector} \var{n} \var{obj})}
+\returns unspecified
+\listlibraries
+\endentryheader
+
+\noindent
+\var{n} must be a nonnegative fixnum that is less than the length of \var{stencil-vector}.
+
+Installs \var{obj} at position \var{n} within \var{stencil-vector}.
+See \scheme{stencil-vector-ref} for more information about positions
+in stencil vectors.
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-update}{\categoryprocedure}{(stencil-vector-update \var{stencil-vector} \var{remove-bits} \var{add-bits} \var{obj} \dots)}
+\returns a new stencil vector adapted frmo \var{stencil-vector}
+\listlibraries
+\endentryheader
+
+\noindent
+\var{remove-bits} and \var{add-bits} must be nonnegative fixnums, and then must be less
+than \scheme{(fxsll 1 (stencil-vector-mask-width))}. Furthermore:
+
+\begin{itemize}
+
+ \item \var{remove-bits}
+       must have a subset of the bits in the mask of \var{stencil-vector},
+
+  \item \var{add-bits} must have a set of bits that do not overlap the
+        subtraction of \var{remove-bits} from the mask of
+        \var{stencil-vector}, and
+
+ \item the number of supplied \var{obj}s must match \scheme{(fxpopcount add-bits)}.
+
+\end{itemize}
+
+Returns a new stencil vector that has all of the elements of
+\var{stencil-vector}, except the ones identified by the bits in
+\var{remove-bits}. The new stencil vector also has the given \var{obj}s at
+positions determined by \var{add-bits}. Elements copied from \var{stencil-vector}
+to the new vector retain their relative positions corresponding to their
+bits in the \var{stencil-vector} mask. Individual bits in a mask, \var{remove-bits},
+and \var{add-bits} are mapped to element positions as described in the documentation
+of \scheme{stencil-vector-ref}. The mask of the new stencil mask is the mask of
+\var{stencil-vector} minus \var{remove-bits} plus \var{add-bits}.
+
+%----------------------------------------------------------------------------
+\entryheader
+\formdef{stencil-vector-truncate!}{\categoryprocedure}{(stencil-vector-truncate! \var{stencil-vector} \var{mask})}
+\returns unspecified
+\listlibraries
+\endentryheader
+
+\noindent
+\var{mask} must be a nonnegative fixnum that has fewer bits set than in the current mask of \var{stencil-vector}.
+
+Changes the mask of \var{stencil-vector} to \var{mask}, discarding any
+elements of the vector beyond the first \scheme{(fxpopcount \var{mask})} elements.
+There is no requirement that \var{mask} has any bits in common with
+the current mask of \var{stencil-vector}.
+
+
 \section{Boxes\label{SECTBOXES}}
 
 \index{boxes}Boxes are single-cell objects that are primarily useful for providing
diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in
index f7fe1f0f12..69945027ca 100644
--- a/makefiles/Mf-install.in
+++ b/makefiles/Mf-install.in
@@ -62,7 +62,7 @@ InstallLZ4Target=
 #                 no changes should be needed below this point                #
 ###############################################################################
 
-Version=csv9.5.3.9
+Version=csv9.5.3.10
 Include=boot/$m
 PetiteBoot=boot/$m/petite.boot
 SchemeBoot=boot/$m/scheme.boot
diff --git a/mats/5_3.ms b/mats/5_3.ms
index 722b2dd592..06ddea7b6f 100644
--- a/mats/5_3.ms
+++ b/mats/5_3.ms
@@ -6484,3 +6484,30 @@
     '((0 . 3/5) (0 . -3/5) (0 . 3/5) (0 . -3/5)
       (5 . 2/7) (-5 . -2/7) (-5 . 2/7) (5 . -2/7)))
 )
+
+(mat popcount
+  (error? (fxpopcount #f))
+  (error? (fxpopcount 1.0))
+  (error? (fxpopcount (expt 2 100)))
+  (error? (fxpopcount -1))
+  (error? (fxpopcount32 #f))
+  (error? (fxpopcount32 1.0))
+  (error? (fxpopcount32 (expt 2 100)))
+  (error? (fxpopcount32 -1))
+  (error? (fxpopcount16 #f))
+  (error? (fxpopcount16 1.0))
+  (error? (fxpopcount16 (expt 2 100)))
+  (error? (fxpopcount16 (expt 2 20)))
+  (error? (fxpopcount16 -1))
+  (eqv? 0 (fxpopcount 0))
+  (eqv? 0 (fxpopcount32 0))
+  (eqv? 0 (fxpopcount16 0))
+  (eqv? 3 (fxpopcount #b1001001))
+  (eqv? 3 (fxpopcount32 #b1001001))
+  (eqv? 3 (fxpopcount16 #b1001001))
+  (eqv? 28 (fxpopcount #b1111111111111111111111111111))
+  (eqv? 28 (fxpopcount32 #b1111111111111111111111111111))
+  (eqv? 16 (fxpopcount #b1111111111111111))
+  (eqv? 16 (fxpopcount32 #b1111111111111111))
+  (eqv? 16 (fxpopcount16 #b1111111111111111))
+)
diff --git a/mats/5_6.ms b/mats/5_6.ms
index 6b46205815..4dda16a7fd 100644
--- a/mats/5_6.ms
+++ b/mats/5_6.ms
@@ -1300,3 +1300,153 @@
              (collect 0)
              (eq? g1 (vector-ref vec2 2))))))
 )
+
+(mat stencil-vector
+  (>= (stencil-vector-mask-width) 24)
+  (stencil-vector? (stencil-vector 1 0))
+  (not (stencil-vector? 10))
+
+  (begin
+    (define alphabet-sv (stencil-vector #b10101010101010101010 'a 'b 'c 'd 'e 'f 'g 'h 'i 'j))
+    (define mod-sv (stencil-vector #b1001 'a 'b))
+    (and (stencil-vector? alphabet-sv)
+         (stencil-vector? mod-sv)))
+
+  (error? (stencil-vector 'x))
+  (error? (stencil-vector -1))
+  (error? (stencil-vector 0 'apple))
+  (error? (stencil-vector 3 'apple))
+  (error? (stencil-vector 3 'apple))
+  (error? (stencil-vector (expt 2 (stencil-vector-mask-width)) 'a))
+
+  (error? (stencil-vector-length 3))
+  (error? (stencil-vector-mask 3))
+  (error? (stencil-vector-ref 3 0))
+
+  (eqv? 2 (stencil-vector-length (stencil-vector 3 'apple 'banana)))
+  (eqv? 3 (stencil-vector-mask (stencil-vector 3 'apple 'banana)))
+  (eqv? 2 (stencil-vector-length (stencil-vector 514 'apple 'banana)))
+  (eqv? 514 (stencil-vector-mask (stencil-vector 514 'apple 'banana)))
+  (eqv? 10 (stencil-vector-length (stencil-vector 1023 'a 'b 'c 'd 'e 'f 'g 'h 'i 'j)))
+  (eqv? 1 (stencil-vector-length (stencil-vector (expt 2 (sub1 (stencil-vector-mask-width))) 'a)))
+  (eqv? 1 (stencil-vector-length (stencil-vector (expt 2 (- (stencil-vector-mask-width) 2)) 'a)))
+
+  (error? (stencil-vector-ref (stencil-vector 0) 0))
+  (error? (stencil-vector-ref (stencil-vector 3 'apple 'banana) 2))
+  (error? (stencil-vector-ref (stencil-vector 3 'apple 'banana) -1))
+  (error? (stencil-vector-ref (stencil-vector 3 'apple 'banana) (expt 2 100)))
+  (error? (stencil-vector-ref (stencil-vector 3 'apple 'banana) 1.0))
+
+  (eq? 'a (stencil-vector-ref alphabet-sv 0))
+  (eq? 'f (stencil-vector-ref alphabet-sv 5))
+  (eq? 'j (stencil-vector-ref alphabet-sv 9))
+
+  (error? (stencil-vector-set! (stencil-vector 0) 0 'x))
+  (error? (stencil-vector-set! (stencil-vector 3 'apple 'banana) 2 'x))
+  (error? (stencil-vector-set! (stencil-vector 3 'apple 'banana) -1 'x))
+  (error? (stencil-vector-set! (stencil-vector 3 'apple 'banana) (expt 2 100) 'x))
+  (error? (stencil-vector-set! (stencil-vector 3 'apple 'banana) 1.0 'x))
+
+  (equal? '(ok b) (begin
+                    (stencil-vector-set! mod-sv 0 'ok)
+                    (list (stencil-vector-ref mod-sv 0)
+                          (stencil-vector-ref mod-sv 1))))
+
+  (error? (stencil-vector-update 1 0 1 'z))
+  (error? (stencil-vector-update alphabet-sv 0 2 'z))
+  (error? (stencil-vector-update alphabet-sv 1 0))
+  (error? (stencil-vector-update alphabet-sv 0 1))
+  (error? (stencil-vector-update alphabet-sv 0 1 'a 'b))
+
+  ;; add 1
+  (let ([v (stencil-vector-update alphabet-sv 0 1 'z)])
+    (and (eqv? 11 (stencil-vector-length v))
+         (eq? 'z (stencil-vector-ref v 0))
+         (eq? 'a (stencil-vector-ref v 1))
+         (eq? 'b (stencil-vector-ref v 2))
+         (eq? 'j (stencil-vector-ref v 10))))
+  ;; add 2
+  (let ([v (stencil-vector-update alphabet-sv 0 #b10001 'z 'w)])
+    (and (eqv? 12 (stencil-vector-length v))
+         (eq? 'z (stencil-vector-ref v 0))
+         (eq? 'a (stencil-vector-ref v 1))
+         (eq? 'b (stencil-vector-ref v 2))
+         (eq? 'w (stencil-vector-ref v 3))
+         (eq? 'c (stencil-vector-ref v 4))
+         (eq? 'j (stencil-vector-ref v 11))))
+  ;; remove 1
+  (let ([v (stencil-vector-update alphabet-sv 2 0)])
+    (and (eqv? 9 (stencil-vector-length v))
+         (eq? 'b (stencil-vector-ref v 0))
+         (eq? 'c (stencil-vector-ref v 1))
+         (eq? 'j (stencil-vector-ref v 8))))
+  ;; remove 2
+  (let ([v (stencil-vector-update alphabet-sv #b10000010 0)])
+    (and (eqv? 8 (stencil-vector-length v))
+         (eq? 'b (stencil-vector-ref v 0))
+         (eq? 'c (stencil-vector-ref v 1))
+         (eq? 'e (stencil-vector-ref v 2))
+         (eq? 'j (stencil-vector-ref v 7))))
+  ;; add 2 and remove 2
+  (let ([v (stencil-vector-update alphabet-sv #b10000010 #b10001 'z 'w)])
+    (and (eqv? 10 (stencil-vector-length v))
+         (eq? 'z (stencil-vector-ref v 0))
+         (eq? 'b (stencil-vector-ref v 1))
+         (eq? 'w (stencil-vector-ref v 2))
+         (eq? 'c (stencil-vector-ref v 3))
+         (eq? 'e (stencil-vector-ref v 4))
+         (eq? 'j (stencil-vector-ref v 9))))
+  ;; remove all
+  (eqv? 0 (stencil-vector-length (stencil-vector-update alphabet-sv #b10101010101010101010 0)))
+
+  (error? (stencil-vector-truncate! 1 0))
+  (error? (stencil-vector-truncate! (stencil-vector 0) 1))
+  (error? (stencil-vector-truncate! (stencil-vector 7) 15))
+  (error? (stencil-vector-truncate! (stencil-vector 6) 7))
+  (let ([sv (stencil-vector 7 1 2 3)])
+    (stencil-vector-truncate! sv 3)
+    (and (stencil-vector? sv)
+         (eqv? (stencil-vector-mask sv) 3)
+         (eqv? (stencil-vector-ref sv 0) 1)
+         (eqv? (stencil-vector-ref sv 1) 2)))
+  (let ([sv (stencil-vector 7 1 2 3)])
+    (stencil-vector-truncate! sv 6)
+    (and (stencil-vector? sv)
+         (eqv? (stencil-vector-mask sv) 6)
+         (eqv? (stencil-vector-ref sv 0) 1)
+         (eqv? (stencil-vector-ref sv 1) 2)))
+
+  ;; check fasl:
+  (let ([s (stencil-vector 42 'a 'b 'c)])
+    (define-values (o get) (open-bytevector-output-port))
+    (fasl-write s o)
+    (equal? s (fasl-read (open-bytevector-input-port (get)))))
+   
+  ;; try to check GC interaction
+  (let loop ([n 100000]
+             [v1 (stencil-vector 7 'a 'b 'c)]
+             [v2 (stencil-vector 28 "a" "b" "c")]
+             [v3 (stencil-vector 15 (vector 'x) (vector 'y) (vector 'z)  (vector 'w))])
+    (or (fx= n 0)
+        (and
+         (fx= (stencil-vector-mask v1) 7)
+         (eqv? (stencil-vector-ref v1 1) 'b)
+         (fx= (stencil-vector-mask v2) 28)
+         (equal? (stencil-vector-ref v2 0) "a")
+         (equal? (stencil-vector-ref v2 1) "b")
+         (equal? (stencil-vector-ref v2 2) "c")
+         (fx= (stencil-vector-mask v3) 15)
+         (equal? (stencil-vector-ref v3 0) '#(x))
+         (equal? (stencil-vector-ref v3 1) '#(y))
+         (equal? (stencil-vector-ref v3 2) '#(z))
+         (equal? (stencil-vector-ref v3 3) '#(w))
+         (loop (fx- n 1)
+               (stencil-vector-update
+                (stencil-vector-update v1 3 1 'a)
+                0 2 'b)
+               (stencil-vector-update v2 12 12 (string #\a) (string #\b))
+               (stencil-vector-update
+                (stencil-vector-update v3 6 16 (vector 'extra))
+                16 6 (vector 'y) (vector 'z))))))
+
+  )
diff --git a/mats/hash.ms b/mats/hash.ms
index 07d5e70244..4cdfbc54a5 100644
--- a/mats/hash.ms
+++ b/mats/hash.ms
@@ -3828,6 +3828,11 @@
          (exact? hc)
          (>= hc 0)
          (= (string-ci-hash "HelLo") hc)))
+  (let ([hc (equal-hash (stencil-vector 3 'one 'two))])
+    (and (integer? hc)
+         (exact? hc)
+         (>= hc 0)
+         (= (equal-hash (stencil-vector 3 'one 'two)) hc)))
   (let f ([ls (oblist)])
     (define okay?
       (lambda (x)
diff --git a/mats/misc.ms b/mats/misc.ms
index b09f0c9f16..747916fd29 100644
--- a/mats/misc.ms
+++ b/mats/misc.ms
@@ -2511,6 +2511,7 @@
                                 "apple" 'banana
                                 (make-vfasl-demo 10 "11")
                                 (vector 1 'two "three")
+                                (stencil-vector 30 'one 2.0 0+3i "four")
                                 (box 88)
                                 "" '#() '#vu8() (make-fxvector 0)
                                 (string->immutable-string "") (vector->immutable-vector '#())
@@ -2523,7 +2524,8 @@
                                   (positive? (string-length a)))
                              (and (vector? a)
                                   (positive? (vector-length a)))
-                             (box? a))
+                             (box? a)
+                             (stencil-vector? a))
                          (equal? a b))
                     (and (vfasl-demo? a)
                          (vfasl-demo? b)
@@ -2531,7 +2533,9 @@
                                  (vfasl-demo-x b))
                          (equal? (vfasl-demo-y a)
                                  (vfasl-demo-y b)))
-                    (printf "~s ~s\n" a b)))
+                    (begin
+                      (printf "~s ~s\n" a b)
+                      #f)))
               vfasl-content
               v))
     (compile-to-file (list `(define (vfasled) ',vfasl-content)
diff --git a/mats/patch-compile-0-t-f-f b/mats/patch-compile-0-t-f-f
index bba19e3f5f..5d4fcc6f83 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-12-18 09:13:02.000000000 -0700
---- errors-compile-0-t-f-f	2019-12-18 09:31:59.000000000 -0700
+*** errors-compile-0-f-f-f	2020-01-06 04:40:07.000000000 -0700
+--- errors-compile-0-t-f-f	2020-01-06 04:59:35.000000000 -0700
 ***************
 *** 93,99 ****
   3.mo:Expected error in mat case-lambda: "incorrect number of arguments 2 to #<procedure foo>".
@@ -1388,10 +1388,10 @@
   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".
 ***************
-*** 1725,1885 ****
-  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)".
+*** 1738,1898 ****
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: 1267650600228229401496703205376 is not a 16-bit fixnum".
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: 1048576 is not a 16-bit fixnum".
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: -1 is not a 16-bit fixnum".
 ! 5_4.mo:Expected error in mat char=?/char-ci=?: "incorrect argument count in call (char=?)".
   5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
   5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
@@ -1550,10 +1550,10 @@
   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".
---- 1725,1885 ----
-  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)".
+--- 1738,1898 ----
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: 1267650600228229401496703205376 is not a 16-bit fixnum".
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: 1048576 is not a 16-bit fixnum".
+  5_3.mo:Expected error in mat popcount: "fxpopcount16: -1 is not a 16-bit fixnum".
 ! 5_4.mo:Expected error in mat char=?/char-ci=?: "incorrect number of arguments 0 to #<procedure char=?>".
   5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
   5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
@@ -1713,7 +1713,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".
 ***************
-*** 1898,1910 ****
+*** 1911,1923 ****
   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".
@@ -1727,7 +1727,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".
---- 1898,1910 ----
+--- 1911,1923 ----
   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".
@@ -1742,7 +1742,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".
 ***************
-*** 1919,2064 ****
+*** 1932,2077 ****
   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".
@@ -1889,7 +1889,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".
---- 1919,2064 ----
+--- 1932,2077 ----
   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".
@@ -2037,7 +2037,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".
 ***************
-*** 2066,2104 ****
+*** 2079,2117 ****
   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".
@@ -2077,7 +2077,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".
---- 2066,2104 ----
+--- 2079,2117 ----
   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".
@@ -2118,7 +2118,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".
 ***************
-*** 2122,2130 ****
+*** 2135,2143 ****
   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"".
@@ -2128,7 +2128,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"".
---- 2122,2130 ----
+--- 2135,2143 ----
   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"".
@@ -2139,7 +2139,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"".
 ***************
-*** 2139,2191 ****
+*** 2152,2204 ****
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: a is not a string".
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: b is not a string".
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: b is not a string".
@@ -2193,7 +2193,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".
---- 2139,2191 ----
+--- 2152,2204 ----
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: a is not a string".
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: b is not a string".
   5_5.mo:Expected error in mat string-append-immutable: "string-append-immutable: b is not a string".
@@ -2248,7 +2248,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".
 ***************
-*** 2202,2231 ****
+*** 2215,2244 ****
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value -500".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 1e+100".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".
@@ -2279,7 +2279,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)".
---- 2202,2231 ----
+--- 2215,2244 ----
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value -500".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 1e+100".
   bytevector.mo:Expected error in mat bytevector: "bytevector: invalid value 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".
@@ -2311,7 +2311,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)".
 ***************
-*** 2234,2243 ****
+*** 2247,2256 ****
   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".
@@ -2322,7 +2322,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)".
---- 2234,2243 ----
+--- 2247,2256 ----
   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".
@@ -2334,7 +2334,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)".
 ***************
-*** 2246,2254 ****
+*** 2259,2267 ****
   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".
@@ -2344,7 +2344,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)".
---- 2246,2254 ----
+--- 2259,2267 ----
   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".
@@ -2355,7 +2355,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)".
 ***************
-*** 2256,2264 ****
+*** 2269,2277 ****
   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)".
@@ -2365,7 +2365,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)".
---- 2256,2264 ----
+--- 2269,2277 ----
   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)".
@@ -2376,7 +2376,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)".
 ***************
-*** 2266,2275 ****
+*** 2279,2288 ****
   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)".
@@ -2387,7 +2387,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 ...)".
---- 2266,2275 ----
+--- 2279,2288 ----
   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)".
@@ -2399,7 +2399,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 ...)".
 ***************
-*** 2283,2292 ****
+*** 2296,2305 ****
   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"".
@@ -2410,7 +2410,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 ...)".
---- 2283,2292 ----
+--- 2296,2305 ----
   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"".
@@ -2422,7 +2422,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 ...)".
 ***************
-*** 2300,2308 ****
+*** 2313,2321 ****
   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"".
@@ -2432,7 +2432,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)".
---- 2300,2308 ----
+--- 2313,2321 ----
   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"".
@@ -2443,7 +2443,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)".
 ***************
-*** 2312,2320 ****
+*** 2325,2333 ****
   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".
@@ -2453,7 +2453,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)".
---- 2312,2320 ----
+--- 2325,2333 ----
   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".
@@ -2464,7 +2464,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)".
 ***************
-*** 2324,2333 ****
+*** 2337,2346 ****
   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".
@@ -2475,7 +2475,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 ...)".
---- 2324,2333 ----
+--- 2337,2346 ----
   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".
@@ -2487,7 +2487,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 ...)".
 ***************
-*** 2343,2352 ****
+*** 2356,2365 ****
   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".
@@ -2498,7 +2498,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 ...)".
---- 2343,2352 ----
+--- 2356,2365 ----
   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".
@@ -2510,7 +2510,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 ...)".
 ***************
-*** 2362,2371 ****
+*** 2375,2384 ****
   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".
@@ -2521,7 +2521,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 ...)".
---- 2362,2371 ----
+--- 2375,2384 ----
   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".
@@ -2533,7 +2533,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 ...)".
 ***************
-*** 2375,2384 ****
+*** 2388,2397 ****
   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".
@@ -2544,7 +2544,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 ...)".
---- 2375,2384 ----
+--- 2388,2397 ----
   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".
@@ -2556,7 +2556,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 ...)".
 ***************
-*** 2388,2398 ****
+*** 2401,2411 ****
   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".
@@ -2568,7 +2568,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 ...)".
---- 2388,2398 ----
+--- 2401,2411 ----
   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".
@@ -2581,7 +2581,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 ...)".
 ***************
-*** 2406,2416 ****
+*** 2419,2429 ****
   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 ...)".
@@ -2593,7 +2593,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 ...)".
---- 2406,2416 ----
+--- 2419,2429 ----
   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 ...)".
@@ -2606,7 +2606,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 ...)".
 ***************
-*** 2424,2432 ****
+*** 2437,2445 ****
   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 ...)".
@@ -2616,7 +2616,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 ...)".
---- 2424,2432 ----
+--- 2437,2445 ----
   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 ...)".
@@ -2627,7 +2627,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 ...)".
 ***************
-*** 2438,2446 ****
+*** 2451,2459 ****
   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 ...)".
@@ -2637,7 +2637,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 ...)".
---- 2438,2446 ----
+--- 2451,2459 ----
   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 ...)".
@@ -2648,7 +2648,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 ...)".
 ***************
-*** 2452,2461 ****
+*** 2465,2474 ****
   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 ...)".
@@ -2659,7 +2659,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 ...)".
---- 2452,2461 ----
+--- 2465,2474 ----
   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 ...)".
@@ -2671,7 +2671,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 ...)".
 ***************
-*** 2482,2491 ****
+*** 2495,2504 ****
   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"".
@@ -2682,7 +2682,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 ...)".
---- 2482,2491 ----
+--- 2495,2504 ----
   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"".
@@ -2694,7 +2694,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 ...)".
 ***************
-*** 2512,2521 ****
+*** 2525,2534 ****
   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"".
@@ -2705,7 +2705,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 ...)".
---- 2512,2521 ----
+--- 2525,2534 ----
   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"".
@@ -2717,7 +2717,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 ...)".
 ***************
-*** 2525,2534 ****
+*** 2538,2547 ****
   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".
@@ -2728,7 +2728,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 ...)".
---- 2525,2534 ----
+--- 2538,2547 ----
   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".
@@ -2740,7 +2740,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 ...)".
 ***************
-*** 2538,2548 ****
+*** 2551,2561 ****
   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".
@@ -2752,7 +2752,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 ...)".
---- 2538,2548 ----
+--- 2551,2561 ----
   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".
@@ -2765,7 +2765,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 ...)".
 ***************
-*** 2557,2567 ****
+*** 2570,2580 ****
   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 ...)".
@@ -2777,7 +2777,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 ...)".
---- 2557,2567 ----
+--- 2570,2580 ----
   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 ...)".
@@ -2790,7 +2790,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 ...)".
 ***************
-*** 2576,2585 ****
+*** 2589,2598 ****
   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 ...)".
@@ -2801,7 +2801,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 ...)".
---- 2576,2585 ----
+--- 2589,2598 ----
   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 ...)".
@@ -2813,7 +2813,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 ...)".
 ***************
-*** 2589,2598 ****
+*** 2602,2611 ****
   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".
@@ -2824,7 +2824,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 ...)".
---- 2589,2598 ----
+--- 2602,2611 ----
   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".
@@ -2836,7 +2836,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 ...)".
 ***************
-*** 2602,2612 ****
+*** 2615,2625 ****
   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".
@@ -2848,7 +2848,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 ...)".
---- 2602,2612 ----
+--- 2615,2625 ----
   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".
@@ -2861,7 +2861,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 ...)".
 ***************
-*** 2620,2630 ****
+*** 2633,2643 ****
   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 ...)".
@@ -2873,7 +2873,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 ...)".
---- 2620,2630 ----
+--- 2633,2643 ----
   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 ...)".
@@ -2886,7 +2886,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 ...)".
 ***************
-*** 2638,2647 ****
+*** 2651,2660 ****
   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 ...)".
@@ -2897,7 +2897,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 ...)".
---- 2638,2647 ----
+--- 2651,2660 ----
   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 ...)".
@@ -2909,7 +2909,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 ...)".
 ***************
-*** 2651,2660 ****
+*** 2664,2673 ****
   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".
@@ -2920,7 +2920,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 ...)".
---- 2651,2660 ----
+--- 2664,2673 ----
   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".
@@ -2932,7 +2932,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 ...)".
 ***************
-*** 2664,2674 ****
+*** 2677,2687 ****
   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".
@@ -2944,7 +2944,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 ...)".
---- 2664,2674 ----
+--- 2677,2687 ----
   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".
@@ -2957,7 +2957,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 ...)".
 ***************
-*** 2682,2692 ****
+*** 2695,2705 ****
   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 ...)".
@@ -2969,7 +2969,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 ...)".
---- 2682,2692 ----
+--- 2695,2705 ----
   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 ...)".
@@ -2982,7 +2982,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 ...)".
 ***************
-*** 2700,2709 ****
+*** 2713,2722 ****
   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 ...)".
@@ -2993,7 +2993,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 ...)".
---- 2700,2709 ----
+--- 2713,2722 ----
   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 ...)".
@@ -3005,7 +3005,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 ...)".
 ***************
-*** 2713,2722 ****
+*** 2726,2735 ****
   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".
@@ -3016,7 +3016,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 ...)".
---- 2713,2722 ----
+--- 2726,2735 ----
   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".
@@ -3028,7 +3028,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 ...)".
 ***************
-*** 2726,2736 ****
+*** 2739,2749 ****
   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".
@@ -3040,7 +3040,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 ...)".
---- 2726,2736 ----
+--- 2739,2749 ----
   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".
@@ -3053,7 +3053,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 ...)".
 ***************
-*** 2744,2754 ****
+*** 2757,2767 ****
   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 ...)".
@@ -3065,7 +3065,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 ...)".
---- 2744,2754 ----
+--- 2757,2767 ----
   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 ...)".
@@ -3078,7 +3078,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 ...)".
 ***************
-*** 2762,2770 ****
+*** 2775,2783 ****
   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 ...)".
@@ -3088,7 +3088,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 ...)".
---- 2762,2770 ----
+--- 2775,2783 ----
   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 ...)".
@@ -3099,7 +3099,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 ...)".
 ***************
-*** 2794,2802 ****
+*** 2807,2815 ****
   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 ...)".
@@ -3109,7 +3109,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 ...)".
---- 2794,2802 ----
+--- 2807,2815 ----
   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 ...)".
@@ -3120,7 +3120,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 ...)".
 ***************
-*** 2826,2835 ****
+*** 2839,2848 ****
   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 ...)".
@@ -3131,7 +3131,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 ...)".
---- 2826,2835 ----
+--- 2839,2848 ----
   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 ...)".
@@ -3143,7 +3143,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 ...)".
 ***************
-*** 2863,2872 ****
+*** 2876,2885 ****
   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"".
@@ -3154,7 +3154,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 ...)".
---- 2863,2872 ----
+--- 2876,2885 ----
   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"".
@@ -3166,7 +3166,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 ...)".
 ***************
-*** 2900,2909 ****
+*** 2913,2922 ****
   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"".
@@ -3177,7 +3177,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 ...)".
---- 2900,2909 ----
+--- 2913,2922 ----
   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"".
@@ -3189,7 +3189,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 ...)".
 ***************
-*** 2919,2928 ****
+*** 2932,2941 ****
   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 1e+23".
@@ -3200,7 +3200,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 ...)".
---- 2919,2928 ----
+--- 2932,2941 ----
   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 1e+23".
@@ -3212,7 +3212,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 ...)".
 ***************
-*** 2938,2948 ****
+*** 2951,2961 ****
   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 1e+23".
@@ -3224,7 +3224,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 ...)".
---- 2938,2948 ----
+--- 2951,2961 ----
   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 1e+23".
@@ -3237,7 +3237,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 ...)".
 ***************
-*** 2961,2971 ****
+*** 2974,2984 ****
   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".
@@ -3249,7 +3249,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 ...)".
---- 2961,2971 ----
+--- 2974,2984 ----
   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".
@@ -3262,7 +3262,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 ...)".
 ***************
-*** 2984,2992 ****
+*** 2997,3005 ****
   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".
@@ -3272,7 +3272,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 ...)".
---- 2984,2992 ----
+--- 2997,3005 ----
   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".
@@ -3283,7 +3283,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 ...)".
 ***************
-*** 3022,3030 ****
+*** 3035,3043 ****
   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 ...)".
@@ -3293,7 +3293,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 ...)".
---- 3022,3030 ----
+--- 3035,3043 ----
   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 ...)".
@@ -3304,7 +3304,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 ...)".
 ***************
-*** 3064,3073 ****
+*** 3077,3086 ****
   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 ...)".
@@ -3315,7 +3315,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 ...)".
---- 3064,3073 ----
+--- 3077,3086 ----
   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 ...)".
@@ -3327,7 +3327,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 ...)".
 ***************
-*** 3101,3110 ****
+*** 3114,3123 ****
   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".
@@ -3338,7 +3338,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 ...)".
---- 3101,3110 ----
+--- 3114,3123 ----
   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".
@@ -3350,7 +3350,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 ...)".
 ***************
-*** 3150,3159 ****
+*** 3163,3172 ****
   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".
@@ -3361,7 +3361,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 ...)".
---- 3150,3159 ----
+--- 3163,3172 ----
   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".
@@ -3373,7 +3373,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 ...)".
 ***************
-*** 3165,3174 ****
+*** 3178,3187 ****
   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".
@@ -3384,7 +3384,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 ...)".
---- 3165,3174 ----
+--- 3178,3187 ----
   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".
@@ -3396,7 +3396,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 ...)".
 ***************
-*** 3184,3194 ****
+*** 3197,3207 ****
   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".
@@ -3408,7 +3408,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 ...)".
---- 3184,3194 ----
+--- 3197,3207 ----
   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".
@@ -3421,7 +3421,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 ...)".
 ***************
-*** 3205,3215 ****
+*** 3218,3228 ****
   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".
@@ -3433,7 +3433,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 ...)".
---- 3205,3215 ----
+--- 3218,3228 ----
   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".
@@ -3446,7 +3446,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 ...)".
 ***************
-*** 3230,3240 ****
+*** 3243,3253 ****
   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".
@@ -3458,7 +3458,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 ...)".
---- 3230,3240 ----
+--- 3243,3253 ----
   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".
@@ -3471,7 +3471,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 ...)".
 ***************
-*** 3269,3279 ****
+*** 3282,3292 ****
   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".
@@ -3483,7 +3483,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 ...)".
---- 3269,3279 ----
+--- 3282,3292 ----
   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".
@@ -3496,7 +3496,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 ...)".
 ***************
-*** 3311,3322 ****
+*** 3324,3335 ****
   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".
@@ -3509,7 +3509,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 ...)".
---- 3311,3322 ----
+--- 3324,3335 ----
   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".
@@ -3523,7 +3523,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 ...)".
 ***************
-*** 3375,3386 ****
+*** 3388,3399 ****
   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".
@@ -3536,7 +3536,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 ...)".
---- 3375,3386 ----
+--- 3388,3399 ----
   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".
@@ -3550,7 +3550,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 ...)".
 ***************
-*** 3439,3454 ****
+*** 3452,3467 ****
   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".
@@ -3567,7 +3567,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".
---- 3439,3454 ----
+--- 3452,3467 ----
   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".
@@ -3585,7 +3585,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".
 ***************
-*** 3472,3480 ****
+*** 3485,3493 ****
   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 ...)".
@@ -3595,7 +3595,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 ...)".
---- 3472,3480 ----
+--- 3485,3493 ----
   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 ...)".
@@ -3606,7 +3606,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 ...)".
 ***************
-*** 3482,3522 ****
+*** 3495,3535 ****
   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 ...)".
@@ -3648,7 +3648,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".
---- 3482,3522 ----
+--- 3495,3535 ----
   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 ...)".
@@ -3691,7 +3691,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".
 ***************
-*** 3555,3563 ****
+*** 3568,3576 ****
   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"".
@@ -3701,7 +3701,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".
---- 3555,3563 ----
+--- 3568,3576 ----
   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"".
@@ -3712,7 +3712,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".
 ***************
-*** 3596,3604 ****
+*** 3609,3617 ****
   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"".
@@ -3722,7 +3722,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".
---- 3596,3604 ----
+--- 3609,3617 ----
   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"".
@@ -3733,7 +3733,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".
 ***************
-*** 3618,3626 ****
+*** 3631,3639 ****
   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".
@@ -3743,7 +3743,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".
---- 3618,3626 ----
+--- 3631,3639 ----
   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".
@@ -3754,7 +3754,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".
 ***************
-*** 3640,3648 ****
+*** 3653,3661 ****
   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".
@@ -3764,7 +3764,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"".
---- 3640,3648 ----
+--- 3653,3661 ----
   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".
@@ -3775,7 +3775,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"".
 ***************
-*** 3693,3704 ****
+*** 3706,3717 ****
   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".
@@ -3788,7 +3788,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".
---- 3693,3704 ----
+--- 3706,3717 ----
   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".
@@ -3802,7 +3802,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".
 ***************
-*** 3775,3795 ****
+*** 3788,3808 ****
   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]".
@@ -3824,7 +3824,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)".
---- 3775,3795 ----
+--- 3788,3808 ----
   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]".
@@ -3847,7 +3847,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)".
 ***************
-*** 3822,3828 ****
+*** 3835,3841 ****
   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".
@@ -3855,7 +3855,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".
---- 3822,3828 ----
+--- 3835,3841 ----
   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".
@@ -3864,7 +3864,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".
 ***************
-*** 3876,3883 ****
+*** 3889,3896 ****
   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".
@@ -3873,7 +3873,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".
---- 3876,3883 ----
+--- 3889,3896 ----
   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".
@@ -3883,7 +3883,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".
 ***************
-*** 3892,3907 ****
+*** 3905,3920 ****
   misc.mo:Expected error in mat pariah: "invalid syntax (pariah)".
   misc.mo:Expected error in mat pariah: "invalid syntax (pariah . 17)".
   misc.mo:Expected error in mat procedure-arity-mask: "procedure-arity-mask: 17 is not a procedure".
@@ -3900,7 +3900,7 @@
   misc.mo:Expected error in mat wrapper-procedure: "make-arity-wrapper-procedure: 1 is not a procedure".
   misc.mo:Expected error in mat wrapper-procedure: "make-arity-wrapper-procedure: not-a-procedure is not a procedure".
   misc.mo:Expected error in mat wrapper-procedure: "make-arity-wrapper-procedure: not-an-exact-integer is not an arity mask".
---- 3892,3907 ----
+--- 3905,3920 ----
   misc.mo:Expected error in mat pariah: "invalid syntax (pariah)".
   misc.mo:Expected error in mat pariah: "invalid syntax (pariah . 17)".
   misc.mo:Expected error in mat procedure-arity-mask: "procedure-arity-mask: 17 is not a procedure".
@@ -3918,7 +3918,7 @@
   misc.mo:Expected error in mat wrapper-procedure: "make-arity-wrapper-procedure: not-a-procedure is not a procedure".
   misc.mo:Expected error in mat wrapper-procedure: "make-arity-wrapper-procedure: not-an-exact-integer is not an arity mask".
 ***************
-*** 3911,3923 ****
+*** 3924,3936 ****
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: 1 is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: #<procedure> is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: #<procedure> is not a wrapper procedure".
@@ -3932,7 +3932,7 @@
   misc.mo:Expected error in mat wrapper-procedure: "set-wrapper-procedure-data!: 1 is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "set-wrapper-procedure-data!: #<procedure> is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "set-wrapper-procedure-data!: #<procedure> is not a wrapper procedure".
---- 3911,3923 ----
+--- 3924,3936 ----
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: 1 is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: #<procedure> is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "wrapper-procedure-data: #<procedure> is not a wrapper procedure".
@@ -3947,7 +3947,7 @@
   misc.mo:Expected error in mat wrapper-procedure: "set-wrapper-procedure-data!: #<procedure> is not a wrapper procedure".
   misc.mo:Expected error in mat wrapper-procedure: "set-wrapper-procedure-data!: #<procedure> is not a wrapper procedure".
 ***************
-*** 3937,3945 ****
+*** 3950,3958 ****
   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".
@@ -3957,7 +3957,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".
---- 3937,3945 ----
+--- 3950,3958 ----
   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".
@@ -3968,7 +3968,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".
 ***************
-*** 4003,4011 ****
+*** 4016,4024 ****
   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".
@@ -3978,7 +3978,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".
---- 4003,4011 ----
+--- 4016,4024 ----
   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".
@@ -3989,7 +3989,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".
 ***************
-*** 4020,4028 ****
+*** 4033,4041 ****
   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".
@@ -3999,7 +3999,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".
---- 4020,4028 ----
+--- 4033,4041 ----
   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".
@@ -4010,7 +4010,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".
 ***************
-*** 4037,4054 ****
+*** 4050,4067 ****
   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".
@@ -4029,7 +4029,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".
---- 4037,4054 ----
+--- 4050,4067 ----
   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".
@@ -4049,7 +4049,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".
 ***************
-*** 4059,4067 ****
+*** 4072,4080 ****
   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".
@@ -4059,7 +4059,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)".
---- 4059,4067 ----
+--- 4072,4080 ----
   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".
@@ -4070,7 +4070,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)".
 ***************
-*** 4090,4097 ****
+*** 4131,4138 ****
   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".
@@ -4079,7 +4079,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".
---- 4090,4097 ----
+--- 4131,4138 ----
   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".
@@ -4089,7 +4089,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".
 ***************
-*** 4129,4150 ****
+*** 4170,4191 ****
   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".
@@ -4112,7 +4112,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".
---- 4129,4150 ----
+--- 4170,4191 ----
   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".
@@ -4136,7 +4136,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".
 ***************
-*** 4153,4159 ****
+*** 4194,4200 ****
   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".
@@ -4144,7 +4144,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".
---- 4153,4159 ----
+--- 4194,4200 ----
   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".
@@ -4153,7 +4153,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".
 ***************
-*** 4170,4177 ****
+*** 4211,4218 ****
   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".
@@ -4162,7 +4162,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".
---- 4170,4177 ----
+--- 4211,4218 ----
   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".
@@ -4172,7 +4172,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".
 ***************
-*** 6655,6686 ****
+*** 6696,6727 ****
   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>".
@@ -4205,7 +4205,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".
---- 6655,6686 ----
+--- 6696,6727 ----
   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>".
@@ -4239,7 +4239,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".
 ***************
-*** 6691,6697 ****
+*** 6732,6738 ****
   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".
@@ -4247,7 +4247,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".
---- 6691,6697 ----
+--- 6732,6738 ----
   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".
@@ -4256,7 +4256,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".
 ***************
-*** 6874,6886 ****
+*** 6915,6927 ****
   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>".
@@ -4270,7 +4270,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".
---- 6874,6886 ----
+--- 6915,6927 ----
   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>".
@@ -4285,7 +4285,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".
 ***************
-*** 6906,6921 ****
+*** 6947,6962 ****
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
   io.mo:Expected error in mat compression: "port-file-compressed!: #<output port string> is not a file port".
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
@@ -4302,7 +4302,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".
---- 6906,6921 ----
+--- 6947,6962 ----
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
   io.mo:Expected error in mat compression: "port-file-compressed!: #<output port string> is not a file port".
   io.mo:Expected error in mat compression: "port-file-compressed!: cannot compress input/output port #<binary input/output port testfile.ss>".
@@ -4320,7 +4320,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".
 ***************
-*** 6987,7002 ****
+*** 7028,7043 ****
   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".
@@ -4337,7 +4337,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>".
---- 6987,7002 ----
+--- 7028,7043 ----
   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".
@@ -4355,7 +4355,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>".
 ***************
-*** 7168,7174 ****
+*** 7209,7215 ****
   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".
@@ -4363,7 +4363,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
---- 7168,7174 ----
+--- 7209,7215 ----
   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".
@@ -4372,7 +4372,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
 ***************
-*** 7184,7210 ****
+*** 7225,7251 ****
   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 compile-whole-library: "separate-eval: Exception in compile-whole-program: encountered library (testfile-deja-vu-one) in testfile-deja-vu-dup.wpo, but had already encountered it in testfile-deja-vu-two.wpo
   7.mo:Expected error in mat top-level-value-functions: "top-level-bound?: "hello" is not a symbol".
@@ -4400,7 +4400,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".
---- 7184,7210 ----
+--- 7225,7251 ----
   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 compile-whole-library: "separate-eval: Exception in compile-whole-program: encountered library (testfile-deja-vu-one) in testfile-deja-vu-dup.wpo, but had already encountered it in testfile-deja-vu-two.wpo
   7.mo:Expected error in mat top-level-value-functions: "top-level-bound?: "hello" is not a symbol".
@@ -4429,7 +4429,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".
 ***************
-*** 7519,7525 ****
+*** 7560,7566 ****
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 1 to #<procedure>".
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 1 to #<procedure>".
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 3 to #<procedure>".
@@ -4437,7 +4437,7 @@
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 4 to #<procedure constructor>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
---- 7519,7525 ----
+--- 7560,7566 ----
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 1 to #<procedure>".
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 1 to #<procedure>".
   record.mo:Expected error in mat r6rs-records-procedural: "incorrect number of arguments 3 to #<procedure>".
@@ -4446,7 +4446,7 @@
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: record constructor descriptor #<record constructor descriptor> is not for parent of record type #<record type grand-child>".
   record.mo:Expected error in mat r6rs-records-procedural: "make-record-type-descriptor: cannot extend sealed record type #<record type bar>".
 ***************
-*** 7609,7723 ****
+*** 7650,7764 ****
   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 2 to #<procedure>".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments 2 to #<procedure>".
@@ -4562,7 +4562,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".
---- 7609,7723 ----
+--- 7650,7764 ----
   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 2 to #<procedure>".
   hash.mo:Expected error in mat old-hash-table: "incorrect number of arguments 2 to #<procedure>".
@@ -4679,7 +4679,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".
 ***************
-*** 7740,7862 ****
+*** 7781,7903 ****
   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".
@@ -4803,7 +4803,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".
---- 7740,7862 ----
+--- 7781,7903 ----
   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".
@@ -4928,7 +4928,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".
 ***************
-*** 7864,7879 ****
+*** 7905,7920 ****
   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".
@@ -4945,7 +4945,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>".
---- 7864,7879 ----
+--- 7905,7920 ----
   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".
@@ -4963,7 +4963,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>".
 ***************
-*** 7989,7996 ****
+*** 8030,8037 ****
   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)".
@@ -4972,7 +4972,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>".
---- 7989,7996 ----
+--- 8030,8037 ----
   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)".
@@ -4982,7 +4982,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>".
 ***************
-*** 8586,8601 ****
+*** 8627,8642 ****
   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".
@@ -4999,7 +4999,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*>".
---- 8586,8601 ----
+--- 8627,8642 ----
   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".
@@ -5017,7 +5017,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*>".
 ***************
-*** 8694,8716 ****
+*** 8735,8757 ****
   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".
@@ -5041,7 +5041,7 @@
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments 1 to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments 3 to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "$fxu<: <-int> is not a fixnum".
---- 8694,8716 ----
+--- 8735,8757 ----
   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".
@@ -5066,7 +5066,7 @@
   fx.mo:Expected error in mat $fxu<: "incorrect number of arguments 3 to #<procedure $fxu<>".
   fx.mo:Expected error in mat $fxu<: "$fxu<: <-int> is not a fixnum".
 ***************
-*** 8742,8754 ****
+*** 8783,8795 ****
   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".
@@ -5080,7 +5080,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".
---- 8742,8754 ----
+--- 8783,8795 ----
   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".
@@ -5095,7 +5095,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".
 ***************
-*** 8798,8810 ****
+*** 8839,8851 ****
   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".
@@ -5109,7 +5109,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".
---- 8798,8810 ----
+--- 8839,8851 ----
   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".
@@ -5124,7 +5124,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".
 ***************
-*** 8902,8911 ****
+*** 8943,8952 ****
   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".
@@ -5135,7 +5135,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".
---- 8902,8911 ----
+--- 8943,8952 ----
   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".
@@ -5147,7 +5147,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".
 ***************
-*** 8919,8952 ****
+*** 8960,8993 ****
   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".
@@ -5182,7 +5182,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".
---- 8919,8952 ----
+--- 8960,8993 ----
   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".
@@ -5218,7 +5218,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".
 ***************
-*** 8956,8999 ****
+*** 8997,9040 ****
   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".
@@ -5263,7 +5263,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".
---- 8956,8999 ----
+--- 8997,9040 ----
   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".
@@ -5309,7 +5309,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".
 ***************
-*** 9002,9012 ****
+*** 9043,9053 ****
   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>".
@@ -5321,7 +5321,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".
---- 9002,9012 ----
+--- 9043,9053 ----
   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>".
@@ -5334,7 +5334,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".
 ***************
-*** 9066,9075 ****
+*** 9107,9116 ****
   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".
@@ -5345,7 +5345,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".
---- 9066,9075 ----
+--- 9107,9116 ----
   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".
@@ -5357,7 +5357,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".
 ***************
-*** 9085,9094 ****
+*** 9126,9135 ****
   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".
@@ -5368,7 +5368,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".
---- 9085,9094 ----
+--- 9126,9135 ----
   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".
@@ -5380,7 +5380,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".
 ***************
-*** 9104,9113 ****
+*** 9145,9154 ****
   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".
@@ -5391,7 +5391,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".
---- 9104,9113 ----
+--- 9145,9154 ----
   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".
@@ -5403,7 +5403,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".
 ***************
-*** 9123,9133 ****
+*** 9164,9174 ****
   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".
@@ -5415,7 +5415,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".
---- 9123,9133 ----
+--- 9164,9174 ----
   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".
@@ -5428,7 +5428,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".
 ***************
-*** 9150,9159 ****
+*** 9191,9200 ****
   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".
@@ -5439,7 +5439,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".
---- 9150,9159 ----
+--- 9191,9200 ----
   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".
@@ -5451,7 +5451,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".
 ***************
-*** 9169,9186 ****
+*** 9210,9227 ****
   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".
@@ -5470,7 +5470,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".
---- 9169,9186 ----
+--- 9210,9227 ----
   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".
@@ -5490,7 +5490,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".
 ***************
-*** 9188,9194 ****
+*** 9229,9235 ****
   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".
@@ -5498,7 +5498,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".
---- 9188,9194 ----
+--- 9229,9235 ----
   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".
@@ -5507,7 +5507,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".
 ***************
-*** 9196,9202 ****
+*** 9237,9243 ****
   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".
@@ -5515,7 +5515,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".
---- 9196,9202 ----
+--- 9237,9243 ----
   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".
@@ -5524,7 +5524,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".
 ***************
-*** 9204,9210 ****
+*** 9245,9251 ****
   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".
@@ -5532,7 +5532,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".
---- 9204,9210 ----
+--- 9245,9251 ----
   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".
@@ -5541,7 +5541,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".
 ***************
-*** 9212,9218 ****
+*** 9253,9259 ****
   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".
@@ -5549,7 +5549,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".
---- 9212,9218 ----
+--- 9253,9259 ----
   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".
@@ -5558,7 +5558,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".
 ***************
-*** 9220,9259 ****
+*** 9261,9300 ****
   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".
@@ -5599,7 +5599,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".
---- 9220,9259 ----
+--- 9261,9300 ----
   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".
@@ -5641,7 +5641,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".
 ***************
-*** 9263,9269 ****
+*** 9304,9310 ****
   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".
@@ -5649,7 +5649,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".
---- 9263,9269 ----
+--- 9304,9310 ----
   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".
@@ -5658,7 +5658,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".
 ***************
-*** 9273,9355 ****
+*** 9314,9396 ****
   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".
@@ -5742,7 +5742,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".
---- 9273,9355 ----
+--- 9314,9396 ----
   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".
@@ -5827,7 +5827,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".
 ***************
-*** 9369,9404 ****
+*** 9410,9445 ****
   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".
@@ -5864,7 +5864,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".
---- 9369,9404 ----
+--- 9410,9445 ----
   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".
@@ -5902,7 +5902,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".
 ***************
-*** 9406,9413 ****
+*** 9447,9454 ****
   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".
@@ -5911,7 +5911,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".
---- 9406,9413 ----
+--- 9447,9454 ----
   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".
@@ -5921,7 +5921,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".
 ***************
-*** 9415,9421 ****
+*** 9456,9462 ****
   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".
@@ -5929,7 +5929,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".
---- 9415,9421 ----
+--- 9456,9462 ----
   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".
@@ -5938,7 +5938,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".
 ***************
-*** 9423,9429 ****
+*** 9464,9470 ****
   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".
@@ -5946,7 +5946,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".
---- 9423,9429 ----
+--- 9464,9470 ----
   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".
@@ -5955,7 +5955,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".
 ***************
-*** 9431,9444 ****
+*** 9472,9485 ****
   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".
@@ -5970,7 +5970,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".
---- 9431,9444 ----
+--- 9472,9485 ----
   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".
@@ -5986,7 +5986,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".
 ***************
-*** 9484,9490 ****
+*** 9525,9531 ****
   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".
@@ -5994,7 +5994,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".
---- 9484,9490 ----
+--- 9525,9531 ----
   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".
@@ -6003,7 +6003,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".
 ***************
-*** 9494,9507 ****
+*** 9535,9548 ****
   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".
@@ -6018,7 +6018,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"".
---- 9494,9507 ----
+--- 9535,9548 ----
   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".
@@ -6034,7 +6034,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"".
 ***************
-*** 9536,9543 ****
+*** 9577,9584 ****
   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".
@@ -6043,7 +6043,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"".
---- 9536,9543 ----
+--- 9577,9584 ----
   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".
@@ -6053,7 +6053,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"".
 ***************
-*** 10035,10047 ****
+*** 10076,10088 ****
   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".
@@ -6067,7 +6067,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".
---- 10035,10047 ----
+--- 10076,10088 ----
   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".
@@ -6082,7 +6082,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".
 ***************
-*** 10069,10140 ****
+*** 10110,10181 ****
   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".
@@ -6155,7 +6155,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".
---- 10069,10140 ----
+--- 10110,10181 ----
   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".
@@ -6229,7 +6229,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".
 ***************
-*** 10142,10155 ****
+*** 10183,10196 ****
   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".
@@ -6244,7 +6244,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".
---- 10142,10155 ----
+--- 10183,10196 ----
   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".
@@ -6260,7 +6260,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".
 ***************
-*** 10175,10235 ****
+*** 10216,10276 ****
   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"".
@@ -6322,7 +6322,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".
---- 10175,10235 ----
+--- 10216,10276 ----
   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/primvars.ms b/mats/primvars.ms
index bdf6d7de9a..3ee9b07247 100644
--- a/mats/primvars.ms
+++ b/mats/primvars.ms
@@ -473,6 +473,7 @@
               [(uptr) 0 -1 'a (+ *max-uptr 1) #f]
               [(uptr/iptr) -1 'q (+ *max-uptr 1) (- *min-iptr 1) #f]
               [(vector) '#(a) "a" #f]
+              [(stencil-vector) (stencil-vector 7 1 2 3) "a" #f]
               [(who-condition) (make-who-condition 'me) (make-message-condition "hello") 'the-who])
             (meta-cond
               [(memq 'pthreads feature*)
diff --git a/mats/root-experr-compile-0-f-f-f b/mats/root-experr-compile-0-f-f-f
index 2961005073..863e1075c8 100644
--- a/mats/root-experr-compile-0-f-f-f
+++ b/mats/root-experr-compile-0-f-f-f
@@ -1725,6 +1725,19 @@ primvars.mo:Expected error in mat trace-output-port: "trace-output-port: #<input
 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)".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: #f is not a non-negative fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: 1.0 is not a non-negative fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: 1267650600228229401496703205376 is not a non-negative fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: -1 is not a non-negative fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: #f is not a 32-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: 1.0 is not a 32-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: 1267650600228229401496703205376 is not a 32-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount32: -1 is not a 32-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount16: #f is not a 16-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount16: 1.0 is not a 16-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount16: 1267650600228229401496703205376 is not a 16-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount16: 1048576 is not a 16-bit fixnum".
+5_3.mo:Expected error in mat popcount: "fxpopcount16: -1 is not a 16-bit fixnum".
 5_4.mo:Expected error in mat char=?/char-ci=?: "incorrect argument count in call (char=?)".
 5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
 5_4.mo:Expected error in mat char=?/char-ci=?: "char=?: a is not a character".
@@ -4068,6 +4081,34 @@ cp0.mo:Expected error in mat expand/optimize-output: "expand/optimize-output: #<
 5_6.mo:Expected error in mat vector-cas!: "vector-cas!: 1267650600228229401496703205376 is not a valid index for #(4 5 3)".
 5_6.mo:Expected error in mat vector-cas!: "vector-cas!: -1 is not a valid index for #(4 5 3)".
 5_6.mo:Expected error in mat vector-cas!: "vector-cas!: 5 is not a valid index for #(4 5 3)".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: invalid mask x".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: invalid mask -1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: mask 0 does not match given number of items 1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: mask 3 does not match given number of items 1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: mask 3 does not match given number of items 1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: invalid mask 288230376151711744".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-length: 3 is not a stencil vector".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-mask: 3 is not a vector".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: 3 is not a stencil vector".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: invalid index 0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: invalid index 2".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: invalid index -1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: invalid index 1267650600228229401496703205376".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-ref: invalid index 1.0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-set!: invalid index 0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-set!: invalid index 2".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-set!: invalid index -1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-set!: invalid index 1267650600228229401496703205376".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-set!: invalid index 1.0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-update: 1 is not a stencil vector".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-update: stencil already has bits in 2".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-update: stencil does not have all bits in 1".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-update: addition mask 1 does not match given number of items 0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-update: addition mask 1 does not match given number of items 2".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-truncate!: 1 is not a stencil vector".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector-truncate!: new mask 1 is larger than old mask 0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: mask 7 does not match given number of items 0".
+5_6.mo:Expected error in mat stencil-vector: "stencil-vector: mask 6 does not match given number of items 0".
 5_7.mo:Expected error in mat string->symbol: "string->symbol: 3 is not a string".
 5_7.mo:Expected error in mat string->symbol: "string->symbol: a is not a string".
 5_7.mo:Expected error in mat gensym: "gensym: #(a b c) is not a string".
diff --git a/s/5_1.ss b/s/5_1.ss
index 44047cafb3..b0524ffad0 100644
--- a/s/5_1.ss
+++ b/s/5_1.ss
@@ -136,6 +136,17 @@
                            k
                            (let ([k (e? (vector-ref x i) (vector-ref y i) k)])
                               (and k (f (fx+ i 1) k)))))))))]
+          [(stencil-vector? x)
+           (and (stencil-vector? y)
+             (fx= (stencil-vector-mask x) (stencil-vector-mask y))
+             (let ([n (stencil-vector-length x)])
+                 (if (union-find ht x y)
+                     0
+                     (let f ([i 0] [k (fx- k 1)])
+                       (if (fx= i n)
+                           k
+                           (let ([k (e? (stencil-vector-ref x i) (stencil-vector-ref y i) k)])
+                              (and k (f (fx+ i 1) k))))))))]
           [(string? x) (and (string? y) (string=? x y) k)]
           [(flonum? x) (and (flonum? y) ($fleqv? x y) k)]
           [($inexactnum? x)
@@ -195,6 +206,15 @@
                          k
                          (let ([k (e? (vector-ref x i) (vector-ref y i) k)])
                             (and k (f (fx+ i 1) k))))))))]
+            [(stencil-vector? x)
+             (and (stencil-vector? y)
+               (fx= (stencil-vector-mask x) (stencil-vector-mask y))                  
+               (let ([n (stencil-vector-length x)])
+                 (let f ([i 0] [k k])
+                   (if (fx= i n)
+                       k
+                       (let ([k (e? (stencil-vector-ref x i) (stencil-vector-ref y i) k)])
+                          (and k (f (fx+ i 1) k)))))))]
             [(string? x) (and (string? y) (string=? x y) k)]
             [(flonum? x) (and (flonum? y) ($fleqv? x y) k)]
             [($inexactnum? x)
@@ -252,6 +272,18 @@
                               (vector-ref y i)
                               (fx- k 1))])
                      (and k (f (fx+ i 1) k))))))))]
+      [(stencil-vector? x)
+       (and (stencil-vector? y)
+         (fx= (stencil-vector-mask x) (stencil-vector-mask y))
+         (let ([n (stencil-vector-length x)])
+           (let f ([i 0] [k k])
+             (if (or (fx= i n) (fx<= k 0))
+                 k
+                 (let ([k (precheck?
+                            (stencil-vector-ref x i)
+                            (stencil-vector-ref y i)
+                            (fx- k 1))])
+                   (and k (f (fx+ i 1) k)))))))]
       [(string? x) (and (string? y) (string=? x y) k)]
       [(flonum? x) (and (flonum? y) ($fleqv? x y) k)]
       [($inexactnum? x)
diff --git a/s/5_6.ss b/s/5_6.ss
index 53cff82e79..0fd4f5c4ee 100644
--- a/s/5_6.ss
+++ b/s/5_6.ss
@@ -424,3 +424,181 @@
       ($list-length ls2 who)
       (dolmerge! elt< ls1 ls2 (list '())))))
 )
+
+;; compiled with generate-interrupt-trap #f and optimize-level 3 so
+;; that stencil updates won't be interrupted by a GC while a newly
+;; allocated stencil is filled in
+(eval-when (compile)
+  (generate-interrupt-trap #f)
+  (optimize-level 3))
+
+(let ()
+  ;; Call with non-zero n
+  (define (stencil-vector-copy! to-v to-i from-v from-i n)
+    (cond
+     [(fx= n 1)
+      ($stencil-vector-set! to-v to-i (stencil-vector-ref from-v from-i))]
+     [else
+      ($stencil-vector-set! to-v to-i (stencil-vector-ref from-v from-i))
+      ($stencil-vector-set! to-v (fx+ to-i 1) (stencil-vector-ref from-v (fx+ from-i 1)))
+      (let ([n (fx- n 2)])
+        (unless (fx= n 0)
+          (stencil-vector-copy! to-v (fx+ to-i 2) from-v (fx+ from-i 2) n)))]))
+
+  (define (do-stencil-vector-update v mask remove-bits add-bits vals)
+    (let* ([new-n (fxpopcount (fxior (fx- mask remove-bits) add-bits))]
+           [new-v ($make-stencil-vector new-n (fxior (fx- mask remove-bits) add-bits))])
+      ;; `new-v` is not initialized, so don't let a GC happen until we're done filling it in
+      (let loop ([to-i 0] [from-i 0] [mask mask] [remove-bits remove-bits] [add-bits add-bits] [vals vals])
+        (unless (fx= to-i new-n)
+          (let* ([pre-remove-mask (fx- (fxxor remove-bits (fxand remove-bits (fx- remove-bits 1))) 1)]
+                 [pre-add-mask (fx- (fxxor add-bits (fxand add-bits (fx- add-bits 1))) 1)]
+                 [keep-mask (fxand mask pre-remove-mask pre-add-mask)]
+                 [kept-n (cond
+                          [(fx= 0 keep-mask) 0]
+                          [else
+                           (let ([keep-n (fxpopcount keep-mask)])
+                             (stencil-vector-copy! new-v to-i v from-i keep-n)
+                             keep-n)])])
+            (let ([to-i (fx+ to-i kept-n)]
+                  [from-i (fx+ from-i kept-n)]
+                  [mask (fx- mask keep-mask)])
+              (cond
+               [($fxu< pre-add-mask pre-remove-mask)
+                ;; an add bit happens before a remove bit
+                ($stencil-vector-set! new-v to-i (car vals))
+                (loop (fx+ to-i 1) from-i mask remove-bits (fx- add-bits (fx+ pre-add-mask 1)) (cdr vals))]
+               [else
+                ;; a remove bit happens before an add bit (or we're at the end)
+                (let ([remove-bit (fx+ pre-remove-mask 1)])
+                  (loop to-i (fx+ from-i 1) (fx- mask remove-bit) (fx- remove-bits remove-bit) add-bits vals))])))))
+      new-v))
+
+  (define (stencil-vector-replace-one v bit val)
+    (let* ([mask (stencil-vector-mask v)]
+           [n (fxpopcount mask)]
+           [new-v ($make-stencil-vector n mask)])
+      ;; `new-v` is not initialized, so don't let a GC happen until we're done filling it in
+      (stencil-vector-copy! new-v 0 v 0 n)
+      (let ([i (fxpopcount (fxand mask (fx- bit 1)))])
+        ($stencil-vector-set! new-v i val))
+      new-v))
+
+  (define (stencil-vector-replace-two v bits val1 val2)
+    (let* ([mask (stencil-vector-mask v)]
+           [n (fxpopcount mask)]
+           [new-v ($make-stencil-vector n mask)])
+      ;; `new-v` is not initialized, so don't let a GC happen until we're done filling it in
+      (stencil-vector-copy! new-v 0 v 0 n)
+      (let ([i1 (fxpopcount (fxand mask (fx- (fxxor bits (fxand bits (fx- bits 1))) 1)))])
+        ($stencil-vector-set! new-v i1 val1)
+        (let ([i2 (fxpopcount (fxand mask (fx- (fxand bits (fx- bits 1)) 1)))])
+          ($stencil-vector-set! new-v i2 val2)))
+      new-v))
+
+  (set-who! stencil-vector-mask-width (lambda () (constant stencil-vector-mask-bits)))
+
+  (set-who! stencil-vector-length
+    (lambda (v)
+      (unless (stencil-vector? v)
+        ($oops who "~s is not a stencil vector" v))
+      (fxpopcount (stencil-vector-mask v))))
+
+  (set-who! stencil-vector-ref
+    (lambda (v i)
+      (unless (stencil-vector? v)
+        ($oops who "~s is not a stencil vector" v))
+      (unless (and (fixnum? i)
+                   (fx< -1 i (fxpopcount (stencil-vector-mask v))))
+        ($oops who "invalid index ~s" i))
+      (#3%stencil-vector-ref v i)))
+
+  (set-who! stencil-vector-set!
+    (lambda (v i val)
+      (unless (stencil-vector? v)
+        ($oops who "~s is not a stencil vector" v))
+      (unless (and (fixnum? i)
+                   (fx< -1 i (fxpopcount (stencil-vector-mask v))))
+        ($oops who "invalid index ~s" i))
+      (#3%stencil-vector-set! v i val)))
+  
+  (set-who! stencil-vector
+    (lambda (mask . vals)
+      (unless (and (fixnum? mask)
+                   (fx< -1 mask (fxsll 1 (constant stencil-vector-mask-bits))))
+        ($oops who "invalid mask ~s" mask))
+      (let ([n (fxpopcount mask)])
+        (unless (fx= (length vals) n)
+          ($oops who "mask ~s does not match given number of items ~s" mask (length vals)))
+        (let ([v ($make-stencil-vector n mask)])
+          ;; `new-v` is not initialized, so don't let a GC happen until we're done filling it in
+          (let loop ([i 0] [vals vals])
+            (unless (fx= i n)
+              ($stencil-vector-set! v i (car vals))
+              (loop (fx+ i 1) (cdr vals))))
+          v))))
+
+  (set-who! stencil-vector-update
+    (lambda (v remove-bits add-bits . vals)
+      (unless (stencil-vector? v)
+        ($oops who "~s is not a stencil vector" v))
+      (let ([mask (stencil-vector-mask v)])
+        (unless (and (fixnum? remove-bits)
+                     (fx< -1 remove-bits (fxsll 1 (constant stencil-vector-mask-bits))))
+          ($oops who "invalid removal mask ~s" remove-bits))
+        (unless (fx= remove-bits (fxand remove-bits mask))
+          ($oops who "stencil does not have all bits in ~s" remove-bits))
+        (unless (and (fixnum? add-bits)
+                     (fx< -1 add-bits (fxsll 1 (constant stencil-vector-mask-bits))))
+          ($oops who "invalid addition mask ~s" add-bits))
+        (unless (fx= 0 (fxand add-bits (fx- mask remove-bits)))
+          ($oops who "stencil already has bits in ~s" add-bits))
+        (unless (fx= (fxpopcount add-bits) (length vals))
+          ($oops who "addition mask ~s does not match given number of items ~s" add-bits (length vals)))
+        (do-stencil-vector-update v mask remove-bits add-bits vals))))
+
+  (set-who! stencil-vector-truncate!
+    (lambda (v new-mask)
+      (unless (stencil-vector? v)
+        ($oops who "~s is not a stencil vector" v))
+      (unless (and (fixnum? new-mask)
+                   (fx< -1 new-mask (fxsll 1 (constant stencil-vector-mask-bits))))
+        ($oops who "invalid mask ~s" new-mask))
+      (let ([old-mask (stencil-vector-mask v)])
+        (unless (fx<= (fxpopcount new-mask) (fxpopcount old-mask))
+          ($oops who "new mask ~s is larger than old mask ~s" new-mask old-mask))
+        (stencil-vector-truncate! v new-mask))))
+
+  ;; unsafe variant, which assumes that the arguments are consistent;
+  ;; recognize the case where all slots are replaced
+  (set-who! $stencil-vector-update
+    (case-lambda
+     [(v remove-bits add-bits x)
+      (let ([mask (stencil-vector-mask v)])
+        (cond
+         [(fx= 0 (fx- mask remove-bits))
+          ;; not using any data from `v`
+          (stencil-vector add-bits x)]
+         [(fx= add-bits remove-bits)
+          ;; updating one element of `v`:
+          (stencil-vector-replace-one v add-bits x)]
+         [else
+          (do-stencil-vector-update v mask remove-bits add-bits (list x))]))]
+     [(v remove-bits add-bits x y)
+      (let ([mask (stencil-vector-mask v)])
+        (cond
+         [(fx= 0 (fx- mask remove-bits))
+          ;; not using any data from `v`
+          (stencil-vector add-bits x y)]
+         [(fx= add-bits remove-bits)
+          ;; updating two elements of `v`:
+          (stencil-vector-replace-two v add-bits x y)]
+         [else
+          (do-stencil-vector-update v mask remove-bits add-bits (list x y))]))]
+     [(v remove-bits add-bits x y z)
+      (let ([mask (stencil-vector-mask v)])
+        (if (fx= 0 (fx- mask remove-bits))
+            (stencil-vector add-bits x y z)
+            (do-stencil-vector-update v mask remove-bits add-bits (list x y z))))]
+     [(v remove-bits add-bits . vals)
+      (do-stencil-vector-update v (stencil-vector-mask v) remove-bits add-bits vals)])))
diff --git a/s/a6fb.def b/s/a6fb.def
index c5afc715ea..095a4065fd 100644
--- a/s/a6fb.def
+++ b/s/a6fb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/a6le.def b/s/a6le.def
index 9dcef248de..39b55f44e5 100644
--- a/s/a6le.def
+++ b/s/a6le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/a6nb.def b/s/a6nb.def
index 0ba4e358e4..b7b8dd9e5a 100644
--- a/s/a6nb.def
+++ b/s/a6nb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/a6nt.def b/s/a6nt.def
index 8fc5d1fd7c..122a60ae4f 100644
--- a/s/a6nt.def
+++ b/s/a6nt.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor windows)
diff --git a/s/a6ob.def b/s/a6ob.def
index 489085de17..fb9b7a1c61 100644
--- a/s/a6ob.def
+++ b/s/a6ob.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/a6osx.def b/s/a6osx.def
index 7571ee7e9a..ea26168a19 100644
--- a/s/a6osx.def
+++ b/s/a6osx.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/a6s2.def b/s/a6s2.def
index 5626dcf953..efa47f7245 100644
--- a/s/a6s2.def
+++ b/s/a6s2.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor)
diff --git a/s/arm32le.def b/s/arm32le.def
index 832d7aac5e..e9657b4381 100644
--- a/s/arm32le.def
+++ b/s/arm32le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #f)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #f)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/cmacros.ss b/s/cmacros.ss
index 74e4020069..472d6fa7ff 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -328,7 +328,7 @@
                  [(_ foo e1 e2) e1] ...
                  [(_ bar e1 e2) e2]))))])))
 
-(define-constant scheme-version #x09050309)
+(define-constant scheme-version #x0905030A)
 
 (define-syntax define-machine-types
   (lambda (x)
@@ -455,9 +455,11 @@
 (define-constant fasl-type-immutable-bytevector 39)
 (define-constant fasl-type-immutable-box 40)
 
-(define-constant fasl-type-begin 41)
-(define-constant fasl-type-phantom 42)
-(define-constant fasl-type-uninterned-symbol 43)
+(define-constant fasl-type-stencil-vector 41)
+
+(define-constant fasl-type-begin 42)
+(define-constant fasl-type-phantom 43)
+(define-constant fasl-type-uninterned-symbol 44)
 
 (define-constant fasl-fld-ptr 0)
 (define-constant fasl-fld-u8 1)
@@ -695,7 +697,8 @@
 (define-constant countof-guardian 23)
 (define-constant countof-oblist 24)
 (define-constant countof-ephemeron 25)
-(define-constant countof-types 26)
+(define-constant countof-stencil-vector 26)
+(define-constant countof-types 27)
 
 ;;; type-fixnum is assumed to be all zeros by at least by vector, fxvector,
 ;;; and bytevector index checks
@@ -745,7 +748,6 @@
 (define-constant type-string                #b010)
 (define-constant type-fxvector              #b011)
 ; #b100 occupied by vectors on 32-bit machines, unused on 64-bit machines
-; #b101 occupied by type-immutable-bytevector
 (define-constant type-other-number         #b0110) ; bit 3 reset for numbers
 (define-constant type-bignum              #b00110) ; bit 4 reset for bignums
 (define-constant type-positive-bignum    #b000110)
@@ -755,11 +757,12 @@
 (define-constant type-exactnum         #b01010110)
 (define-constant type-box               #b0001110) ; bit 3 set for non-numbers
 (define-constant type-immutable-box    #b10001110) ; low 7 bits match `type-box`
-(define-constant type-port             #b00011110)
+(define-constant type-stencil-vector     #b011110) ; remianing bits for stencil; type looks like immediate
 ; #b00101110 (forward_marker) must not be used
 (define-constant type-code             #b00111110)
+(define-constant type-port             #b11001110)
 (define-constant type-thread           #b01001110)
-(define-constant type-tlc              #b01011110)
+(define-constant type-tlc              #b10111110)
 (define-constant type-rtd-counts       #b01101110)
 (define-constant type-phantom          #b01111110)
 (define-constant type-record                #b111)
@@ -917,6 +920,7 @@
 (define-constant mask-rtd-counts   (constant byte-constant-mask))
 (define-constant mask-record            #b111)
 (define-constant mask-port               #xFF)
+(define-constant mask-stencil-vector     #x3F)
 (define-constant mask-binary-port
   (fxlogor (fxsll (constant port-flag-binary) (constant port-flags-offset))
            (constant mask-port)))
@@ -991,6 +995,10 @@
 (define-constant bytevector-length-factor (expt 2 (constant bytevector-length-offset)))
 (define-constant char-factor          (expt 2 (constant char-data-offset)))
 
+(define-constant stencil-vector-mask-offset  (integer-length (constant mask-stencil-vector)))
+(define-constant stencil-vector-mask-bits    (fx- (constant ptr-bits)
+                                                  (constant stencil-vector-mask-offset)))
+
 ;;; record-datatype must be defined before we include layout.ss
 ;;; (maybe should move into that file??)
 ;;; We allow Scheme inputs for both signed and unsigned integers to range from
@@ -1271,6 +1279,10 @@
      ([iptr type]
       [octet data 0]))])
 
+(define-primitive-structure-disps stencil-vector type-typed-object
+  ([iptr type]
+   [ptr data 0]))
+
 ; WARNING: implementation of real-part and imag-part assumes that
 ; flonums are subobjects of inexactnums.
 (define-primitive-structure-disps flonum type-flonum
@@ -2652,6 +2664,9 @@
      (bitwise-bit-set? #f 2 #f #t)
      (fxbit-set? #f 2 #f #t)
      (fxcopy-bit #f 2 #t #t)
+     (fxpopcount #f 1 #t #t)
+     (fxpopcount16 #f 1 #t #t)
+     (fxpopcount32 #f 1 #t #t)
      (reverse #f 1 #f #t)
      (andmap1 #f 2 #f #t)
      (ormap1 #f 2 #f #t)
@@ -2687,6 +2702,8 @@
      (safe-put-u8 #f 2 #f #t)
      (safe-put-char #f 2 #f #t)
      (safe-unread-char #f 2 #f #t)
+     (stencil-vector-mask #f 1 #t #t)
+     (stencil-vector-tag #f 1 #t #t)
      (dorest0 #f 0 #f #t)
      (dorest1 #f 0 #f #t)
      (dorest2 #f 0 #f #t)
diff --git a/s/cp0.ss b/s/cp0.ss
index a2f75207fe..83a1d3a26a 100644
--- a/s/cp0.ss
+++ b/s/cp0.ss
@@ -2171,7 +2171,8 @@
         (define-inline-constant-parameter (most-negative-fixnum least-fixnum) (constant most-negative-fixnum))
         (define-inline-constant-parameter (most-positive-fixnum greatest-fixnum) (constant most-positive-fixnum))
         (define-inline-constant-parameter (fixnum-width) (constant fixnum-bits))
-        (define-inline-constant-parameter (virtual-register-count) (constant virtual-register-count)))
+        (define-inline-constant-parameter (virtual-register-count) (constant virtual-register-count))
+        (define-inline-constant-parameter (stencil-vector-mask-width) (constant stencil-vector-mask-bits)))
 
       (define-inline 2 directory-separator?
         [(c) (visit-and-maybe-extract* char? ([dc c])
@@ -2755,6 +2756,9 @@
         (fold (fxlogbit? tfixnum? tfixnum?) boolean? #2%logbit?)
         (fold (fxlogbit0 u<fxwidth-1? tfixnum?) tfixnum? #2%logbit0)
         (fold (fxlogbit1 u<fxwidth-1? tfixnum?) tfixnum? #2%logbit1)
+        (fold (fxpopcount tfixnum?) tfixnum? #2%fxpopcount)
+        (fold (fxpopcount32 tfixnum?) tfixnum? #2%fxpopcount32)
+        (fold (fxpopcount16 tfixnum?) tfixnum? #2%fxpopcount16)
 
         (fold (fxarithmetic-shift tfixnum? s<fxwidth?) tfixnum? #2%bitwise-arithmetic-shift handle-shift)
         (fold (fxarithmetic-shift-left tfixnum? u<fxwidth?) tfixnum? #2%bitwise-arithmetic-shift-left handle-shift)
diff --git a/s/cpnanopass.ss b/s/cpnanopass.ss
index bf37d2dd34..020ce18f10 100644
--- a/s/cpnanopass.ss
+++ b/s/cpnanopass.ss
@@ -4480,7 +4480,103 @@
                    (%inline - ,e1
                       ,(build-fx*
                          (build-fx/ src sexpr e1 e2)
-                         e2 #f)))]))))
+                         e2 #f)))]))
+            (let ()
+              (define-syntax build-fx
+                (lambda (x)
+                  (syntax-case x ()
+                    [(_ op a1 a2)
+                     #`(%inline op
+                                #,(if (number? (syntax->datum #'a1))
+                                      #`(immediate a1)
+                                      #`,a1)
+                                #,(if (number? (syntax->datum #'a2))
+                                      #`(immediate a2)
+                                      #`,a2))])))
+              (define (build-popcount16 e)
+                (constant-case popcount-instruction
+                  [(#t) (build-fix (%inline popcount ,e))] ; no unfix needed, since not specialized to 16-bit
+                  [else
+                   (let ([x (make-tmp 'x 'uptr)]
+                         [x2 (make-tmp 'x2 'uptr)]
+                         [x3 (make-tmp 'x3 'uptr)]
+                         [x4 (make-tmp 'x4 'uptr)])
+                     `(let ([,x ,(build-unfix e)])
+                        (let ([,x2 ,(build-fx - x (build-fx logand (build-fx srl x 1) #x5555))])
+                          (let ([,x3 ,(build-fx + (build-fx logand x2 #x3333) (build-fx logand (build-fx srl x2 2) #x3333))])
+                            (let ([,x4 ,(build-fx logand (build-fx + x3 (build-fx srl x3 4)) #x0f0f)])
+                              ,(build-fix (build-fx logand (build-fx + x4 (build-fx srl x4 8)) #x1f)))))))]))
+              (define (build-popcount32 e)
+                (constant-case popcount-instruction
+                  [(#t) (build-fix (%inline popcount ,e))] ; no unfix needed, since not specialized to 32-bit
+                  [else
+                   (let ([x (make-tmp 'x 'uptr)]
+                         [x2 (make-tmp 'x2 'uptr)]
+                         [x3 (make-tmp 'x3 'uptr)]
+                         [x4 (make-tmp 'x4 'uptr)])
+                     `(let ([,x ,(build-unfix e)])
+                        (let ([,x2 ,(build-fx - x (build-fx logand (build-fx srl x 1) #x55555555))])
+                          (let ([,x3 ,(build-fx + (build-fx logand x2 #x33333333) (build-fx logand (build-fx srl x2 2) #x33333333))])
+                            (let ([,x4 ,(build-fx logand (build-fx + x3 (build-fx srl x3 4)) #x0f0f0f0f)])
+                              ,(build-fix (build-fx logand (build-fx srl (build-fx * x4 #x01010101) 24) #x3f)))))))]))
+              (define (build-popcount e)
+                (constant-case popcount-instruction
+                  [(#t) (build-fix (%inline popcount ,e))] ; no unfix needed
+                  [else
+                   (constant-case ptr-bits
+                     [(32) (build-popcount32 e)]
+                     [(64)
+                      (let ([x (make-tmp 'x 'uptr)]
+                            [x2 (make-tmp 'x2 'uptr)]
+                            [x3 (make-tmp 'x3 'uptr)]
+                            [x4 (make-tmp 'x4 'uptr)]
+                            [x5 (make-tmp 'x5 'uptr)])
+                        `(let ([,x ,e]) ; no unfix needed
+                           (let ([,x2 ,(build-fx - x (build-fx logand (build-fx srl x 1) #x5555555555555555))])
+                             (let ([,x3 ,(build-fx + (build-fx logand x2 #x3333333333333333) (build-fx logand (build-fx srl x2 2) #x3333333333333333))])
+                               (let ([,x4 ,(build-fx logand (build-fx + x3 (build-fx srl x3 4)) #x0f0f0f0f0f0f0f0f)])
+                                 (let ([,x5 ,(build-fx logand (build-fx + x4 (build-fx srl x4 8)) #x00ff00ff00ff00ff)])
+                                   ,(build-fix (build-fx logand (build-fx srl (build-fx * x5 #x0101010101010101) 56) #x7f))))))))])]))
+              (define-inline 3 fxpopcount
+                [(e)
+                 (bind #f (e)
+                   (build-popcount e))])
+              (define-inline 2 fxpopcount
+                [(e)
+                 (bind #t (e)
+                   `(if ,(build-and
+                          (%type-check mask-fixnum type-fixnum ,e)
+                          (%inline >= ,e (immediate ,0)))
+                        ,(build-popcount e)
+                        ,(build-libcall #t #f sexpr fxpopcount e)))])
+              (define-inline 3 fxpopcount32
+                [(e)
+                 (bind #f (e)
+                   (build-popcount32 e))])
+              (define-inline 2 fxpopcount32
+                [(e)
+                 (bind #t (e)
+                       `(if ,(constant-case ptr-bits
+                               [(32)
+                                (build-and (%type-check mask-fixnum type-fixnum ,e)
+                                           (%inline >= ,e (immediate ,0)))]
+                               [(64)
+                                (build-and (%type-check mask-fixnum type-fixnum ,e)
+                                           (%inline u< ,e (immediate ,(fix #x100000000))))])
+                            ,(build-popcount32 e)
+                            ,(build-libcall #t #f sexpr fxpopcount32 e)))])
+              (define-inline 3 fxpopcount16
+                [(e)
+                 (bind #f (e)
+                   (build-popcount16 e))])
+              (define-inline 2 fxpopcount16
+                [(e)
+                 (bind #f (e)
+                       `(if ,(build-and
+                              (%type-check mask-fixnum type-fixnum ,e)
+                              (%inline u< ,e (immediate ,(fix #x10000))))
+                            ,(build-popcount16 e)
+                            ,(build-libcall #t #f sexpr fxpopcount16 e)))]))))
         (let ()
           (define do-fxsll
             (lambda (e1 e2)
@@ -4989,6 +5085,7 @@
           (typed-object-pred vector? mask-vector type-vector)
           (typed-object-pred mutable-vector? mask-mutable-vector type-mutable-vector)
           (typed-object-pred immutable-vector? mask-mutable-vector type-immutable-vector)
+          (typed-object-pred stencil-vector? mask-stencil-vector type-stencil-vector)
           (typed-object-pred thread? mask-thread type-thread))
         (define-inline 3 $bigpositive?
           [(e) (%type-check mask-signed-bignum type-positive-bignum
@@ -5377,7 +5474,8 @@
           (def-len fxvector-length fxvector-type-disp fxvector-length-offset)
           (def-len string-length string-type-disp string-length-offset)
           (def-len bytevector-length bytevector-type-disp bytevector-length-offset)
-          (def-len $bignum-length bignum-type-disp bignum-length-offset))
+          (def-len $bignum-length bignum-type-disp bignum-length-offset)
+          (def-len stencil-vector-mask stencil-vector-type-disp stencil-vector-mask-offset))
         (let ()
           (define-syntax def-len
             (syntax-rules ()
@@ -5394,7 +5492,8 @@
           (def-len vector-length mask-vector type-vector vector-type-disp vector-length-offset)
           (def-len fxvector-length mask-fxvector type-fxvector fxvector-type-disp fxvector-length-offset)
           (def-len string-length mask-string type-string string-type-disp string-length-offset)
-          (def-len bytevector-length mask-bytevector type-bytevector bytevector-type-disp bytevector-length-offset))
+          (def-len bytevector-length mask-bytevector type-bytevector bytevector-type-disp bytevector-length-offset)
+          (def-len stencil-vector-mask mask-stencil-vector type-stencil-vector stencil-vector-type-disp stencil-vector-mask-offset))
         ; TODO: consider adding integer?, integer-valued?, rational?, rational-valued?,
         ; real?, and real-valued?
         (let ()
@@ -8399,6 +8498,35 @@
                  `(if ,(build-vector-set!-check e-v e-i e-new)
                       ,(go e-v e-i e-new)
                       ,(build-libcall #t src sexpr vector-set-fixnum! e-v e-i e-new)))])))
+          (let ()
+            (define (go e-v e-i)
+              (nanopass-case (L7 Expr) e-i
+                [(quote ,d)
+                 (guard (target-fixnum? d))
+                 (%mref ,e-v ,(+ (fix d) (constant stencil-vector-data-disp)))]
+                [else (%mref ,e-v ,e-i ,(constant stencil-vector-data-disp))]))
+            (define-inline 3 stencil-vector-ref
+              [(e-v e-i) (go e-v e-i)]))
+          (let ()
+            (define (go e-v e-i e-new)
+              (nanopass-case (L7 Expr) e-i
+                [(quote ,d)
+                 (guard (target-fixnum? d))
+                 (build-dirty-store e-v (+ (fix d) (constant stencil-vector-data-disp)) e-new)]
+                [else (build-dirty-store e-v e-i (constant stencil-vector-data-disp) e-new)]))
+            (define-inline 3 stencil-vector-set!
+              [(e-v e-i e-new) (go e-v e-i e-new)]))
+          (let ()
+            (define (go e-v e-i e-new)
+              `(set!
+                 ,(nanopass-case (L7 Expr) e-i
+                    [(quote ,d)
+                     (guard (target-fixnum? d))
+                     (%mref ,e-v ,(+ (fix d) (constant stencil-vector-data-disp)))]
+                    [else (%mref ,e-v ,e-i ,(constant stencil-vector-data-disp))])
+                 ,e-new))
+            (define-inline 3 $stencil-vector-set!
+              [(e-v e-i e-new) (go e-v e-i e-new)]))
           (let ()
             (define (go e-v e-i)
               (nanopass-case (L7 Expr) e-i
@@ -9182,6 +9310,69 @@
                       (constant? fixnum? e-fill)
                       (do-make-vector e-length e-fill))]))))
 
+        (let ()
+          (meta-assert (= (constant log2-ptr-bytes) (constant fixnum-offset)))
+          (let ()
+            (define build-stencil-vector-type
+              (lambda (e-mask) ; e-mask is used only once
+                (%inline logor
+                         (immediate ,(constant type-stencil-vector))
+                         ,(%inline sll ,e-mask (immediate ,(fx- (constant stencil-vector-mask-offset)
+                                                                (constant fixnum-offset)))))))
+            (define do-stencil-vector
+              (lambda (e-mask e-val*)
+                (list-bind #f (e-val*)
+                  (bind #f (e-mask)
+                      (let ([t-vec (make-tmp 'tvec)])
+                        `(let ([,t-vec ,(%constant-alloc type-typed-object
+                                                         (fx+ (constant header-size-stencil-vector)
+                                                              (fx* (length e-val*) (constant ptr-bytes))))])
+                           ,(let loop ([e-val* e-val*] [i 0])
+                              (if (null? e-val*)
+                                  `(seq
+                                     (set! ,(%mref ,t-vec ,(constant stencil-vector-type-disp))
+                                           ,(build-stencil-vector-type e-mask))
+                                     ,t-vec)
+                                  `(seq
+                                    (set! ,(%mref ,t-vec ,(fx+ i (constant stencil-vector-data-disp))) ,(car e-val*))
+                                    ,(loop (cdr e-val*) (fx+ i (constant ptr-bytes))))))))))))
+            (define do-make-stencil-vector
+              (lambda (e-length e-mask)
+                (bind #t (e-length)
+                      (bind #f (e-mask)
+                            (let ([t-vec (make-tmp 'tvec)])
+                              `(let ([,t-vec (alloc ,(make-info-alloc (constant type-typed-object) #f #f)
+                                                    ,(%inline logand
+                                                        ,(%inline + ,e-length
+                                                             (immediate ,(fx+ (constant header-size-stencil-vector)
+                                                                              (fx- (constant byte-alignment) 1))))
+                                                         (immediate ,(- (constant byte-alignment)))))])
+                               ,(%seq
+                                 (set! ,(%mref ,t-vec ,(constant stencil-vector-type-disp))
+                                       ,(build-stencil-vector-type e-mask))
+                                 ;; Content not filled! This function is meant to be called by
+                                 ;; `$stencil-vector-update`, which has GC disabled between
+                                 ;; allocation and filling in the data
+                                 ,t-vec)))))))
+            (define-inline 3 stencil-vector
+              [(e-mask . e-val*)
+               (do-stencil-vector e-mask e-val*)])
+            (define-inline 2 $make-stencil-vector
+              [(e-length e-mask) (do-make-stencil-vector e-length e-mask)])
+            (define-inline 3 $make-stencil-vector
+              [(e-length e-mask) (do-make-stencil-vector e-length e-mask)])
+            (define-inline 3 stencil-vector-update
+              [(e-vec e-sub-mask e-add-mask . e-val*)
+               `(call ,(make-info-call src sexpr #f #f #f) #f
+                      ,(lookup-primref 3 '$stencil-vector-update)
+                      ,e-vec ,e-sub-mask ,e-add-mask ,e-val* ...)])
+            (define-inline 3 stencil-vector-truncate!
+              [(e-vec e-mask)
+               (bind #f (e-vec e-mask)
+                 `(seq
+                   (set! ,(%mref ,e-vec ,(constant stencil-vector-type-disp))
+                         ,(build-stencil-vector-type e-mask))
+                   ,(%constant svoid)))])))
         (let ()
           (meta-assert (= (constant log2-ptr-bytes) (constant fixnum-offset)))
           (define-inline 3 $make-eqhash-vector
diff --git a/s/fasl.ss b/s/fasl.ss
index 55b2b051c7..7e5575770d 100644
--- a/s/fasl.ss
+++ b/s/fasl.ss
@@ -65,6 +65,14 @@
                (bld (vector-ref x i) t a? d)
                (bldvec (fx+ i 1)))))))
 
+(define bld-stencil-vector
+   (lambda (x t a? d)
+      (let ([len (stencil-vector-length x)])
+         (let bldvec ([i 0])
+            (unless (fx= i len)
+               (bld (stencil-vector-ref x i) t a? d)
+               (bldvec (fx+ i 1)))))))
+
 (define bld-record
   (lambda (x t a? d)
     (unless (eq? x #!base-rtd)
@@ -163,6 +171,7 @@
       (cond
         [(pair? x) (bld-graph x t a? d #t bld-pair)]
         [(vector? x) (bld-graph x t a? d #t bld-vector)]
+        [(stencil-vector? x) (bld-graph x t a? d #t bld-stencil-vector)]
         [(or (symbol? x) (string? x)) (bld-graph x t a? d #t bld-simple)]
         [(and (annotation? x) (not a?))
          (bld (annotation-stripped x) t a? d)]
@@ -309,6 +318,16 @@
             (put-u8 p x)
             (wrf-bytevector-loop (fx+ i 1))))))))
 
+(define wrf-stencil-vector
+   (lambda (x p t a?)
+      (put-u8 p (constant fasl-type-stencil-vector))
+      (put-uptr p (stencil-vector-mask x))
+      (let ([n (stencil-vector-length x)]) 
+         (let wrf-stencil-vector-loop ([i 0])
+            (unless (fx= i n)
+               (wrf (stencil-vector-ref x i) p t a?)
+               (wrf-stencil-vector-loop (fx+ i 1)))))))
+
 ; Written as: fasl-tag rtd field ...
 (module (wrf-record really-wrf-record)
   (define maybe-remake-rtd
@@ -571,6 +590,7 @@
          [(hashtable? x) ($oops 'fasl-write "invalid fasl object ~s" x)]
          [($record? x) (wrf-graph x p t a? wrf-record)]
          [(vector? x) (wrf-graph x p t a? wrf-vector)]
+         [(stencil-vector? x) (wrf-graph x p t a? wrf-stencil-vector)]
          [(char? x) (wrf-char x p)]
          [(box? x) (wrf-graph x p t a? wrf-box)]
          [(large-integer? x) (wrf-graph x p t a? wrf-large-integer)]
diff --git a/s/i3fb.def b/s/i3fb.def
index d49a7dbfac..5f1593d4b6 100644
--- a/s/i3fb.def
+++ b/s/i3fb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/i3le.def b/s/i3le.def
index ea277e8d15..faf7eac137 100644
--- a/s/i3le.def
+++ b/s/i3le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/i3nb.def b/s/i3nb.def
index 748cc0e1ad..7878f9239d 100644
--- a/s/i3nb.def
+++ b/s/i3nb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/i3nt.def b/s/i3nt.def
index 1da39fa80c..9bb96f4d53 100644
--- a/s/i3nt.def
+++ b/s/i3nt.def
@@ -46,6 +46,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor windows)
diff --git a/s/i3ob.def b/s/i3ob.def
index cf6a7aa439..ed01492a8a 100644
--- a/s/i3ob.def
+++ b/s/i3ob.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/i3osx.def b/s/i3osx.def
index 60a93a2914..f44d51c4b7 100644
--- a/s/i3osx.def
+++ b/s/i3osx.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/i3qnx.def b/s/i3qnx.def
index dc28e2c204..5da2c7fb15 100644
--- a/s/i3qnx.def
+++ b/s/i3qnx.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 2)
 (features iconv expeditor)
diff --git a/s/i3s2.def b/s/i3s2.def
index 28e5e3d618..544e308685 100644
--- a/s/i3s2.def
+++ b/s/i3s2.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/inspect.ss b/s/inspect.ss
index 0e0eb267bd..14bae9f1ed 100644
--- a/s/inspect.ss
+++ b/s/inspect.ss
@@ -457,7 +457,7 @@
          (case ((object) 'type)
             [(pair) (ref-list n)]
             [(continuation procedure vector fxvector bytevector string record
-              ftype-struct ftype-union ftype-array ftype-bits)
+              ftype-struct ftype-union ftype-array ftype-bits stencil-vector)
              (ref n)]
             [else (invalid-movement)]))))
 
@@ -496,6 +496,7 @@
          [(vector) vector-dispatch-table]
          [(fxvector) fxvector-dispatch-table]
          [(bytevector) bytevector-dispatch-table]
+         [(stencil-vector) stencil-vector-dispatch-table]
          [(record) record-dispatch-table]
          [(string) string-dispatch-table]
          [(box) box-dispatch-table]
@@ -1024,6 +1025,31 @@
 
 ))
 
+(define stencil-vector-dispatch-table
+ (make-dispatch-table
+
+   [("length" . "l")
+    "display stencil vector length"
+    (() (show "   ~d elements" ((object) 'length)))]
+
+   [("mask" . "m")
+    "display stencil vector mask"
+    (() (show "   #x~x" ((object) 'mask)))]
+
+   [("ref" . "r")
+    "inspect [nth] element"
+    (() (ref 0))
+    ((n) (ref n))]
+
+   [("show" . "s")
+     "show [n] elements"
+     (() (display-refs ((object) 'length)))
+     ((n)
+      (range-check n ((object) 'length))
+      (display-refs n))]
+
+))
+
 (define ftype-struct-dispatch-table
  (make-dispatch-table
    ["fields"
@@ -1895,6 +1921,19 @@
         [write (p) (write x p)]
         [print (p) (pretty-print x p)]))
 
+    (define make-stencil-vector-object
+      (make-object-maker stencil-vector (x)
+        [value () x]
+        [length () (stencil-vector-length x)]
+        [mask () (stencil-vector-mask x)]
+        [ref (i)
+          (unless (and (fixnum? i) (fx< -1 i (stencil-vector-length x)))
+            ($oops 'stencil-vector-object "invalid index ~s" i))
+          (make-object (stencil-vector-ref x i))]
+        [size (g) (compute-size x g)]
+        [write (p) (write x p)]
+        [print (p) (pretty-print x p)]))
+
     (define make-phantom-object
       (make-object-maker phantom-bytevector (x)
         [value () x]
@@ -2383,6 +2422,7 @@
           [(vector? x) (make-vector-object x)]
           [(fxvector? x) (make-fxvector-object x)]
           [(bytevector? x) (make-bytevector-object x)]
+          [(stencil-vector? x) (make-stencil-vector-object x)]
           ; ftype-pointer? test must come before record? test
           [($ftype-pointer? x) (make-ftype-pointer-object x)]
           [(or (record? x) (and (eq? (subset-mode) 'system) ($record? x)))
@@ -2587,6 +2627,12 @@
                     ((fx= i n) size)))]
                [(fxvector? x) (align (fx+ (constant header-size-fxvector) (fx* (fxvector-length x) (constant ptr-bytes))))]
                [(bytevector? x) (align (fx+ (constant header-size-bytevector) (bytevector-length x)))]
+               [(stencil-vector? x)
+                (let ([n (stencil-vector-length x)])
+                  (do ([i 0 (fx+ i 1)]
+                       [size (align (fx+ (constant header-size-stencil-vector) (fx* (stencil-vector-length x) (constant ptr-bytes))))
+                         (fx+ size (compute-size (stencil-vector-ref x i)))])
+                    ((fx= i n) size)))]
                [($record? x)
                 (let ([rtd ($record-type-descriptor x)])
                   (fold-left (lambda (size fld)
@@ -2736,7 +2782,7 @@
                               (vector-set! count-vec i (cons 1 size))))]
                        ...))))])))
       (define-counters (type-names type-counts incr!)
-        pair symbol vector fxvector bytevector string box flonum bignum ratnum exactnum
+        pair symbol vector fxvector bytevector stencil-vector string box flonum bignum ratnum exactnum
         inexactnum continuation stack procedure code-object reloc-table port thread tlc
         rtd-counts phantom)
       (define compute-composition!
@@ -2766,6 +2812,14 @@
              (vector-for-each compute-composition! x)]
             [(fxvector? x) (incr! fxvector (align (fx+ (constant header-size-fxvector) (fx* (fxvector-length x) (constant ptr-bytes)))))]
             [(bytevector? x) (incr! bytevector (align (fx+ (constant header-size-bytevector) (bytevector-length x))))]
+            [(stencil-vector? x)
+             (let ([len (stencil-vector-length x)])
+               (incr! stencil-vector (align (fx+ (constant header-size-stencil-vector) (fx* len (constant ptr-bytes)))))
+               (let loop ([i len])
+                 (unless (fx= i 0)
+                   (let ([i (fx- i 1)])
+                     (compute-composition! (stencil-vector-ref x i))
+                     (loop i)))))]
             [($record? x)
              (let ([rtd ($record-type-descriptor x)])
                (let ([p (eq-hashtable-ref rtd-ht rtd #f)] [size (align (rtd-size rtd))])
@@ -2918,6 +2972,12 @@
                            (if (fx= i n)
                                next-proc
                                (construct-proc (vector-ref x i) (f (fx+ i 1))))))]
+                      [(stencil-vector? x)
+                       (let ([n (stencil-vector-length x)])
+                         (let f ([i 0])
+                           (if (fx= i n)
+                               next-proc
+                               (construct-proc (stencil-vector-ref x i) (f (fx+ i 1))))))]
                       [($record? x)
                        (let ([rtd ($record-type-descriptor x)])
                          (construct-proc rtd
diff --git a/s/library.ss b/s/library.ss
index a677378ec2..d7e65b4dbb 100644
--- a/s/library.ss
+++ b/s/library.ss
@@ -298,6 +298,9 @@
   (define index-oops
     (lambda (who x i)
       ($oops who "~s is not a valid index for ~s" i x)))
+  (define stencil-vector-oops
+    (lambda (who x)
+      ($oops who "~s is not a vector" x)))
 
   (define-library-entry (char->integer x) (char-oops 'char->integer x))
 
@@ -389,6 +392,9 @@
   (define-library-entry (bytevector-length v)
     (bytevector-oops 'bytevector-length v))
 
+  (define-library-entry (stencil-vector-mask v)
+    (stencil-vector-oops 'stencil-vector-mask v))
+
   (define-library-entry (char=? x y) (char-oops 'char=? (if (char? x) y x)))
   (define-library-entry (char<? x y) (char-oops 'char<? (if (char? x) y x)))
   (define-library-entry (char>? x y) (char-oops 'char>? (if (char? x) y x)))
@@ -512,6 +518,9 @@
 (define-library-entry (fxxor x y) (fxnonfixnum2 'fxxor x y))
 (define-library-entry (fxand x y) (fxnonfixnum2 'fxand x y))
 (define-library-entry (fxnot x) (fxnonfixnum1 'fxnot x))
+(define-library-entry (fxpopcount x) ($oops 'fxpopcount32 "~s is not a non-negative fixnum" x))
+(define-library-entry (fxpopcount32 x) ($oops 'fxpopcount32 "~s is not a 32-bit fixnum" x))
+(define-library-entry (fxpopcount16 x) ($oops 'fxpopcount16 "~s is not a 16-bit fixnum" x))
 
 (define-library-entry (fxsll x y)
   (cond
diff --git a/s/mathprims.ss b/s/mathprims.ss
index e790267641..41d0e80805 100644
--- a/s/mathprims.ss
+++ b/s/mathprims.ss
@@ -581,6 +581,18 @@
          [(1) (#3%fxlogbit1 k n)]
          [else ($oops who "invalid bit value ~s" b)])))
 
+   (set! fxpopcount
+      (lambda (x)
+         (#2%fxpopcount x)))
+
+   (set! fxpopcount32
+      (lambda (x)
+         (#2%fxpopcount32 x)))
+
+   (set! fxpopcount16
+      (lambda (x)
+         (#2%fxpopcount16 x)))
+
    (set! fxeven?
       (lambda (x)
          (#2%fxeven? x)))
diff --git a/s/mkheader.ss b/s/mkheader.ss
index dcd82c0368..02d9260351 100644
--- a/s/mkheader.ss
+++ b/s/mkheader.ss
@@ -248,6 +248,7 @@
         (deftotypep "Sfxvectorp" ($ mask-fxvector) ($ type-fxvector))
         (deftotypep "Sbytevectorp" ($ mask-bytevector) ($ type-bytevector))
         (deftotypep "Sstringp" ($ mask-string) ($ type-string))
+        (deftotypep "Sstencil_vectorp" ($ mask-stencil-vector) ($ type-stencil-vector))
         (deftotypep "Sbignump" ($ mask-bignum) ($ type-bignum))
         (deftotypep "Sboxp" ($ mask-box) ($ type-box))
         (deftotypep "Sinexactnump" ($ mask-inexactnum) ($ type-inexactnum))
@@ -297,6 +298,12 @@
 
         (defref Sunbox box ref)
   
+        (def "Sstencil_vector_length(x)"
+          (format "Spopcount(((uptr)~a)>>~d)"
+            (access "x" vector type)
+            ($ stencil-vector-mask-offset)))
+        (defref Sstencil_vector_ref vector data)
+        
         (export "iptr" "Sinteger_value" "(ptr)")
         (def "Sunsigned_value(x)" "(uptr)Sinteger_value(x)")
         (export (constant typedef-i32) "Sinteger32_value" "(ptr)")
@@ -846,6 +853,9 @@
         (defref BYTEVECTOR_TYPE bytevector type)
         (defref BVIT bytevector data)
 
+        (defref STENVECTTYPE stencil-vector type)
+        (definit INITSTENVECTIT stencil-vector data)
+
         (defref INEXACTNUM_TYPE inexactnum type)
         (defref INEXACTNUM_REAL_PART inexactnum real)
         (defref INEXACTNUM_IMAG_PART inexactnum imag)
diff --git a/s/newhash.ss b/s/newhash.ss
index 259010023b..4a17c2c9a7 100644
--- a/s/newhash.ss
+++ b/s/newhash.ss
@@ -1064,6 +1064,16 @@ Documentation notes:
                            (let ([i/2 (fxsrl (fx+ i 1) 1)])
                              (let-values ([(hc i^) (f (vector-ref x j) hc i/2)])
                                (g (fx+ j 1) hc (fx+ (fx- i i/2) i^))))))))]
+              [(stencil-vector? x)
+               (let ([n (stencil-vector-length x)] [hc (update hc 517766377)])
+                 (if (fx= n 0)
+                     (values hc i)
+                     (let g ([j 0] [hc hc] [i i])
+                       (if (or (fx= j n) (fx= i 0))
+                           (values hc i)
+                           (let ([i/2 (fxsrl (fx+ i 1) 1)])
+                             (let-values ([(hc i^) (f (stencil-vector-ref x j) hc i/2)])
+                               (g (fx+ j 1) hc (fx+ (fx- i i/2) i^))))))))]
               [(null? x) (values (update hc 496904691) i)]
               [(box? x) (f (unbox x) (update hc 410225874) i)]
               [(symbol? x) (values (update hc (symbol-hash x)) i)]
diff --git a/s/np-languages.ss b/s/np-languages.ss
index aa71f5d153..d92f5d4564 100644
--- a/s/np-languages.ss
+++ b/s/np-languages.ss
@@ -573,6 +573,7 @@
   (declare-primitive logor value #t)
   (declare-primitive logxor value #t)
   (declare-primitive lognot value #t)
+  (declare-primitive popcount value #t) ; x86_64 only
   (declare-primitive move value #t)
   (declare-primitive * value #t)
   (declare-primitive */ovfl value #f)
diff --git a/s/ppc32le.def b/s/ppc32le.def
index b0d655e5ef..0b83600c2a 100644
--- a/s/ppc32le.def
+++ b/s/ppc32le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #f)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #f)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor)
diff --git a/s/primdata.ss b/s/primdata.ss
index fdd4e41aa6..5782ba34ab 100644
--- a/s/primdata.ss
+++ b/s/primdata.ss
@@ -1366,6 +1366,9 @@
   (fxmodulo [sig [(fixnum fixnum) -> (fixnum)]] [flags arith-op cp02])
   (fxnonnegative? [sig [(fixnum) -> (boolean)]] [flags pure cp02 safeongoodargs])
   (fxnonpositive? [sig [(fixnum) -> (boolean)]] [flags pure cp02 safeongoodargs])
+  (fxpopcount [sig [(sub-fixnum) -> (fixnum)]] [flags arith-op cp02 safeongoodargs])
+  (fxpopcount32 [sig [(sub-fixnum) -> (fixnum)]] [flags arith-op cp02 safeongoodargs])
+  (fxpopcount16 [sig [(sub-fixnum) -> (fixnum)]] [flags arith-op cp02 safeongoodargs])
   (fxquotient [sig [(fixnum fixnum ...) -> (fixnum)]] [flags arith-op partial-folder])
   (fxremainder [sig [(fixnum fixnum) -> (fixnum)]] [flags arith-op cp02])
   (fxsll [sig [(fixnum sub-ufixnum) -> (fixnum)]] [flags arith-op cp02])
@@ -1668,6 +1671,15 @@
   (standard-output-port [sig [() (sub-symbol) (sub-symbol maybe-transcoder) -> (output-port)]] [flags true])
   (standard-error-port [sig [() (sub-symbol) (sub-symbol maybe-transcoder) -> (output-port)]] [flags true])
   (statistics [sig [() -> (sstats)]] [flags unrestricted alloc])
+  (stencil-vector [sig [(uptr ptr ...) -> (stencil-vector)]] [flags true])
+  (stencil-vector? [sig [(ptr) -> (boolean)]] [flags pure unrestricted mifoldable discard])
+  (stencil-vector-length [sig [(stencil-vector) -> (uptr)]] [flags true])
+  (stencil-vector-mask [sig [(stencil-vector) -> (uptr)]] [flags true])
+  (stencil-vector-mask-width [sig [() -> (fixnum)]] [flags pure unrestricted true cp02])
+  (stencil-vector-ref [sig [(stencil-vector uptr) -> (ptr)]] [flags pure])
+  (stencil-vector-set! [sig [(stencil-vector uptr ptr) -> (void)]] [flags true])
+  (stencil-vector-truncate! [sig [(stencil-vector uptr) -> (void)]] [flags true])
+  (stencil-vector-update [sig [(stencil-vector uptr uptr ptr ...) -> (stencil-vector)]] [flags true])
   (string->multibyte [feature windows] [sig [(sub-uint string) -> (bytevector)]] [flags true discard])
   (string->number [sig [(string) (string sub-ufixnum) -> (maybe-number)]] [flags discard]) ; radix not restricted to 2, 4, 8, 16
   (string-append-immutable [sig [(string ...) -> (string)]] [flags alloc safeongoodargs ieee r5rs])
@@ -2156,6 +2168,7 @@
   ($make-rnrs-libraries [flags single-valued])
   ($make-source-oops [flags single-valued])
   ($make-src-condition [flags single-valued])
+  ($make-stencil-vector [sig [(uptr uptr) -> (stencil-vector)]] [flags single-valued])
   ($make-textual-input/output-port [sig [(string port-handler string string) (string port-handler string string ptr) -> (textual-input/output-port)]] [flags alloc])
   ($make-textual-input-port [sig [(string port-handler string) (string port-handler string ptr) -> (textual-input-port)]] [flags alloc])
   ($make-textual-output-port [sig [(string port-handler string) (string port-handler string ptr) -> (textual-output-port)]] [flags alloc])
@@ -2265,6 +2278,8 @@
   ($src-condition-src [flags single-valued])
   ($src-condition-start [flags single-valued])
   ($sremprop [flags single-valued])
+  ($stencil-vector-set! [sig [(stencil-vector uptr ptr) -> (void)]] [flags true])
+  ($stencil-vector-update [sig [(stencil-vector uptr uptr ptr ...) -> (stencil-vector)]] [flags true])
   ($string-char-foldcase [flags single-valued])
   ($string-ref-check? [sig [(ptr ptr) -> (boolean)]] [flags unrestricted pure])
   ($string-set!-check? [sig [(ptr ptr) -> (boolean)]] [flags unrestricted discard])
diff --git a/s/prims.ss b/s/prims.ss
index 3978bb5484..f70ec6e7a0 100644
--- a/s/prims.ss
+++ b/s/prims.ss
@@ -1195,6 +1195,19 @@
   (lambda (s)
     (#3%immutable-fxvector? s)))
 
+(define stencil-vector-mask
+   (lambda (v)
+      (#2%stencil-vector-mask v)))
+
+(define-who $make-stencil-vector
+  (lambda (len mask)
+    ($oops who "should only be used as inlined with GC disabled")))
+
+; not safe; assumes `val` is older than `v`
+(define $stencil-vector-set!
+  (lambda (v i val)
+    ($stencil-vector-set! v i val)))
+
 ; not safe
 (define $record-ref
    (lambda (v i)
@@ -1280,6 +1293,8 @@
 
 (define fxvector? (lambda (x) (fxvector? x)))
 
+(define stencil-vector? (lambda (x) (stencil-vector? x)))
+
 (define procedure? (lambda (x) (procedure? x)))
 
 (define flonum? (lambda (x) (flonum? x)))
diff --git a/s/print.ss b/s/print.ss
index 3299764de3..f7c735efb3 100644
--- a/s/print.ss
+++ b/s/print.ss
@@ -101,6 +101,7 @@
           ($object-in-heap? x)
           (or (pair? x)
               (vector? x)
+              (stencil-vector? x)
               (box? x)
               (and ($record? x) (not (eq? x #!base-rtd)))
               (fxvector? x)
@@ -160,6 +161,14 @@
                         (unless (or (fx> i m) (limit? veclen))
                           (find-dupls (vector-ref x i) lev len)
                           (f (fx+ i 1) (decr veclen))))))]
+                 [(stencil-vector? x)
+                  (unless (fx= (stencil-vector-length x) 0)
+                    (let ([m (fx- (stencil-vector-length x) 1)]
+                          [lev (decr lev)])
+                      (let f ([i 0] [veclen len])
+                        (unless (or (fx> i m) (limit? veclen))
+                          (find-dupls (stencil-vector-ref x i) lev len)
+                          (f (fx+ i 1) (decr veclen))))))]
                  [(and ($record? x) (not (eq? x #!base-rtd)))
                   (when (print-record)
                     ((record-writer ($record-type-descriptor x)) x (bit-sink)
@@ -197,6 +206,7 @@
                (cond
                  [(pair? x) (cyclic-structure? x curlev lstlen cyclic-pair?)]
                  [(vector? x) (cyclic-structure? x curlev 0 cyclic-vector?)]
+                 [(stencil-vector? x) (cyclic-structure? x curlev 0 cyclic-stencil-vector?)]
                  [(and ($record? x) (not (eq? x #!base-rtd)))
                   (and (print-record)
                        (cyclic-structure? x curlev lstlen
@@ -238,6 +248,14 @@
                     (or (cyclic? (vector-ref x i) curlev 0)
                         (across (fx- i 1))))))))
 
+   (define cyclic-stencil-vector?
+      (lambda (x curlev lstlen)
+         (let ([n (stencil-vector-length x)] [curlev (fx+ curlev 1)])
+            (let across ([i (fx- (if len (fxmin len n) n) 1)])
+               (and (fx>= i 0)
+                    (or (cyclic? (stencil-vector-ref x i) curlev 0)
+                        (across (fx- i 1))))))))
+
    (define cyclic-box?
       (lambda (x curlev lstlen)
          (cyclic? (unbox x) (fx+ curlev 1) 0)))
@@ -278,6 +296,12 @@
                      (and (fx>= i 0)
                           (or (down (vector-ref x i) (fx- xlev 1))
                               (across (fx- i 1))))))]
+                [(stencil-vector? x)
+                 (let ([n (stencil-vector-length x)])
+                   (let across ([i (fx- (if len (fxmin len n) n) 1)])
+                     (and (fx>= i 0)
+                          (or (down (stencil-vector-ref x i) (fx- xlev 1))
+                              (across (fx- i 1))))))]
                 [(and ($record? x) (not (eq? x #!base-rtd)))
                  (and (print-record)
                       (call/cc
@@ -294,7 +318,7 @@
     (and (if ($immediate? x)
              (eq? x black-hole)
              (and ($object-in-heap? x)
-                  (or (pair? x) (vector? x) (box? x) (and ($record? x) (not (eq? x #!base-rtd))))))
+                  (or (pair? x) (vector? x) (stencil-vector? x) (box? x) (and ($record? x) (not (eq? x #!base-rtd))))))
          (or (print-graph)
              (and (not (and lev len))
                   (maybe-cyclic? x lev len)
@@ -651,6 +675,9 @@ floating point returns with (1 0 -1 ...).
           [(pair?) (wrpair x r lev len d? env p)]
           [(string?) (if d? (display-string x p) (wrstring x p))]
           [(vector?) (wrvector vector-length vector-ref #f x r lev len d? env p)]
+          [(stencil-vector?) (wrvector stencil-vector-length stencil-vector-ref
+                                       (string-append "stencil[" (number->string (stencil-vector-mask x) 16) "]")
+                                       x r lev len d? env p)]
           [(fxvector?) (wrvector fxvector-length fxvector-ref "vfx" x r lev len d? env p)]
           [(bytevector?) (wrvector bytevector-length bytevector-u8-ref "vu8" x r lev len d? env p)]
           [(flonum?) (wrflonum #f x r d? p)]
diff --git a/s/ta6fb.def b/s/ta6fb.def
index 479537f875..68fe863bdf 100644
--- a/s/ta6fb.def
+++ b/s/ta6fb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ta6le.def b/s/ta6le.def
index 20560f5737..985b626bb2 100644
--- a/s/ta6le.def
+++ b/s/ta6le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ta6nb.def b/s/ta6nb.def
index 309fb6c547..59f1164c81 100644
--- a/s/ta6nb.def
+++ b/s/ta6nb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ta6nt.def b/s/ta6nt.def
index 4c444630bf..75a948e67a 100644
--- a/s/ta6nt.def
+++ b/s/ta6nt.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads windows)
diff --git a/s/ta6ob.def b/s/ta6ob.def
index ae40a2b509..8195e342f9 100644
--- a/s/ta6ob.def
+++ b/s/ta6ob.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ta6osx.def b/s/ta6osx.def
index 5552f9a558..357c102c73 100644
--- a/s/ta6osx.def
+++ b/s/ta6osx.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ta6s2.def b/s/ta6s2.def
index 65ef344936..df3757c67d 100644
--- a/s/ta6s2.def
+++ b/s/ta6s2.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 3)
 (features iconv expeditor pthreads)
diff --git a/s/ti3fb.def b/s/ti3fb.def
index 5025e02727..18cc4bc36e 100644
--- a/s/ti3fb.def
+++ b/s/ti3fb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/ti3le.def b/s/ti3le.def
index e66bb53ad1..e25b8422a8 100644
--- a/s/ti3le.def
+++ b/s/ti3le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/ti3nb.def b/s/ti3nb.def
index b1b3857e08..127f7c0a05 100644
--- a/s/ti3nb.def
+++ b/s/ti3nb.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/ti3nt.def b/s/ti3nt.def
index 91b3c66f6d..4cbe1486bf 100644
--- a/s/ti3nt.def
+++ b/s/ti3nt.def
@@ -46,6 +46,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads windows)
diff --git a/s/ti3ob.def b/s/ti3ob.def
index ccf6bbb4f9..4b285d71b7 100644
--- a/s/ti3ob.def
+++ b/s/ti3ob.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/ti3osx.def b/s/ti3osx.def
index cfb55b07d7..7427f15e08 100644
--- a/s/ti3osx.def
+++ b/s/ti3osx.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/ti3s2.def b/s/ti3s2.def
index 5811982296..be35e15492 100644
--- a/s/ti3s2.def
+++ b/s/ti3s2.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #t)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #t)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/tppc32le.def b/s/tppc32le.def
index 61a8851f95..5951c0e924 100644
--- a/s/tppc32le.def
+++ b/s/tppc32le.def
@@ -45,6 +45,7 @@
 (define-constant unaligned-floats #f)
 (define-constant unaligned-integers #t)
 (define-constant integer-divide-instruction #f)
+(define-constant popcount-instruction #f)
 (define-constant software-floating-point #f)
 (define-constant segment-table-levels 1)
 (features iconv expeditor pthreads)
diff --git a/s/x86_64.ss b/s/x86_64.ss
index eb8e8c5559..ca36278060 100644
--- a/s/x86_64.ss
+++ b/s/x86_64.ss
@@ -699,6 +699,9 @@
          (go info op t t y)
          `(set! ,(make-live-info) ,z ,t)))])
 
+  (define-instruction value popcount
+    [(op (z ur) (x ur mem)) `(set! ,(make-live-info) ,z (asm ,info ,asm-popcount ,x))])
+
   (define-instruction value move
     [(op (z mem) (x ur imm32))
      `(set! ,(make-live-info) ,z ,x)]
@@ -997,7 +1000,7 @@
                      asm-logtest asm-fl-relop asm-relop asm-push asm-indirect-jump asm-literal-jump
                      asm-direct-jump asm-return-address asm-jump asm-conditional-jump asm-data-label asm-rp-header
                      asm-lea1 asm-lea2 asm-indirect-call asm-condition-code
-                     asm-fl-cvt asm-fl-store asm-fl-load asm-flt asm-trunc asm-div
+                     asm-fl-cvt asm-fl-store asm-fl-load asm-flt asm-trunc asm-div asm-popcount
                      asm-exchange asm-pause asm-locked-incr asm-locked-decr asm-locked-cmpxchg
                      asm-flop-2 asm-flsqrt asm-c-simple-call
                      asm-save-flrv asm-restore-flrv asm-return asm-c-return asm-size
@@ -1138,6 +1141,8 @@
 
   (define-op locked-cmpxchg (*) locked-cmpxchg-op)
 
+  (define-op popcount (*) popcount-op)
+
   ; also do inc-reg dec-reg
 
   ; the following are forms of the call instruction and push the return address
@@ -1145,7 +1150,7 @@
   #;(define-op bsrl      branch-always-op long #b11101000) ; pc-relative
   (define-op bsr       bsr-op)
 
-  ; the following are forms of the jmp instruction
+  ; the followin<g are forms of the jmp instruction
   (define-op jmp       jump-op #b100) ; reg/mem indirect
   (define-op bra       bra-op)
 
@@ -1577,6 +1582,18 @@
               [3 op-code]
               [0 (fxlogand (ax-ea-reg-code reg) 7)]))))))
 
+  (define popcount-op
+    (lambda (op size dest-reg src-ea code*)
+      (begin
+        (emit-code (op dest-reg src-ea code*)
+          (build byte #xF3)
+          (ax-ea-rex (if (eq? size 'quad) 1 0) src-ea dest-reg size)
+          (build byte #x0F)
+          (build byte #xB8)
+          (ax-ea-modrm-reg src-ea dest-reg)
+          (ax-ea-sib src-ea)
+          (ax-ea-addr-disp src-ea)))))
+
   (define-syntax emit-code
     (lambda (x)
       (define build-maybe-cons*
@@ -1590,6 +1607,25 @@
          (build-maybe-cons* #'(chunk ...)
            #'(aop-cons* `(asm ,op ,opnd ...) ?code*))])))
 
+  (define-syntax emit-literal-code
+    (lambda (x)
+      (syntax-case x ()
+        [(_ (op opnd ... ?code*) hexlike ...)
+         #`(emit-code (op opnd ... ?code*) (encode-hex-like hexlike) ...)])))
+
+  (define-syntax encode-hex-like
+    (lambda (x)
+      (syntax-case x ()
+        [(k hexlike)
+         (let ([n (let ([v (syntax->datum #'hexlike)])
+                    (if (number? v)
+                        ;; parsed as decimal; reparse as hex
+                        (string->number (number->string v) 16)
+                        ;; parsed as ymbol
+                        (string->number (symbol->string v) 16)))])
+           (with-syntax ([n (datum->syntax #'k n)])
+             #`(build byte n)))])))
+
   (define-who ax-size-code
     (lambda (x)
       (case x
@@ -1947,6 +1983,11 @@
       (Trivit (dest src0 src1)
         (emit mulsi src1 src0 dest code*))))
 
+  (define asm-popcount
+    (lambda (code* dest src)
+      (Trivit (src)
+        (emit popcount (cons 'reg dest) src code*))))
+
   (define-who asm-addop
     (lambda (op)
       (case op