diff --git a/src/mzscheme/src/cstartup.inc b/src/mzscheme/src/cstartup.inc
index 83c12af652..924ea70fb4 100644
--- a/src/mzscheme/src/cstartup.inc
+++ b/src/mzscheme/src/cstartup.inc
@@ -103,9 +103,9 @@
 21,0,38,0,53,0,71,0,87,0,97,0,115,0,135,0,151,0,169,0,200,
 0,229,0,251,0,9,1,15,1,29,1,34,1,44,1,52,1,80,1,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,
-220,10,227,10,102,11,115,11,70,12,172,12,185,12,207,12,159,13,63,14,134,
-15,142,15,150,15,176,15,30,16,0,0,75,19,0,0,29,11,11,72,112,97,
+5,102,6,116,6,150,6,166,6,16,8,30,8,193,8,194,9,194,10,201,10,
+208,10,215,10,90,11,103,11,58,12,160,12,173,12,195,12,147,13,51,14,122,
+15,130,15,138,15,164,15,18,16,0,0,63,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,
@@ -219,129 +219,129 @@
 22,191,8,2,10,2,25,35,23,200,2,23,201,2,28,28,248,22,156,6,23,
 197,2,10,248,22,144,7,23,197,2,12,252,22,191,8,2,10,2,26,36,23,
 200,2,23,201,2,91,159,38,11,90,161,38,35,11,248,22,155,13,23,199,2,
