diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c
index 2616214967..f9d0600c59 100644
--- a/src/mzscheme/gc2/newgc.c
+++ b/src/mzscheme/gc2/newgc.c
@@ -1312,6 +1312,7 @@ inline static void register_new_thread(void *t, void *c)
   work->next = threads;
   threads = work;
 }
+
 inline static void register_thread(void *t, void *c)
 {
   struct thread *work;
diff --git a/src/mzscheme/src/cstartup.inc b/src/mzscheme/src/cstartup.inc
index 1e130c68ff..7032c0de5a 100644
--- a/src/mzscheme/src/cstartup.inc
+++ b/src/mzscheme/src/cstartup.inc
@@ -4,7 +4,7 @@
 0,78,0,84,0,98,0,112,0,115,0,119,0,121,0,132,0,134,0,148,0,
 155,0,177,0,179,0,193,0,253,0,23,1,32,1,41,1,51,1,68,1,107,
 1,146,1,215,1,4,2,92,2,137,2,142,2,162,2,53,3,73,3,124,3,
-190,3,75,4,233,4,20,5,31,5,110,5,0,0,131,7,0,0,65,98,101,
+190,3,75,4,233,4,20,5,31,5,110,5,0,0,120,7,0,0,65,98,101,
 103,105,110,29,11,11,66,100,101,102,105,110,101,63,97,110,100,64,108,101,116,
 42,62,111,114,64,99,111,110,100,72,112,97,114,97,109,101,116,101,114,105,122,
 101,66,108,101,116,114,101,99,66,117,110,108,101,115,115,63,108,101,116,64,119,
@@ -14,11 +14,11 @@
 117,101,115,61,120,73,108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,
 97,109,98,100,97,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,
 111,110,45,107,101,121,61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,
-115,98,10,35,11,8,160,211,94,159,2,16,35,35,159,2,15,35,35,16,20,
+115,98,10,35,11,8,168,211,94,159,2,16,35,35,159,2,15,35,35,16,20,
 2,3,2,2,2,6,2,2,2,4,2,2,2,5,2,2,2,9,2,2,2,
 7,2,2,2,8,2,2,2,10,2,2,2,11,2,2,2,12,2,2,97,36,
-11,8,160,211,93,159,2,15,35,36,16,2,2,13,161,2,2,36,2,13,2,
-2,2,13,97,10,11,11,8,160,211,16,0,97,10,37,11,8,160,211,16,0,
+11,8,168,211,93,159,2,15,35,36,16,2,2,13,161,2,2,36,2,13,2,
+2,2,13,97,10,11,11,8,168,211,16,0,97,10,37,11,8,168,211,16,0,
 13,16,4,35,29,11,11,2,2,11,18,98,64,104,101,114,101,8,31,8,30,
 8,29,8,28,8,27,27,248,22,189,3,23,196,1,249,22,182,3,80,158,38,
 35,251,22,73,2,17,248,22,88,23,200,2,12,249,22,63,2,1,248,22,90,
@@ -28,14 +28,14 @@
 36,35,36,28,248,22,71,248,22,65,23,195,2,248,22,64,193,249,22,182,3,
 80,158,38,35,251,22,73,2,17,248,22,64,23,200,2,249,22,63,2,4,248,
 22,65,23,202,1,11,18,100,10,8,31,8,30,8,29,8,28,8,27,16,4,
-11,11,2,18,3,1,7,101,110,118,55,56,51,49,16,4,11,11,2,19,3,
-1,7,101,110,118,55,56,51,50,27,248,22,65,248,22,189,3,23,197,1,28,
+11,11,2,18,3,1,7,101,110,118,55,56,51,51,16,4,11,11,2,19,3,
+1,7,101,110,118,55,56,51,52,27,248,22,65,248,22,189,3,23,197,1,28,
 248,22,71,23,194,2,20,15,159,36,35,36,28,248,22,71,248,22,65,23,195,
 2,248,22,64,193,249,22,182,3,80,158,38,35,250,22,73,2,20,248,22,73,
 249,22,73,248,22,73,2,21,248,22,64,23,202,2,251,22,73,2,17,2,21,
 2,21,249,22,63,2,6,248,22,65,23,205,1,18,100,11,8,31,8,30,8,
-29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,51,52,
-16,4,11,11,2,19,3,1,7,101,110,118,55,56,51,53,248,22,189,3,193,
+29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,51,54,
+16,4,11,11,2,19,3,1,7,101,110,118,55,56,51,55,248,22,189,3,193,
 27,248,22,189,3,194,249,22,63,248,22,73,248,22,64,196,248,22,65,195,27,
 248,22,65,248,22,189,3,23,197,1,249,22,182,3,80,158,38,35,28,248,22,
 51,248,22,183,3,248,22,64,23,198,2,27,249,22,2,32,0,89,162,8,44,
@@ -65,39 +65,38 @@
 65,202,251,22,73,2,17,28,249,22,149,8,248,22,183,3,248,22,64,23,201,
 2,64,101,108,115,101,10,248,22,64,23,198,2,250,22,74,2,20,9,248,22,
 65,23,201,1,249,22,63,2,7,248,22,65,23,203,1,99,8,31,8,30,8,
-29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,53,55,
-16,4,11,11,2,19,3,1,7,101,110,118,55,56,53,56,18,158,94,10,64,
+29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,53,57,
+16,4,11,11,2,19,3,1,7,101,110,118,55,56,54,48,18,158,94,10,64,
 118,111,105,100,8,47,27,248,22,65,248,22,189,3,196,249,22,182,3,80,158,
 38,35,28,248,22,51,248,22,183,3,248,22,64,197,250,22,73,2,26,248,22,
 73,248,22,64,199,248,22,88,198,27,248,22,183,3,248,22,64,197,250,22,73,
 2,26,248,22,73,248,22,64,197,250,22,74,2,23,248,22,65,199,248,22,65,
 202,159,35,20,103,159,35,16,1,20,24,2,1,16,0,83,158,41,20,100,137,
 69,35,37,109,105,110,45,115,116,120,2,2,10,11,10,35,80,158,35,35,20,
-103,159,35,16,0,16,0,11,11,16,0,35,11,38,35,11,16,10,9,9,9,
-9,9,9,9,9,9,9,16,10,2,3,2,4,2,5,2,6,2,7,2,8,
-2,9,2,10,2,11,2,12,16,10,11,11,11,11,11,11,11,11,11,11,16,
-10,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,
-35,45,36,11,11,16,0,16,0,16,0,35,35,11,11,11,16,0,16,0,16,
-0,35,35,16,11,16,5,93,2,13,20,15,159,35,35,35,35,20,103,159,35,
-16,0,16,1,33,32,10,16,5,93,2,10,89,162,8,44,36,52,9,223,0,
-33,33,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,0,11,16,
-5,93,2,12,89,162,8,44,36,52,9,223,0,33,34,35,20,103,159,35,16,
-1,20,25,159,36,2,2,2,13,16,0,11,16,5,93,2,4,89,162,8,44,
-36,52,9,223,0,33,35,35,20,103,159,35,16,1,20,25,159,36,2,2,2,
-13,16,1,33,36,11,16,5,93,2,6,89,162,8,44,36,55,9,223,0,33,
-37,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,1,33,38,11,
-16,5,93,2,11,89,162,8,44,36,57,9,223,0,33,41,35,20,103,159,35,
-16,1,20,25,159,36,2,2,2,13,16,0,11,16,5,93,2,9,89,162,8,
-44,36,52,9,223,0,33,43,35,20,103,159,35,16,1,20,25,159,36,2,2,
-2,13,16,0,11,16,5,93,2,5,89,162,8,44,36,53,9,223,0,33,44,
-35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,0,11,16,5,93,
-2,8,89,162,8,44,36,54,9,223,0,33,45,35,20,103,159,35,16,1,20,
-25,159,36,2,2,2,13,16,0,11,16,5,93,2,7,89,162,8,44,36,57,
-9,223,0,33,46,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,
-1,33,48,11,16,5,93,2,3,89,162,8,44,36,53,9,223,0,33,49,35,
-20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,0,11,16,0,94,2,
-15,2,16,93,2,15,9,9,35,0};
-    EVAL_ONE_SIZED_STR((char *)expr, 2046);
+103,159,35,16,0,16,0,11,11,16,0,35,11,38,35,11,11,16,10,2,3,
+2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,16,10,11,
+11,11,11,11,11,11,11,11,11,16,10,2,3,2,4,2,5,2,6,2,7,
+2,8,2,9,2,10,2,11,2,12,35,45,36,11,11,16,0,16,0,16,0,
+35,35,11,11,11,16,0,16,0,16,0,35,35,16,11,16,5,93,2,13,20,
+15,159,35,35,35,35,20,103,159,35,16,0,16,1,33,32,10,16,5,93,2,
+10,89,162,8,44,36,52,9,223,0,33,33,35,20,103,159,35,16,1,20,25,
+159,36,2,2,2,13,16,0,11,16,5,93,2,12,89,162,8,44,36,52,9,
+223,0,33,34,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,0,
+11,16,5,93,2,4,89,162,8,44,36,52,9,223,0,33,35,35,20,103,159,
+35,16,1,20,25,159,36,2,2,2,13,16,1,33,36,11,16,5,93,2,6,
+89,162,8,44,36,55,9,223,0,33,37,35,20,103,159,35,16,1,20,25,159,
+36,2,2,2,13,16,1,33,38,11,16,5,93,2,11,89,162,8,44,36,57,
+9,223,0,33,41,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,
+0,11,16,5,93,2,9,89,162,8,44,36,52,9,223,0,33,43,35,20,103,
+159,35,16,1,20,25,159,36,2,2,2,13,16,0,11,16,5,93,2,5,89,
+162,8,44,36,53,9,223,0,33,44,35,20,103,159,35,16,1,20,25,159,36,
+2,2,2,13,16,0,11,16,5,93,2,8,89,162,8,44,36,54,9,223,0,
+33,45,35,20,103,159,35,16,1,20,25,159,36,2,2,2,13,16,0,11,16,
+5,93,2,7,89,162,8,44,36,57,9,223,0,33,46,35,20,103,159,35,16,
+1,20,25,159,36,2,2,2,13,16,1,33,48,11,16,5,93,2,3,89,162,
+8,44,36,53,9,223,0,33,49,35,20,103,159,35,16,1,20,25,159,36,2,
+2,2,13,16,0,11,16,0,94,2,15,2,16,93,2,15,9,9,35,0};
+    EVAL_ONE_SIZED_STR((char *)expr, 2035);
   }
   {
     static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,9,51,46,57,57,46,48,46,50,51,59,0,0,0,1,0,0,3,0,
@@ -106,7 +105,7 @@
 112,1,157,1,202,1,226,1,9,2,11,2,68,2,158,3,199,3,33,5,137,
 5,241,5,102,6,116,6,150,6,166,6,16,8,30,8,193,8,200,9,206,10,
 213,10,219,10,91,11,104,11,59,12,161,12,174,12,196,12,148,13,52,14,123,
-15,131,15,139,15,165,15,19,16,0,0,67,19,0,0,29,11,11,72,112,97,
+15,131,15,139,15,165,15,19,16,0,0,55,19,0,0,29,11,11,72,112,97,
 116,104,45,115,116,114,105,110,103,63,64,98,115,98,115,76,110,111,114,109,97,
 108,45,99,97,115,101,45,112,97,116,104,74,45,99,104,101,99,107,45,114,101,
 108,112,97,116,104,77,45,99,104,101,99,107,45,99,111,108,108,101,99,116,105,
@@ -312,37 +311,36 @@
 2,1,2,16,193,30,2,18,1,20,112,97,114,97,109,101,116,101,114,105,122,
 97,116,105,111,110,45,107,101,121,4,30,2,18,1,23,101,120,116,101,110,100,
 45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,3,16,0,11,
-11,16,4,2,6,2,5,2,3,2,9,39,11,38,35,11,16,11,9,9,9,
-9,9,9,9,9,9,9,9,16,11,2,8,2,7,2,16,2,15,2,13,2,
-12,2,4,2,11,2,14,2,10,2,2,16,11,11,11,11,11,11,11,11,11,
-11,11,11,16,11,2,8,2,7,2,16,2,15,2,13,2,12,2,4,2,11,
-2,14,2,10,2,2,46,46,36,11,11,16,0,16,0,16,0,35,35,11,11,
-11,16,0,16,0,16,0,35,35,16,0,16,17,83,158,35,16,2,89,162,43,
-36,48,2,19,223,0,33,29,80,159,35,53,36,83,158,35,16,2,89,162,8,
-44,36,55,2,19,223,0,33,30,80,159,35,52,36,83,158,35,16,2,32,0,
-89,162,43,36,44,2,2,222,33,31,80,159,35,35,36,83,158,35,16,2,249,
-22,146,6,7,92,7,92,80,159,35,36,36,83,158,35,16,2,89,162,43,36,
-53,2,4,223,0,33,32,80,159,35,37,36,83,158,35,16,2,32,0,89,162,
-8,44,37,49,2,5,222,33,33,80,159,35,38,36,83,158,35,16,2,32,0,
-89,162,8,44,38,50,2,6,222,33,35,80,159,35,39,36,83,158,35,16,2,
-89,162,8,45,37,47,2,7,223,0,33,37,80,159,35,40,36,83,158,35,16,
-2,32,0,89,162,43,39,51,2,8,222,33,40,80,159,35,41,36,83,158,35,
-16,2,32,0,89,162,43,38,49,2,9,222,33,41,80,159,35,42,36,83,158,
-35,16,2,32,0,89,162,43,37,52,2,10,222,33,42,80,159,35,43,36,83,
-158,35,16,2,32,0,89,162,43,37,53,2,11,222,33,43,80,159,35,44,36,
-83,158,35,16,2,32,0,89,162,43,36,43,2,12,222,33,44,80,159,35,45,
-36,83,158,35,16,2,83,158,38,20,96,95,2,13,89,162,43,35,42,9,223,
-0,33,45,89,162,43,36,52,9,223,0,33,46,80,159,35,46,36,83,158,35,
-16,2,27,248,22,160,13,248,22,155,7,27,28,249,22,149,8,247,22,163,7,
-2,21,6,1,1,59,6,1,1,58,250,22,128,7,6,14,14,40,91,94,126,
-97,93,42,41,126,97,40,46,42,41,23,196,2,23,196,1,89,162,8,44,37,
-47,2,14,223,0,33,49,80,159,35,47,36,83,158,35,16,2,83,158,38,20,
-96,96,2,15,89,162,8,44,38,53,9,223,0,33,54,89,162,43,37,46,9,
-223,0,33,55,89,162,43,36,45,9,223,0,33,56,80,159,35,48,36,83,158,
-35,16,2,89,162,43,38,51,2,16,223,0,33,58,80,159,35,49,36,94,29,
-94,2,17,68,35,37,107,101,114,110,101,108,11,29,94,2,17,69,35,37,109,
-105,110,45,115,116,120,11,9,9,9,35,0};
-    EVAL_ONE_SIZED_STR((char *)expr, 5072);
+11,16,4,2,6,2,5,2,3,2,9,39,11,38,35,11,11,16,11,2,8,
+2,7,2,16,2,15,2,13,2,12,2,4,2,11,2,14,2,10,2,2,16,
+11,11,11,11,11,11,11,11,11,11,11,11,16,11,2,8,2,7,2,16,2,
+15,2,13,2,12,2,4,2,11,2,14,2,10,2,2,46,46,36,11,11,16,
+0,16,0,16,0,35,35,11,11,11,16,0,16,0,16,0,35,35,16,0,16,
+17,83,158,35,16,2,89,162,43,36,48,2,19,223,0,33,29,80,159,35,53,
+36,83,158,35,16,2,89,162,8,44,36,55,2,19,223,0,33,30,80,159,35,
+52,36,83,158,35,16,2,32,0,89,162,43,36,44,2,2,222,33,31,80,159,
+35,35,36,83,158,35,16,2,249,22,146,6,7,92,7,92,80,159,35,36,36,
+83,158,35,16,2,89,162,43,36,53,2,4,223,0,33,32,80,159,35,37,36,
+83,158,35,16,2,32,0,89,162,8,44,37,49,2,5,222,33,33,80,159,35,
+38,36,83,158,35,16,2,32,0,89,162,8,44,38,50,2,6,222,33,35,80,
+159,35,39,36,83,158,35,16,2,89,162,8,45,37,47,2,7,223,0,33,37,
+80,159,35,40,36,83,158,35,16,2,32,0,89,162,43,39,51,2,8,222,33,
+40,80,159,35,41,36,83,158,35,16,2,32,0,89,162,43,38,49,2,9,222,
+33,41,80,159,35,42,36,83,158,35,16,2,32,0,89,162,43,37,52,2,10,
+222,33,42,80,159,35,43,36,83,158,35,16,2,32,0,89,162,43,37,53,2,
+11,222,33,43,80,159,35,44,36,83,158,35,16,2,32,0,89,162,43,36,43,
+2,12,222,33,44,80,159,35,45,36,83,158,35,16,2,83,158,38,20,96,95,
+2,13,89,162,43,35,42,9,223,0,33,45,89,162,43,36,52,9,223,0,33,
+46,80,159,35,46,36,83,158,35,16,2,27,248,22,160,13,248,22,155,7,27,
+28,249,22,149,8,247,22,163,7,2,21,6,1,1,59,6,1,1,58,250,22,
+128,7,6,14,14,40,91,94,126,97,93,42,41,126,97,40,46,42,41,23,196,
+2,23,196,1,89,162,8,44,37,47,2,14,223,0,33,49,80,159,35,47,36,
+83,158,35,16,2,83,158,38,20,96,96,2,15,89,162,8,44,38,53,9,223,
+0,33,54,89,162,43,37,46,9,223,0,33,55,89,162,43,36,45,9,223,0,
+33,56,80,159,35,48,36,83,158,35,16,2,89,162,43,38,51,2,16,223,0,
+33,58,80,159,35,49,36,94,29,94,2,17,68,35,37,107,101,114,110,101,108,
+11,29,94,2,17,69,35,37,109,105,110,45,115,116,120,11,9,9,9,35,0};
+    EVAL_ONE_SIZED_STR((char *)expr, 5060);
   }
   {
     static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,9,51,46,57,57,46,48,46,50,51,8,0,0,0,1,0,0,6,0,
@@ -350,7 +348,7 @@
 111,116,101,29,94,2,1,67,35,37,117,116,105,108,115,11,29,94,2,1,69,
 35,37,110,101,116,119,111,114,107,11,29,94,2,1,68,35,37,112,97,114,97,
 109,122,11,29,94,2,1,68,35,37,101,120,112,111,98,115,11,29,94,2,1,
-68,35,37,107,101,114,110,101,108,11,98,10,35,11,8,162,213,97,159,2,2,
+68,35,37,107,101,114,110,101,108,11,98,10,35,11,8,170,213,97,159,2,2,
 35,35,159,2,3,35,35,159,2,4,35,35,159,2,5,35,35,159,2,6,35,
 35,16,0,159,35,20,103,159,35,16,1,20,24,65,98,101,103,105,110,16,0,
 83,158,41,20,100,137,69,35,37,98,117,105,108,116,105,110,29,11,11,10,10,
@@ -367,7 +365,7 @@
 0,200,0,223,0,3,1,8,1,13,1,18,1,23,1,54,1,58,1,66,1,
 74,1,82,1,185,1,230,1,250,1,29,2,64,2,98,2,108,2,155,2,165,
 2,172,2,71,4,84,4,103,4,222,4,234,4,138,5,152,5,16,6,22,6,
-36,6,63,6,148,6,150,6,211,6,138,12,197,12,229,12,0,0,156,15,0,
+36,6,63,6,148,6,150,6,211,6,138,12,197,12,229,12,0,0,154,15,0,
 0,29,11,11,70,100,108,108,45,115,117,102,102,105,120,1,25,100,101,102,97,
 117,108,116,45,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,
 65,113,117,111,116,101,29,94,2,4,67,35,37,117,116,105,108,115,11,29,94,
@@ -539,25 +537,25 @@
 109,97,108,45,99,97,115,101,45,112,97,116,104,6,30,2,5,79,112,97,116,
 104,45,114,101,112,108,97,99,101,45,115,117,102,102,105,120,9,30,2,1,2,
 16,193,16,0,11,11,16,11,2,10,2,11,2,8,2,9,2,12,2,13,2,
-3,2,7,2,2,2,15,2,14,46,11,38,35,11,16,1,9,16,1,2,16,
-16,1,11,16,1,2,16,36,36,36,11,11,16,0,16,0,16,0,35,35,11,
-11,11,16,0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,89,162,
-43,36,44,9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,162,43,
-36,44,9,223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,43,36,
-48,67,103,101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,158,35,
-16,2,89,162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,26,80,
-159,35,54,36,83,158,35,16,2,248,22,163,7,69,115,111,45,115,117,102,102,
-105,120,80,159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,3,223,0,
-33,35,80,159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,41,2,
-7,222,192,80,159,35,41,36,83,158,35,16,2,247,22,123,80,159,35,42,36,
-83,158,35,16,2,247,22,122,80,159,35,43,36,83,158,35,16,2,247,22,59,
-80,159,35,44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,101,45,
-108,111,97,100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,158,35,
-46,83,158,35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,162,43,
-37,44,2,14,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,8,44,
-36,44,2,15,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,162,43,
-35,43,2,16,223,0,33,51,80,159,35,53,36,95,29,94,2,4,68,35,37,
-107,101,114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115,116,120,
-11,2,5,9,9,9,35,0};
-    EVAL_ONE_SIZED_STR((char *)expr, 4123);
+3,2,7,2,2,2,15,2,14,46,11,38,35,11,11,16,1,2,16,16,1,
+11,16,1,2,16,36,36,36,11,11,16,0,16,0,16,0,35,35,11,11,11,
+16,0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,89,162,43,36,
+44,9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,162,43,36,44,
+9,223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,43,36,48,67,
+103,101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,158,35,16,2,
+89,162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,26,80,159,35,
+54,36,83,158,35,16,2,248,22,163,7,69,115,111,45,115,117,102,102,105,120,
+80,159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,3,223,0,33,35,
+80,159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,41,2,7,222,
+192,80,159,35,41,36,83,158,35,16,2,247,22,123,80,159,35,42,36,83,158,
+35,16,2,247,22,122,80,159,35,43,36,83,158,35,16,2,247,22,59,80,159,
+35,44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,101,45,108,111,
+97,100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,158,35,46,83,
+158,35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,162,43,37,44,
+2,14,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,8,44,36,44,
+2,15,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,162,43,35,43,
+2,16,223,0,33,51,80,159,35,53,36,95,29,94,2,4,68,35,37,107,101,
+114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115,116,120,11,2,
+5,9,9,9,35,0};
+    EVAL_ONE_SIZED_STR((char *)expr, 4121);
   }
diff --git a/src/mzscheme/src/module.c b/src/mzscheme/src/module.c
index 560055cd8d..27b4e05608 100644
--- a/src/mzscheme/src/module.c
+++ b/src/mzscheme/src/module.c
@@ -6809,7 +6809,7 @@ char *compute_provide_arrays(Scheme_Hash_Table *all_provided, Scheme_Hash_Table
 
       /* Discard exsnom[n]s if there are no re-exports */
       for (i = 0; i < excount; i++) {
-        if (!SCHEME_NULLP(exsnoms[count]))
+        if (!SCHEME_NULLP(exsnoms[i]))
           break;
       }
       if (i >= excount) {