-87,94,23,195,1,87,94,28,23,193,2,12,250,22,128,9,2,10,2,27,23,
-201,2,249,22,7,23,195,1,23,196,1,27,249,22,144,13,250,22,191,13,0,
-18,35,114,120,35,34,40,91,46,93,91,94,46,93,42,124,41,36,34,248,22,
-140,13,23,201,1,28,248,22,156,6,23,203,2,249,22,168,7,23,204,1,8,
-63,23,202,1,28,248,22,135,13,23,199,2,248,22,136,13,23,199,1,87,94,
-23,198,1,247,22,137,13,28,248,22,134,13,194,249,22,152,13,195,194,192,91,
-159,37,11,90,161,37,35,11,87,95,28,28,248,22,135,13,23,196,2,10,27,
-248,22,134,13,23,197,2,28,23,193,2,192,87,94,23,193,1,28,248,22,156,
-6,23,197,2,27,248,22,156,13,23,198,2,28,23,193,2,192,87,94,23,193,
-1,248,22,157,13,23,198,2,11,12,252,22,191,8,2,11,2,25,35,23,200,
-2,23,201,2,28,28,248,22,156,6,23,197,2,10,248,22,144,7,23,197,2,
-12,252,22,191,8,2,11,2,26,36,23,200,2,23,201,2,91,159,38,11,90,
-161,38,35,11,248,22,155,13,23,199,2,87,94,23,195,1,87,94,28,23,193,
-2,12,250,22,128,9,2,11,2,27,23,201,2,249,22,7,23,195,1,23,196,
-1,27,249,22,144,13,249,22,154,7,250,22,128,14,0,9,35,114,120,35,34,
-91,46,93,34,248,22,140,13,23,203,1,6,1,1,95,28,248,22,156,6,23,
-202,2,249,22,168,7,23,203,1,8,63,23,201,1,28,248,22,135,13,23,199,
-2,248,22,136,13,23,199,1,87,94,23,198,1,247,22,137,13,28,248,22,134,
-13,194,249,22,152,13,195,194,192,249,247,22,187,4,194,11,249,80,158,37,46,
-9,9,249,80,158,37,46,195,9,27,247,22,177,13,249,80,158,38,47,28,23,
-195,2,27,248,22,173,7,6,11,11,80,76,84,67,79,76,76,69,67,84,83,
-28,192,192,6,0,0,6,0,0,27,28,23,196,1,250,22,152,13,248,22,173,
-13,69,97,100,100,111,110,45,100,105,114,247,22,171,7,6,8,8,99,111,108,
-108,101,99,116,115,11,27,248,80,159,41,52,36,250,22,77,23,203,1,248,22,
-73,248,22,173,13,72,99,111,108,108,101,99,116,115,45,100,105,114,23,204,1,
-28,23,194,2,249,22,63,23,196,1,23,195,1,192,32,48,89,162,8,44,38,
-54,2,19,222,33,49,27,249,22,184,13,23,197,2,23,198,2,28,23,193,2,
-87,94,23,196,1,27,248,22,88,23,195,2,27,27,248,22,97,23,197,1,27,
-249,22,184,13,23,201,2,23,196,2,28,23,193,2,87,94,23,194,1,27,248,
-22,88,23,195,2,27,250,2,48,23,203,2,23,204,1,248,22,97,23,199,1,
-28,249,22,150,7,23,196,2,2,28,249,22,77,23,202,2,194,249,22,63,248,
-22,143,13,23,197,1,23,195,1,87,95,23,199,1,23,193,1,28,249,22,150,
-7,23,196,2,2,28,249,22,77,23,200,2,9,249,22,63,248,22,143,13,23,
-197,1,9,28,249,22,150,7,23,196,2,2,28,249,22,77,197,194,87,94,23,
-196,1,249,22,63,248,22,143,13,23,197,1,194,87,94,23,193,1,28,249,22,
-150,7,23,198,2,2,28,249,22,77,195,9,87,94,23,194,1,249,22,63,248,
-22,143,13,23,199,1,9,87,95,28,28,248,22,144,7,194,10,248,22,156,6,
-194,12,250,22,191,8,2,14,6,21,21,98,121,116,101,32,115,116,114,105,110,
-103,32,111,114,32,115,116,114,105,110,103,196,28,28,248,22,72,195,249,22,4,
-22,134,13,196,11,12,250,22,191,8,2,14,6,13,13,108,105,115,116,32,111,
-102,32,112,97,116,104,115,197,250,2,48,197,195,28,248,22,156,6,197,248,22,
-167,7,197,196,32,51,89,162,8,44,39,57,2,19,222,33,54,32,52,89,162,
-8,44,38,54,70,102,111,117,110,100,45,101,120,101,99,222,33,53,28,23,193,
-2,91,159,38,11,90,161,38,35,11,248,22,155,13,23,199,2,87,95,23,195,
-1,23,194,1,27,28,23,198,2,27,248,22,160,13,23,201,2,28,249,22,163,
-8,23,195,2,23,202,2,11,28,248,22,156,13,23,194,2,250,2,52,23,201,
-2,23,202,2,249,22,152,13,23,200,2,23,198,1,250,2,52,23,201,2,23,
-202,2,23,196,1,11,28,23,193,2,192,87,94,23,193,1,27,28,248,22,134,
-13,23,196,2,27,249,22,152,13,23,198,2,23,201,2,28,28,248,22,147,13,
-193,10,248,22,146,13,193,192,11,11,28,23,193,2,192,87,94,23,193,1,28,
-23,199,2,11,27,248,22,160,13,23,202,2,28,249,22,163,8,23,195,2,23,
-203,1,11,28,248,22,156,13,23,194,2,250,2,52,23,202,1,23,203,1,249,
-22,152,13,23,201,1,23,198,1,250,2,52,201,202,195,194,28,248,22,71,23,
-197,2,11,27,248,22,159,13,248,22,64,23,199,2,27,249,22,152,13,23,196,
-1,23,197,2,28,248,22,146,13,23,194,2,250,2,52,198,199,195,87,94,23,
-193,1,27,248,22,65,23,200,1,28,248,22,71,23,194,2,11,27,248,22,159,
-13,248,22,64,23,196,2,27,249,22,152,13,23,196,1,23,200,2,28,248,22,
-146,13,23,194,2,250,2,52,201,202,195,87,94,23,193,1,27,248,22,65,23,
-197,1,28,248,22,71,23,194,2,11,27,248,22,159,13,248,22,64,195,27,249,
-22,152,13,23,196,1,202,28,248,22,146,13,193,250,2,52,204,205,195,251,2,
-51,204,205,206,248,22,65,199,87,95,28,27,248,22,134,13,23,196,2,28,23,
-193,2,192,87,94,23,193,1,28,248,22,156,6,23,196,2,27,248,22,156,13,
-23,197,2,28,23,193,2,192,87,94,23,193,1,248,22,157,13,23,197,2,11,
-12,250,22,191,8,2,15,6,25,25,112,97,116,104,32,111,114,32,115,116,114,
-105,110,103,32,40,115,97,110,115,32,110,117,108,41,23,197,2,28,28,23,195,
-2,28,27,248,22,134,13,23,197,2,28,23,193,2,192,87,94,23,193,1,28,
-248,22,156,6,23,197,2,27,248,22,156,13,23,198,2,28,23,193,2,192,87,
-94,23,193,1,248,22,157,13,23,198,2,11,248,22,156,13,23,196,2,11,10,
-12,250,22,191,8,2,15,6,29,29,35,102,32,111,114,32,114,101,108,97,116,
-105,118,101,32,112,97,116,104,32,111,114,32,115,116,114,105,110,103,23,198,2,
-28,28,248,22,156,13,23,195,2,91,159,38,11,90,161,38,35,11,248,22,155,
-13,23,198,2,249,22,161,8,194,68,114,101,108,97,116,105,118,101,11,27,248,
-22,173,7,6,4,4,80,65,84,72,251,2,51,23,199,1,23,200,1,23,201,
-1,28,23,197,2,27,249,80,158,43,47,23,200,1,9,28,249,22,161,8,247,
-22,175,7,2,21,249,22,63,248,22,143,13,5,1,46,23,195,1,192,9,27,
-248,22,159,13,23,196,1,28,248,22,146,13,193,250,2,52,198,199,195,11,250,
-80,158,38,48,196,197,11,250,80,158,38,48,196,11,11,87,94,249,22,147,6,
-247,22,183,4,195,248,22,173,5,249,22,169,3,35,249,22,153,3,197,198,27,
-28,23,197,2,87,95,23,196,1,23,195,1,23,197,1,87,94,23,197,1,27,
-248,22,173,13,2,20,27,249,80,158,40,48,23,196,1,11,27,27,248,22,172,
-3,23,200,1,28,192,192,35,27,27,248,22,172,3,23,202,1,28,192,192,35,
-249,22,150,5,23,197,1,83,158,39,20,97,95,89,162,8,44,35,47,9,224,
-3,2,33,58,23,195,1,23,196,1,27,248,22,135,5,23,195,1,248,80,159,
-38,53,36,193,159,35,20,103,159,35,16,1,65,98,101,103,105,110,16,0,83,
-158,41,20,100,138,67,35,37,117,116,105,108,115,2,1,11,11,10,10,42,80,
-158,35,35,20,103,159,37,16,17,30,2,1,2,2,193,30,2,1,2,3,193,
-30,2,1,2,4,193,30,2,1,2,5,193,30,2,1,2,6,193,30,2,1,
-2,7,193,30,2,1,2,8,193,30,2,1,2,9,193,30,2,1,2,10,193,
-30,2,1,2,11,193,30,2,1,2,12,193,30,2,1,2,13,193,30,2,1,
-2,14,193,30,2,1,2,15,193,30,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,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,158,
-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,96,2,13,89,162,43,35,43,9,223,0,33,
-45,89,162,43,36,44,9,223,0,33,46,89,162,43,37,54,9,223,0,33,47,
-80,159,35,46,36,83,158,35,16,2,27,248,22,180,13,248,22,167,7,27,28,
-249,22,161,8,247,22,175,7,2,21,6,1,1,59,6,1,1,58,250,22,140,
-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,50,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,55,89,162,43,37,46,9,223,0,33,56,89,162,43,36,45,9,223,0,33,
-57,80,159,35,48,36,83,158,35,16,2,89,162,43,38,51,2,16,223,0,33,
-59,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, 5080);
+87,94,23,195,1,87,94,28,192,12,250,22,128,9,2,10,2,27,23,201,2,
+249,22,7,194,195,27,249,22,144,13,250,22,191,13,0,18,35,114,120,35,34,
+40,91,46,93,91,94,46,93,42,124,41,36,34,248,22,140,13,23,201,1,28,
+248,22,156,6,23,203,2,249,22,168,7,23,204,1,8,63,23,202,1,28,248,
+22,135,13,23,199,2,248,22,136,13,23,199,1,87,94,23,198,1,247,22,137,
+13,28,248,22,134,13,194,249,22,152,13,195,194,192,91,159,37,11,90,161,37,
+35,11,87,95,28,28,248,22,135,13,23,196,2,10,27,248,22,134,13,23,197,
+2,28,23,193,2,192,87,94,23,193,1,28,248,22,156,6,23,197,2,27,248,
+22,156,13,23,198,2,28,23,193,2,192,87,94,23,193,1,248,22,157,13,23,
+198,2,11,12,252,22,191,8,2,11,2,25,35,23,200,2,23,201,2,28,28,
+248,22,156,6,23,197,2,10,248,22,144,7,23,197,2,12,252,22,191,8,2,
+11,2,26,36,23,200,2,23,201,2,91,159,38,11,90,161,38,35,11,248,22,
+155,13,23,199,2,87,94,23,195,1,87,94,28,192,12,250,22,128,9,2,11,
+2,27,23,201,2,249,22,7,194,195,27,249,22,144,13,249,22,154,7,250,22,
+128,14,0,9,35,114,120,35,34,91,46,93,34,248,22,140,13,23,203,1,6,
+1,1,95,28,248,22,156,6,23,202,2,249,22,168,7,23,203,1,8,63,23,
+201,1,28,248,22,135,13,23,199,2,248,22,136,13,23,199,1,87,94,23,198,
+1,247,22,137,13,28,248,22,134,13,194,249,22,152,13,195,194,192,249,247,22,
+187,4,194,11,249,80,158,37,46,9,9,249,80,158,37,46,195,9,27,247,22,
+177,13,249,80,158,38,47,28,23,195,2,27,248,22,173,7,6,11,11,80,76,
+84,67,79,76,76,69,67,84,83,28,192,192,6,0,0,6,0,0,27,28,23,
+196,1,250,22,152,13,248,22,173,13,69,97,100,100,111,110,45,100,105,114,247,
+22,171,7,6,8,8,99,111,108,108,101,99,116,115,11,27,248,80,159,41,52,
+36,250,22,77,23,203,1,248,22,73,248,22,173,13,72,99,111,108,108,101,99,
+116,115,45,100,105,114,23,204,1,28,23,194,2,249,22,63,23,196,1,23,195,
+1,192,32,48,89,162,8,44,38,54,2,19,222,33,49,27,249,22,184,13,23,
+197,2,23,198,2,28,23,193,2,87,94,23,196,1,27,248,22,88,23,195,2,
+27,27,248,22,97,23,197,1,27,249,22,184,13,23,201,2,23,196,2,28,23,
+193,2,87,94,23,194,1,27,248,22,88,23,195,2,27,250,2,48,23,203,2,
+23,204,1,248,22,97,23,199,1,28,249,22,150,7,23,196,2,2,28,249,22,
+77,23,202,2,194,249,22,63,248,22,143,13,23,197,1,23,195,1,87,95,23,
+199,1,23,193,1,28,249,22,150,7,23,196,2,2,28,249,22,77,23,200,2,
+9,249,22,63,248,22,143,13,23,197,1,9,28,249,22,150,7,23,196,2,2,
+28,249,22,77,197,194,87,94,23,196,1,249,22,63,248,22,143,13,23,197,1,
+194,87,94,23,193,1,28,249,22,150,7,23,198,2,2,28,249,22,77,195,9,
+87,94,23,194,1,249,22,63,248,22,143,13,23,199,1,9,87,95,28,28,248,
+22,144,7,194,10,248,22,156,6,194,12,250,22,191,8,2,14,6,21,21,98,
+121,116,101,32,115,116,114,105,110,103,32,111,114,32,115,116,114,105,110,103,196,
+28,28,248,22,72,195,249,22,4,22,134,13,196,11,12,250,22,191,8,2,14,
+6,13,13,108,105,115,116,32,111,102,32,112,97,116,104,115,197,250,2,48,197,
+195,28,248,22,156,6,197,248,22,167,7,197,196,32,51,89,162,8,44,39,57,
+2,19,222,33,54,32,52,89,162,8,44,38,54,70,102,111,117,110,100,45,101,
+120,101,99,222,33,53,28,23,193,2,91,159,38,11,90,161,38,35,11,248,22,
+155,13,23,199,2,87,95,23,195,1,23,194,1,27,28,23,198,2,27,248,22,
+160,13,23,201,2,28,249,22,163,8,23,195,2,23,202,2,11,28,248,22,156,
+13,23,194,2,250,2,52,23,201,2,23,202,2,249,22,152,13,23,200,2,23,
+198,1,250,2,52,23,201,2,23,202,2,23,196,1,11,28,23,193,2,192,87,
+94,23,193,1,27,28,248,22,134,13,23,196,2,27,249,22,152,13,23,198,2,
+23,201,2,28,28,248,22,147,13,193,10,248,22,146,13,193,192,11,11,28,23,
+193,2,192,87,94,23,193,1,28,23,199,2,11,27,248,22,160,13,23,202,2,
+28,249,22,163,8,23,195,2,23,203,1,11,28,248,22,156,13,23,194,2,250,
+2,52,23,202,1,23,203,1,249,22,152,13,23,201,1,23,198,1,250,2,52,
+201,202,195,194,28,248,22,71,23,197,2,11,27,248,22,159,13,248,22,64,23,
+199,2,27,249,22,152,13,23,196,1,23,197,2,28,248,22,146,13,23,194,2,
+250,2,52,198,199,195,87,94,23,193,1,27,248,22,65,23,200,1,28,248,22,
+71,23,194,2,11,27,248,22,159,13,248,22,64,23,196,2,27,249,22,152,13,
+23,196,1,23,200,2,28,248,22,146,13,23,194,2,250,2,52,201,202,195,87,
+94,23,193,1,27,248,22,65,23,197,1,28,248,22,71,23,194,2,11,27,248,
+22,159,13,248,22,64,195,27,249,22,152,13,23,196,1,202,28,248,22,146,13,
+193,250,2,52,204,205,195,251,2,51,204,205,206,248,22,65,199,87,95,28,27,
+248,22,134,13,23,196,2,28,23,193,2,192,87,94,23,193,1,28,248,22,156,
+6,23,196,2,27,248,22,156,13,23,197,2,28,23,193,2,192,87,94,23,193,
+1,248,22,157,13,23,197,2,11,12,250,22,191,8,2,15,6,25,25,112,97,
+116,104,32,111,114,32,115,116,114,105,110,103,32,40,115,97,110,115,32,110,117,
+108,41,23,197,2,28,28,23,195,2,28,27,248,22,134,13,23,197,2,28,23,
+193,2,192,87,94,23,193,1,28,248,22,156,6,23,197,2,27,248,22,156,13,
+23,198,2,28,23,193,2,192,87,94,23,193,1,248,22,157,13,23,198,2,11,
+248,22,156,13,23,196,2,11,10,12,250,22,191,8,2,15,6,29,29,35,102,
+32,111,114,32,114,101,108,97,116,105,118,101,32,112,97,116,104,32,111,114,32,
+115,116,114,105,110,103,23,198,2,28,28,248,22,156,13,23,195,2,91,159,38,
+11,90,161,38,35,11,248,22,155,13,23,198,2,249,22,161,8,194,68,114,101,
+108,97,116,105,118,101,11,27,248,22,173,7,6,4,4,80,65,84,72,251,2,
+51,23,199,1,23,200,1,23,201,1,28,23,197,2,27,249,80,158,43,47,23,
+200,1,9,28,249,22,161,8,247,22,175,7,2,21,249,22,63,248,22,143,13,
+5,1,46,23,195,1,192,9,27,248,22,159,13,23,196,1,28,248,22,146,13,
+193,250,2,52,198,199,195,11,250,80,158,38,48,196,197,11,250,80,158,38,48,
+196,11,11,87,94,249,22,147,6,247,22,183,4,195,248,22,173,5,249,22,169,
+3,35,249,22,153,3,197,198,27,28,23,197,2,87,95,23,196,1,23,195,1,
+23,197,1,87,94,23,197,1,27,248,22,173,13,2,20,27,249,80,158,40,48,
+23,196,1,11,27,27,248,22,172,3,23,200,1,28,192,192,35,27,27,248,22,
+172,3,23,202,1,28,192,192,35,249,22,150,5,23,197,1,83,158,39,20,97,
+95,89,162,8,44,35,47,9,224,3,2,33,58,23,195,1,23,196,1,27,248,
+22,135,5,23,195,1,248,80,159,38,53,36,193,159,35,20,103,159,35,16,1,
+65,98,101,103,105,110,16,0,83,158,41,20,100,138,67,35,37,117,116,105,108,
+115,2,1,11,11,10,10,42,80,158,35,35,20,103,159,37,16,17,30,2,1,
+2,2,193,30,2,1,2,3,193,30,2,1,2,4,193,30,2,1,2,5,193,
+30,2,1,2,6,193,30,2,1,2,7,193,30,2,1,2,8,193,30,2,1,
+2,9,193,30,2,1,2,10,193,30,2,1,2,11,193,30,2,1,2,12,193,
+30,2,1,2,13,193,30,2,1,2,14,193,30,2,1,2,15,193,30,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,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,158,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,96,2,13,
+89,162,43,35,43,9,223,0,33,45,89,162,43,36,44,9,223,0,33,46,89,
+162,43,37,54,9,223,0,33,47,80,159,35,46,36,83,158,35,16,2,27,248,
+22,180,13,248,22,167,7,27,28,249,22,161,8,247,22,175,7,2,21,6,1,
+1,59,6,1,1,58,250,22,140,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,50,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,55,89,162,43,37,46,9,223,0,33,56,
+89,162,43,36,45,9,223,0,33,57,80,159,35,48,36,83,158,35,16,2,89,
+162,43,38,51,2,16,223,0,33,59,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, 5068);
   }
   {
     static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,7,52,46,49,46,49,46,51,8,0,0,0,1,0,0,6,0,19,0,
@@ -365,8 +365,8 @@
 41,0,47,0,60,0,74,0,96,0,122,0,134,0,152,0,172,0,184,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,142,12,201,12,233,12,0,0,157,15,0,0,29,
+2,71,4,84,4,103,4,222,4,234,4,130,5,144,5,8,6,14,6,28,6,
+55,6,140,6,142,6,207,6,142,12,201,12,233,12,0,0,157,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,2,4,
@@ -429,89 +429,89 @@
 73,194,248,22,73,194,32,39,89,162,43,36,54,2,19,222,33,40,28,248,22,
 71,248,22,65,23,195,2,249,22,7,9,248,22,64,195,91,159,37,11,90,161,
 37,35,11,27,248,22,65,23,197,2,28,248,22,71,248,22,65,23,195,2,249,
-22,7,9,248,22,64,23,196,1,91,159,37,11,90,161,37,35,11,27,248,22,
-65,23,197,2,28,248,22,71,248,22,65,23,195,2,249,22,7,9,248,22,64,
-23,196,1,91,159,37,11,90,161,37,35,11,248,2,39,248,22,65,23,197,2,
-249,22,7,249,22,63,248,22,64,23,200,1,23,197,1,23,196,1,249,22,7,
-249,22,63,248,22,64,23,200,1,23,197,1,23,196,1,249,22,7,249,22,63,
-248,22,64,23,200,1,23,197,1,195,27,248,2,36,23,195,1,28,194,192,248,
-2,39,193,87,95,28,248,22,168,4,195,12,250,22,191,8,2,20,6,20,20,
-114,101,115,111,108,118,101,100,45,109,111,100,117,108,101,45,112,97,116,104,197,
-28,24,193,2,248,24,194,1,195,87,94,23,193,1,12,27,27,250,22,137,2,
-80,158,41,42,248,22,140,14,247,22,181,11,11,28,23,193,2,192,87,94,23,
-193,1,27,247,22,121,87,94,250,22,135,2,80,158,42,42,248,22,140,14,247,
-22,181,11,195,192,250,22,135,2,195,198,66,97,116,116,97,99,104,251,211,197,
-198,199,10,28,192,250,22,190,8,11,196,195,248,22,188,8,194,28,249,22,162,
-6,194,6,1,1,46,2,17,28,249,22,162,6,194,6,2,2,46,46,62,117,
-112,192,28,249,22,163,8,248,22,65,23,200,2,23,197,1,28,249,22,161,8,
-248,22,64,23,200,2,23,196,1,251,22,188,8,2,20,6,26,26,99,121,99,
-108,101,32,105,110,32,108,111,97,100,105,110,103,32,97,116,32,126,101,58,32,
-126,101,23,200,1,249,22,2,22,65,248,22,78,249,22,63,23,206,1,23,202,
-1,12,12,247,192,20,14,159,80,158,39,44,249,22,63,247,22,181,11,23,197,
-1,20,14,159,80,158,39,39,250,80,158,42,40,249,22,27,11,80,158,44,39,
-22,150,4,23,196,1,249,247,22,187,4,23,198,1,248,22,52,248,22,138,13,
-23,198,1,87,94,28,28,248,22,134,13,23,197,2,10,248,22,174,4,23,197,
-2,12,28,23,198,2,250,22,190,8,11,6,15,15,98,97,100,32,109,111,100,
-117,108,101,32,112,97,116,104,23,201,2,250,22,191,8,2,20,6,19,19,109,
-111,100,117,108,101,45,112,97,116,104,32,111,114,32,112,97,116,104,23,199,2,
-28,28,248,22,61,23,197,2,249,22,161,8,248,22,64,23,199,2,2,4,11,
-248,22,169,4,248,22,88,197,28,28,248,22,61,23,197,2,249,22,161,8,248,
-22,64,23,199,2,66,112,108,97,110,101,116,11,87,94,28,207,12,20,14,159,
-80,158,37,39,250,80,158,40,40,249,22,27,11,80,158,42,39,22,181,11,23,
-197,1,90,161,36,35,10,249,22,151,4,21,94,2,21,6,18,18,112,108,97,
-110,101,116,47,114,101,115,111,108,118,101,114,46,115,115,1,27,112,108,97,110,
-101,116,45,109,111,100,117,108,101,45,110,97,109,101,45,114,101,115,111,108,118,
-101,114,12,251,211,199,200,201,202,87,94,23,193,1,27,89,162,8,44,36,45,
-79,115,104,111,119,45,99,111,108,108,101,99,116,105,111,110,45,101,114,114,223,
-6,33,44,27,28,248,22,51,23,199,2,27,250,22,137,2,80,158,43,43,249,
-22,63,23,204,2,247,22,175,13,11,28,23,193,2,192,87,94,23,193,1,91,
-159,37,11,90,161,37,35,11,249,80,159,44,48,36,248,22,54,23,204,2,11,
-27,251,80,158,47,50,2,20,23,202,1,28,248,22,71,23,199,2,23,199,2,
-248,22,64,23,199,2,28,248,22,71,23,199,2,9,248,22,65,23,199,2,249,
-22,152,13,23,195,1,28,248,22,71,23,197,1,87,94,23,197,1,6,7,7,
-109,97,105,110,46,115,115,249,22,179,6,23,199,1,6,3,3,46,115,115,28,
-248,22,156,6,23,199,2,87,94,23,194,1,27,248,80,159,41,55,36,23,201,
-2,27,250,22,137,2,80,158,44,43,249,22,63,23,205,2,23,199,2,11,28,
-23,193,2,192,87,94,23,193,1,91,159,37,11,90,161,37,35,11,249,80,159,
-45,48,36,23,204,2,11,250,22,1,22,152,13,23,199,1,249,22,77,249,22,
-2,32,0,89,162,8,44,36,43,9,222,33,45,23,200,1,248,22,73,23,200,
-1,28,248,22,134,13,23,199,2,87,94,23,194,1,28,248,22,157,13,23,199,
-2,23,198,2,248,22,73,6,26,26,32,40,97,32,112,97,116,104,32,109,117,
-115,116,32,98,101,32,97,98,115,111,108,117,116,101,41,28,249,22,161,8,248,
-22,64,23,201,2,2,21,27,250,22,137,2,80,158,43,43,249,22,63,23,204,
-2,247,22,175,13,11,28,23,193,2,192,87,94,23,193,1,91,159,38,11,90,
-161,37,35,11,249,80,159,45,48,36,248,22,88,23,205,2,11,90,161,36,37,
-11,28,248,22,71,248,22,90,23,204,2,28,248,22,71,23,194,2,249,22,186,
-13,0,8,35,114,120,34,91,46,93,34,23,196,2,11,10,27,27,28,23,197,
-2,249,22,77,28,248,22,71,248,22,90,23,208,2,21,93,6,5,5,109,122,
-108,105,98,249,22,1,22,77,249,22,2,80,159,51,56,36,248,22,90,23,211,
-2,23,197,2,28,248,22,71,23,196,2,248,22,73,23,197,2,23,195,2,251,
-80,158,49,50,2,20,23,204,1,248,22,64,23,198,2,248,22,65,23,198,1,
-249,22,152,13,23,195,1,28,23,198,1,87,94,23,196,1,23,197,1,28,248,
-22,71,23,197,1,87,94,23,197,1,6,7,7,109,97,105,110,46,115,115,28,
-249,22,186,13,0,8,35,114,120,34,91,46,93,34,23,199,2,23,197,1,249,
-22,179,6,23,199,1,6,3,3,46,115,115,28,249,22,161,8,248,22,64,23,
-201,2,64,102,105,108,101,249,22,159,13,248,22,163,13,248,22,88,23,202,2,
-248,80,159,42,55,36,23,202,2,12,87,94,28,28,248,22,134,13,23,194,2,
-10,248,22,178,7,23,194,2,87,94,23,200,1,12,28,23,200,2,250,22,190,
-8,67,114,101,113,117,105,114,101,249,22,140,7,6,17,17,98,97,100,32,109,
-111,100,117,108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,64,23,199,
-2,6,0,0,23,203,1,87,94,23,200,1,250,22,191,8,2,20,249,22,140,
-7,6,13,13,109,111,100,117,108,101,32,112,97,116,104,126,97,28,23,198,2,
-248,22,64,23,199,2,6,0,0,23,201,2,27,28,248,22,178,7,23,195,2,
-249,22,183,7,23,196,2,35,249,22,161,13,248,22,162,13,23,197,2,11,27,
-28,248,22,178,7,23,196,2,249,22,183,7,23,197,2,36,248,80,158,42,51,
-23,195,2,91,159,38,11,90,161,38,35,11,28,248,22,178,7,23,199,2,250,
-22,7,2,22,249,22,183,7,23,203,2,37,2,22,248,22,155,13,23,198,2,
-87,95,23,195,1,23,193,1,27,28,248,22,178,7,23,200,2,249,22,183,7,
-23,201,2,38,249,80,158,47,52,23,197,2,5,0,27,28,248,22,178,7,23,
-201,2,249,22,183,7,23,202,2,39,248,22,169,4,23,200,2,27,27,250,22,
-137,2,80,158,51,42,248,22,140,14,247,22,181,11,11,28,23,193,2,192,87,
-94,23,193,1,27,247,22,121,87,94,250,22,135,2,80,158,52,42,248,22,140,
-14,247,22,181,11,195,192,87,95,28,23,209,1,27,250,22,137,2,23,197,2,
-197,11,28,23,193,1,12,87,95,27,27,28,248,22,17,80,158,51,45,80,158,
-50,45,247,22,19,250,22,25,248,22,23,23,197,2,80,158,53,44,23,196,1,
-27,247,22,181,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,54,9,
+22,7,9,248,22,64,195,91,159,37,11,90,161,37,35,11,27,248,22,65,23,
+197,2,28,248,22,71,248,22,65,23,195,2,249,22,7,9,248,22,64,195,91,
+159,37,11,90,161,37,35,11,248,2,39,248,22,65,23,197,2,249,22,7,249,
+22,63,248,22,64,23,200,1,23,197,1,195,249,22,7,249,22,63,248,22,64,
+23,200,1,23,197,1,195,249,22,7,249,22,63,248,22,64,23,200,1,23,197,
+1,195,27,248,2,36,23,195,1,28,194,192,248,2,39,193,87,95,28,248,22,
+168,4,195,12,250,22,191,8,2,20,6,20,20,114,101,115,111,108,118,101,100,
+45,109,111,100,117,108,101,45,112,97,116,104,197,28,24,193,2,248,24,194,1,
+195,87,94,23,193,1,12,27,27,250,22,137,2,80,158,41,42,248,22,140,14,
+247,22,181,11,11,28,23,193,2,192,87,94,23,193,1,27,247,22,121,87,94,
+250,22,135,2,80,158,42,42,248,22,140,14,247,22,181,11,195,192,250,22,135,
+2,195,198,66,97,116,116,97,99,104,251,211,197,198,199,10,28,192,250,22,190,
+8,11,196,195,248,22,188,8,194,28,249,22,162,6,194,6,1,1,46,2,17,
+28,249,22,162,6,194,6,2,2,46,46,62,117,112,192,28,249,22,163,8,248,
+22,65,23,200,2,23,197,1,28,249,22,161,8,248,22,64,23,200,2,23,196,
+1,251,22,188,8,2,20,6,26,26,99,121,99,108,101,32,105,110,32,108,111,
+97,100,105,110,103,32,97,116,32,126,101,58,32,126,101,23,200,1,249,22,2,
+22,65,248,22,78,249,22,63,23,206,1,23,202,1,12,12,247,192,20,14,159,
+80,158,39,44,249,22,63,248,22,140,14,247,22,181,11,23,197,1,20,14,159,
+80,158,39,39,250,80,158,42,40,249,22,27,11,80,158,44,39,22,150,4,23,
+196,1,249,247,22,187,4,23,198,1,248,22,52,248,22,138,13,23,198,1,87,
+94,28,28,248,22,134,13,23,197,2,10,248,22,174,4,23,197,2,12,28,23,
+198,2,250,22,190,8,11,6,15,15,98,97,100,32,109,111,100,117,108,101,32,
+112,97,116,104,23,201,2,250,22,191,8,2,20,6,19,19,109,111,100,117,108,
+101,45,112,97,116,104,32,111,114,32,112,97,116,104,23,199,2,28,28,248,22,
+61,23,197,2,249,22,161,8,248,22,64,23,199,2,2,4,11,248,22,169,4,
+248,22,88,197,28,28,248,22,61,23,197,2,249,22,161,8,248,22,64,23,199,
+2,66,112,108,97,110,101,116,11,87,94,28,207,12,20,14,159,80,158,37,39,
+250,80,158,40,40,249,22,27,11,80,158,42,39,22,181,11,23,197,1,90,161,
+36,35,10,249,22,151,4,21,94,2,21,6,18,18,112,108,97,110,101,116,47,
+114,101,115,111,108,118,101,114,46,115,115,1,27,112,108,97,110,101,116,45,109,
+111,100,117,108,101,45,110,97,109,101,45,114,101,115,111,108,118,101,114,12,251,
+211,199,200,201,202,87,94,23,193,1,27,89,162,8,44,36,45,79,115,104,111,
+119,45,99,111,108,108,101,99,116,105,111,110,45,101,114,114,223,6,33,44,27,
+28,248,22,51,23,199,2,27,250,22,137,2,80,158,43,43,249,22,63,23,204,
+2,247,22,175,13,11,28,23,193,2,192,87,94,23,193,1,91,159,37,11,90,
+161,37,35,11,249,80,159,44,48,36,248,22,54,23,204,2,11,27,251,80,158,
+47,50,2,20,23,202,1,28,248,22,71,23,199,2,23,199,2,248,22,64,23,
+199,2,28,248,22,71,23,199,2,9,248,22,65,23,199,2,249,22,152,13,23,
+195,1,28,248,22,71,23,197,1,87,94,23,197,1,6,7,7,109,97,105,110,
+46,115,115,249,22,179,6,23,199,1,6,3,3,46,115,115,28,248,22,156,6,
+23,199,2,87,94,23,194,1,27,248,80,159,41,55,36,23,201,2,27,250,22,
+137,2,80,158,44,43,249,22,63,23,205,2,23,199,2,11,28,23,193,2,192,
+87,94,23,193,1,91,159,37,11,90,161,37,35,11,249,80,159,45,48,36,23,
+204,2,11,250,22,1,22,152,13,23,199,1,249,22,77,249,22,2,32,0,89,
+162,8,44,36,43,9,222,33,45,23,200,1,248,22,73,23,200,1,28,248,22,
+134,13,23,199,2,87,94,23,194,1,28,248,22,157,13,23,199,2,23,198,2,
+248,22,73,6,26,26,32,40,97,32,112,97,116,104,32,109,117,115,116,32,98,
+101,32,97,98,115,111,108,117,116,101,41,28,249,22,161,8,248,22,64,23,201,
+2,2,21,27,250,22,137,2,80,158,43,43,249,22,63,23,204,2,247,22,175,
+13,11,28,23,193,2,192,87,94,23,193,1,91,159,38,11,90,161,37,35,11,
+249,80,159,45,48,36,248,22,88,23,205,2,11,90,161,36,37,11,28,248,22,
+71,248,22,90,23,204,2,28,248,22,71,23,194,2,249,22,186,13,0,8,35,
+114,120,34,91,46,93,34,23,196,2,11,10,27,27,28,23,197,2,249,22,77,
+28,248,22,71,248,22,90,23,208,2,21,93,6,5,5,109,122,108,105,98,249,
+22,1,22,77,249,22,2,80,159,51,56,36,248,22,90,23,211,2,23,197,2,
+28,248,22,71,23,196,2,248,22,73,23,197,2,23,195,2,251,80,158,49,50,
+2,20,23,204,1,248,22,64,23,198,2,248,22,65,23,198,1,249,22,152,13,
+23,195,1,28,23,198,1,87,94,23,196,1,23,197,1,28,248,22,71,23,197,
+1,87,94,23,197,1,6,7,7,109,97,105,110,46,115,115,28,249,22,186,13,
+0,8,35,114,120,34,91,46,93,34,23,199,2,23,197,1,249,22,179,6,23,
+199,1,6,3,3,46,115,115,28,249,22,161,8,248,22,64,23,201,2,64,102,
+105,108,101,249,22,159,13,248,22,163,13,248,22,88,23,202,2,248,80,159,42,
+55,36,23,202,2,12,87,94,28,28,248,22,134,13,23,194,2,10,248,22,178,
+7,23,194,2,87,94,23,200,1,12,28,23,200,2,250,22,190,8,67,114,101,
+113,117,105,114,101,249,22,140,7,6,17,17,98,97,100,32,109,111,100,117,108,
+101,32,112,97,116,104,126,97,28,23,198,2,248,22,64,23,199,2,6,0,0,
+23,203,1,87,94,23,200,1,250,22,191,8,2,20,249,22,140,7,6,13,13,
+109,111,100,117,108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,64,23,
+199,2,6,0,0,23,201,2,27,28,248,22,178,7,23,195,2,249,22,183,7,
+23,196,2,35,249,22,161,13,248,22,162,13,23,197,2,11,27,28,248,22,178,
+7,23,196,2,249,22,183,7,23,197,2,36,248,80,158,42,51,23,195,2,91,
+159,38,11,90,161,38,35,11,28,248,22,178,7,23,199,2,250,22,7,2,22,
+249,22,183,7,23,203,2,37,2,22,248,22,155,13,23,198,2,87,95,23,195,
+1,23,193,1,27,28,248,22,178,7,23,200,2,249,22,183,7,23,201,2,38,
+249,80,158,47,52,23,197,2,5,0,27,28,248,22,178,7,23,201,2,249,22,
+183,7,23,202,2,39,248,22,169,4,23,200,2,27,27,250,22,137,2,80,158,
+51,42,248,22,140,14,247,22,181,11,11,28,23,193,2,192,87,94,23,193,1,
+27,247,22,121,87,94,250,22,135,2,80,158,52,42,248,22,140,14,247,22,181,
+11,195,192,87,95,28,23,209,1,27,250,22,137,2,23,197,2,197,11,28,23,
+193,1,12,87,95,27,27,28,248,22,17,80,158,51,45,80,158,50,45,247,22,
+19,250,22,25,248,22,23,23,197,2,80,158,53,44,23,196,1,27,248,22,140,
+14,247,22,181,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,54,9,
 226,12,11,2,3,33,46,23,195,1,23,196,1,248,28,248,22,17,80,158,50,
 45,32,0,89,162,43,36,41,9,222,33,47,80,159,49,57,36,89,162,43,35,
 50,9,227,14,9,8,4,3,33,48,250,22,135,2,23,197,1,197,10,12,28,
diff --git a/src/mzscheme/src/startup.inc b/src/mzscheme/src/startup.inc
index ef05eef656..861cb5ef5e 100644
--- a/src/mzscheme/src/startup.inc
+++ b/src/mzscheme/src/startup.inc
@@ -657,11 +657,11 @@
 "(current-continuation-marks tag)"
 " -loading-filename"
 " tag)))"
-"(ns(current-namespace)))"
+"(nsr(namespace-module-registry(current-namespace))))"
 "(for-each"
 "(lambda(s)"
 "(when(and(equal?(cdr s) normal-filename)"
-"(eq?(car s) ns))"
+"(eq?(car s) nsr))"
 "(error"
 " 'standard-module-name-resolver"
 " \"cycle in loading at ~e: ~e\""
@@ -672,7 +672,9 @@
 "(lambda(f)(f))"
 "(lambda(f)(call-with-continuation-prompt f -loading-prompt-tag)))"
 "(lambda()"
-"(with-continuation-mark -loading-filename(cons(current-namespace) normal-filename)"
+"(with-continuation-mark -loading-filename(cons "
+"(namespace-module-registry(current-namespace))"
+" normal-filename)"
 "(parameterize((current-module-declare-name modname))"
 "((current-load/use-compiled) "
 " filename "
diff --git a/src/mzscheme/src/startup.ss b/src/mzscheme/src/startup.ss
index a9391aacf7..097daa5689 100644
--- a/src/mzscheme/src/startup.ss
+++ b/src/mzscheme/src/startup.ss
@@ -747,11 +747,11 @@
                                           (current-continuation-marks tag)
                                           -loading-filename
                                           tag))]
-                                    [ns (current-namespace)])
+                                    [nsr (namespace-module-registry (current-namespace))])
                                 (for-each
                                  (lambda (s)
                                    (when (and (equal? (cdr s) normal-filename)
-                                              (eq? (car s) ns))
+                                              (eq? (car s) nsr))
                                      (error
                                       'standard-module-name-resolver
                                       "cycle in loading at ~e: ~e"
@@ -762,7 +762,9 @@
                                    (lambda (f) (f))
                                    (lambda (f) (call-with-continuation-prompt f -loading-prompt-tag)))
                                (lambda ()
-                                 (with-continuation-mark -loading-filename (cons (current-namespace) normal-filename)
+                                 (with-continuation-mark -loading-filename (cons 
+                                                                            (namespace-module-registry (current-namespace))
+                                                                            normal-filename)
                                    (parameterize ([current-module-declare-name modname])
                                      ((current-load/use-compiled) 
                                       filename