From e40e27435d138a958d24b238821ef95ea2e71c58 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 23 Feb 2006 13:19:03 +0000
Subject: [PATCH] 301.7

svn: r2304
---
 collects/compiler/mzc.h             |  70 +--
 collects/compiler/private/vm2c.ss   |  30 +-
 collects/tests/mzscheme/contmark.ss | 127 +++--
 notes/mzscheme/HISTORY              |  13 +
 src/configure                       |   8 -
 src/mzscheme/configure.ac           |   8 -
 src/mzscheme/include/mzscheme.exp   |  14 +-
 src/mzscheme/include/mzscheme3m.exp |  14 +-
 src/mzscheme/include/mzwin.def      |   6 +-
 src/mzscheme/include/scheme.h       | 143 +++---
 src/mzscheme/src/cstartup.inc       | 726 ++++++++++++++--------------
 src/mzscheme/src/error.c            |  13 +-
 src/mzscheme/src/eval.c             |  82 ++--
 src/mzscheme/src/fun.c              | 274 +++++++----
 src/mzscheme/src/jit.c              |  27 +-
 src/mzscheme/src/mzmark.c           | 115 ++---
 src/mzscheme/src/mzmarksrc.c        |  48 +-
 src/mzscheme/src/schapp.inc         |  17 +-
 src/mzscheme/src/schemef.h          |  43 +-
 src/mzscheme/src/schemex.h          |  41 +-
 src/mzscheme/src/schemex.inc        |  14 +-
 src/mzscheme/src/schemexm.h         |  14 +-
 src/mzscheme/src/schnapp.inc        |  35 +-
 src/mzscheme/src/schvers.h          |   4 +-
 src/mzscheme/src/struct.c           | 113 +++--
 src/mzscheme/src/thread.c           |   2 +-
 src/mzscheme/utils/xcglue.h         |   2 +-
 27 files changed, 1063 insertions(+), 940 deletions(-)

diff --git a/collects/compiler/mzc.h b/collects/compiler/mzc.h
index dce893466d..778421bfca 100644
--- a/collects/compiler/mzc.h
+++ b/collects/compiler/mzc.h
@@ -45,10 +45,10 @@ static MZC_INLINE Scheme_Object *MZC_GLOBAL_ASSIGN(Scheme_Object *vec, int pos,
     (DO_FUEL_POLL, _scheme_direct_apply_primitive_multi(prim, argc, argv))
 #define _scheme_direct_apply_primitive_poll(prim, argc, argv) \
     (DO_FUEL_POLL, _scheme_direct_apply_primitive(prim, argc, argv))
-#define _scheme_direct_apply_closed_primitive_multi_poll(prim, argc, argv) \
-    (DO_FUEL_POLL, _scheme_direct_apply_closed_primitive_multi(prim, argc, argv))
-#define _scheme_direct_apply_closed_primitive_poll(prim, argc, argv) \
-    (DO_FUEL_POLL, _scheme_direct_apply_closed_primitive(prim, argc, argv))
+#define _scheme_direct_apply_primitive_closure_multi_poll(prim, argc, argv) \
+    (DO_FUEL_POLL, _scheme_direct_apply_primitive_closure_multi(prim, argc, argv))
+#define _scheme_direct_apply_primitive_closure_poll(prim, argc, argv) \
+    (DO_FUEL_POLL, _scheme_direct_apply_primitive_closure(prim, argc, argv))
 
 #ifdef KEEP_CLOSURE_COUNT
 static int closure_alloc_cnt;
@@ -67,31 +67,39 @@ static void closure_alloc_inc()
 # define CLOSURE_ALLOC_PP /**/
 #endif
 
+typedef struct {
+  Scheme_Primitive_Proc prim;
 #ifdef MZ_PRECISE_GC
+  int count;
+#endif
+} Scheme_Primitive_Closure_Post;
+
 # define MZC_INSTALL_DATA_PTR(rec) rec
-# define MZC_PARAM_TO_SWITCH(void_param) *(unsigned int *)((Scheme_Closed_Primitive_Post_Ext_Proc *)void_param)->a
+# define MZC_PARAM_TO_SWITCH(void_param) *(unsigned long *)(((Scheme_Primitive_Closure *)void_param)->val)
 # define MZC_ENV_POINTER(t, ct, void_param) (&(((const ct *)void_param)->data))
+
+
+#ifdef SIXTY_FOUR_BIT_INTEGERS
+# define MZ_LOG_WORD_SIZE 4
 #else
-# define MZC_INSTALL_DATA_PTR(rec) &rec->data
-# define MZC_PARAM_TO_SWITCH(void_param) *(unsigned int*)void_param
-# define MZC_ENV_POINTER(t, ct, void_param) ((const t *)void_param)
+# define MZ_LOG_WORD_SIZE 2
 #endif
 
 #define _scheme_make_c_proc_closure(cfunc, rec, name, amin, amax, flags) \
-  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_closure_post(&rec->prim, cfunc, MZC_INSTALL_DATA_PTR(rec), \
+  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_closure_post(((Scheme_Primitive_Closure *)&rec->prim), cfunc, \
 								    name, amin, amax, flags, \
-                                                                    sizeof(rec->data)>>2))
+                                                                    sizeof(rec->data)>>MZ_LOG_WORD_SIZE))
 
 #define _scheme_make_c_proc_closure_empty(cfunc, rec, name, amin, amax, flags) \
-  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_closure(&rec->prim, cfunc, NULL, name, amin, amax, flags))
+  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_closure(&rec->prim, cfunc, name, amin, amax, flags))
 
 #define _scheme_make_c_case_proc_closure(cfunc, rec, name, ccnt, cses, flags) \
-  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_case_closure_post(&rec->prim, cfunc, MZC_INSTALL_DATA_PTR(rec), \
+  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_case_closure_post(((Scheme_Primitive_Closure *)&rec->prim), cfunc, \
 									 name, ccnt, cses, flags, \
-                                                                         sizeof(rec->data)>>2))
+                                                                         sizeof(rec->data)>>MZ_LOG_WORD_SIZE))
 
 #define _scheme_make_c_case_proc_closure_empty(cfunc, rec, name, ccnt, cses, flags) \
-  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_case_closure(&rec->prim, cfunc, NULL, name, ccnt, cses, flags))
+  (CLOSURE_ALLOC_PP (Scheme_Object *)_scheme_fill_prim_case_closure(&rec->prim, cfunc, name, ccnt, cses, flags))
 
 #define NO_MULTIPLE_VALUES(res) \
 	if (res == SCHEME_MULTIPLE_VALUES) \
@@ -118,8 +126,8 @@ typedef struct {
   Scheme_Object *val;
 } _Scheme_WCM_Rec;
 
-#define _scheme_apply_ckp(f, argc, argv) (SCHEME_CLSD_PRIMP(f) ? _scheme_apply_closed_prim(f, argc, argv) : _scheme_apply(f, argc, argv))
-#define _scheme_apply_multi_ckp(f, argc, argv) (SCHEME_CLSD_PRIMP(f) ? _scheme_apply_closed_prim_multi(f, argc, argv) : _scheme_apply_multi(f, argc, argv))
+#define _scheme_apply_ckp(f, argc, argv) (SCHEME_CLSD_PRIMP(f) ? _scheme_apply_prim_closure(f, argc, argv) : _scheme_apply(f, argc, argv))
+#define _scheme_apply_multi_ckp(f, argc, argv) (SCHEME_CLSD_PRIMP(f) ? _scheme_apply_prim_closure_multi(f, argc, argv) : _scheme_apply_multi(f, argc, argv))
 
 #define MZC_EQP(ltp, av, bv) (SAME_OBJ(av, bv))
 #define MZC_EQVP(ltp, av, bv) (SAME_OBJ(av, bv) || scheme_eqv(av, bv))
@@ -291,10 +299,10 @@ static MSC_IZE(inline) Scheme_Object *mzc_force_value(Scheme_Object *v)
   return _scheme_force_value(v);
 }
 
-#define _scheme_direct_apply_closed_primitive_multi_fv(prim, argc, argv) \
-    mzc_force_value(_scheme_direct_apply_closed_primitive_multi(prim, argc, argv))
-#define _scheme_direct_apply_closed_primitive_fv(prim, argc, argv) \
-    scheme_check_one_value(_scheme_direct_apply_closed_primitive_multi_fv(prim, argc, argv))
+#define _scheme_direct_apply_primitive_closure_multi_fv(prim, argc, argv) \
+    mzc_force_value(_scheme_direct_apply_primitive_closure_multi(prim, argc, argv))
+#define _scheme_direct_apply_primitive_closure_fv(prim, argc, argv) \
+    scheme_check_one_value(_scheme_direct_apply_primitive_closure_multi_fv(prim, argc, argv))
 
 static int mzc_strlen(const char *c) {
   int l;
@@ -329,14 +337,14 @@ _mzc_direct_apply_primitive(Scheme_Object *prim, int argc, Scheme_Object **argv)
   return _scheme_direct_apply_primitive(prim, argc, argv);
 }
 static MZC_INLINE Scheme_Object *
-_mzc_direct_apply_closed_primitive_multi(Scheme_Object *prim, int argc, Scheme_Object **argv)
+_mzc_direct_apply_primitive_closure_multi(Scheme_Object *prim, int argc, Scheme_Object **argv)
 {
-  return _scheme_direct_apply_closed_primitive_multi(prim, argc, argv);
+  return _scheme_direct_apply_primitive_closure_multi(prim, argc, argv);
 }
 static MZC_INLINE Scheme_Object *
-_mzc_direct_apply_closed_primitive(Scheme_Object *prim, int argc, Scheme_Object **argv)
+_mzc_direct_apply_primitive_closure(Scheme_Object *prim, int argc, Scheme_Object **argv)
 {
-  return _scheme_direct_apply_closed_primitive(prim, argc, argv);
+  return _scheme_direct_apply_primitive_closure(prim, argc, argv);
 }
 END_XFORM_SUSPEND;
 #else
@@ -344,13 +352,15 @@ END_XFORM_SUSPEND;
          _scheme_direct_apply_primitive_multi(prim, argc, argv)
 # define _mzc_direct_apply_primitive(prim, argc, argv) \
          _scheme_direct_apply_primitive(prim, argc, argv)
-# define _mzc_direct_apply_closed_primitive_multi(prim, argc, argv) \
-         _scheme_direct_apply_closed_primitive_multi(prim, argc, argv)
-# define _mzc_direct_apply_closed_primitive(prim, argc, argv) \
-         _scheme_direct_apply_closed_primitive(prim, argc, argv)
+# define _mzc_direct_apply_primitive_closure_multi(prim, argc, argv) \
+         _scheme_direct_apply_primitive_closure_multi(prim, argc, argv)
+# define _mzc_direct_apply_primitive_closure(prim, argc, argv) \
+         _scheme_direct_apply_primitive_closure(prim, argc, argv)
 #endif
 
 #define _mzc_apply(r,n,rs) _scheme_apply(r,n,rs)
 #define _mzc_apply_multi(r,n,rs) _scheme_apply_multi(r,n,rs)
-#define _mzc_apply_known_closed_prim(r,n,rs) _scheme_apply_known_closed_prim(r,n,rs)
-#define _mzc_apply_known_closed_prim_multi(r,n,rs) _scheme_apply_known_closed_prim_multi(r,n,rs)
+#define _mzc_apply_known_prim_closure(r,n,rs) _scheme_apply_known_prim_closure(r,n,rs)
+#define _mzc_apply_known_prim_closure_multi(r,n,rs) _scheme_apply_known_prim_closure_multi(r,n,rs)
+
+#define MZC_PRIM_CLS_DATA(prim) (prim)
diff --git a/collects/compiler/private/vm2c.ss b/collects/compiler/private/vm2c.ss
index ab57519b66..3ffaaa3e10 100644
--- a/collects/compiler/private/vm2c.ss
+++ b/collects/compiler/private/vm2c.ss
@@ -417,7 +417,7 @@
 		     number
 		     (cond
 		      [(procedure-vehicle? v)
-		       "void * void_param, int argc, Scheme_Object *argv[]"]
+		       "int argc, Scheme_Object *argv[], Scheme_Object *void_param"]
 		      [else
 		       (compiler:internal-error
 			#f
@@ -494,10 +494,10 @@
 				[(scheme-bucket) "Scheme_Bucket *"]
 				[(scheme-per-load-static) "struct Scheme_Per_Load_Statics *"]
 				[(label) "int"]
-				[(prim) "Scheme_Closed_Primitive_Post_Proc"]
-				[(prim-empty) "Scheme_Closed_Primitive_Proc"]
-				[(prim-case) "Scheme_Closed_Case_Primitive_Post_Proc"]
-				[(prim-case-empty) "Scheme_Closed_Case_Primitive_Proc"]
+				[(prim) "Scheme_Primitive_Closure_Post"]
+				[(prim-empty) "Scheme_Primitive_Proc"]
+				[(prim-case) "Scheme_Primitive_Closure_Post"]
+				[(prim-case-empty) "Scheme_Primitive_Proc"]
 				[(begin0-saver) "_Scheme_Begin0_Rec"]
 				[(wcm-saver) "_Scheme_WCM_Rec"]
 				[else (compiler:internal-error 
@@ -1331,12 +1331,12 @@
 		(let ([c (vm:tail-apply-argc ast)])
 		  (emit ", ~a, ~a, scheme_current_thread)" c (if (zero? c) "NULL" 'tail_buf)))]
 	       
-	       ;; (tail-call <label> <closure>) -> void_param = SCHEME_CLSD_PRIM_DATA(<closure>);
+	       ;; (tail-call <label> <closure>) -> void_param = MZC_PRIM_CLS_DATA(<closure>);
 	       ;;                                  goto LOC<label>;
 	       [(vm:tail-call? ast)
 		(when (vm:tail-call-set-env? ast)
 		  (emit-indentation)
-		  (emit "void_param = SCHEME_CLSD_PRIM_DATA(")
+		  (emit "void_param = MZC_PRIM_CLS_DATA(")
 		  (process (vm:tail-call-closure ast) indent-level #f #t)
 		  (emit ");~n"))
 		;; be nice to threads & user breaks:
@@ -1400,8 +1400,8 @@
 			       (not (memq (object-name v) (internal-tail-chain-prims))))
 			  (if (or (vm:apply-multi? ast)
 				  (primitive-result-arity v))
-			      "direct_apply_closed_primitive_multi"
-			      "direct_apply_closed_primitive")]
+			      "direct_apply_primitive_closure_multi"
+			      "direct_apply_primitive_closure")]
 			 [(and (primitive? v)
 			       (not (memq (object-name v) (internal-tail-chain-prims))))
 			  (if (or (vm:apply-multi? ast)
@@ -1411,13 +1411,13 @@
 			 [(vm:apply-known? ast) 
 			  (if (vm:apply-multi? ast)
 			      (if (compiler:option:disable-interrupts)
-				  "direct_apply_closed_primitive_multi_fv"
-				  "apply_known_closed_prim_multi")
+				  "direct_apply_primitive_closure_multi_fv"
+				  "apply_known_prim_closure_multi")
 			      (if (compiler:option:disable-interrupts)
 				  (if (compiler:option:unsafe)
-				      "direct_apply_closed_primitive_multi_fv"
-				      "direct_apply_closed_primitive_fv")
-				  "apply_known_closed_prim"))]
+				      "direct_apply_primitive_closure_multi_fv"
+				      "direct_apply_primitive_closure_fv")
+				  "apply_known_prim_closure"))]
 			 [(vm:apply-multi? ast) "apply_multi"]
 			 [else "apply"])))
 		(process (vm:apply-closure ast) indent-level #f #t)
@@ -1438,7 +1438,7 @@
 		  (emit ", ~a)" top_level_n))]
 	       
 	       [(vm:call? ast)
-		(emit-expr "_scheme_force_value(compiled(SCHEME_CLSD_PRIM_DATA(")
+		(emit-expr "_scheme_force_value(compiled(MZC_PRIM_CLS_DATA(")
 		(process (vm:call-closure ast) indent-level #f #t)
 		(emit "), 0, arg))")]
 
diff --git a/collects/tests/mzscheme/contmark.ss b/collects/tests/mzscheme/contmark.ss
index 3d9ce7626a..150a00502e 100644
--- a/collects/tests/mzscheme/contmark.ss
+++ b/collects/tests/mzscheme/contmark.ss
@@ -154,51 +154,92 @@
 		 v)
 	       'x))))
 
-;; full continuation, mark replaced
-(wcm-test '(11 10)
-	  (lambda ()
-	    (let ([k (with-continuation-mark 'x 10
-		       (begin0
-			(with-continuation-mark 'x 11
-			  (let/cc k 
-			    (with-continuation-mark 'x 12
-			      k)))
-			(+ 2 3)))])
-	      (continuation-mark-set->list 
-	       (continuation-marks k)
-	       'x))))
+;; continuation, mark replaced
+(let* ([extract
+	(lambda (k)
+	  (continuation-mark-set->list 
+	   (continuation-marks k)
+	   'x))]
+       [go
+	(lambda (call/xc in?)
+	  (wcm-test '(11 10)
+		    (lambda ()
+		      (let ([k (with-continuation-mark 'x 10
+				 (begin0
+				  (with-continuation-mark 'x 11
+				    (call/xc 
+				     (lambda (k )
+				       (with-continuation-mark 'x 12
+					 (if in?
+					     (extract k)
+					     k)))))
+				  (+ 2 3)))])
+			(if in?
+			    k
+			    (extract k))))))])
+  (go call/cc #t)
+  (go call/cc #f)
+  (go call/ec #t))
 
-;; nested full continuation, mark replaced
-(wcm-test '(12 10)
-	  (lambda ()
-	    (let ([k (with-continuation-mark 'x 10
-		       (begin0
-			(with-continuation-mark 'x 11
-			  (let/cc k0
-			    (with-continuation-mark 'x 12
-			      (let/cc k 
-				k))))
-			(+ 2 3)))])
-	      (continuation-mark-set->list 
-	       (continuation-marks k)
-	       'x))))
+;; nested continuation, mark replaced
+(let* ([extract
+	(lambda (k)
+	  (continuation-mark-set->list 
+	   (continuation-marks k)
+	   'x))]
+       [go
+	(lambda (call/xc in?)
+	  (wcm-test '(12 10)
+		    (lambda ()
+		      (let ([k (with-continuation-mark 'x 10
+				 (begin0
+				  (with-continuation-mark 'x 11
+				    (call/xc
+				     (lambda (k0)
+				       (with-continuation-mark 'x 12
+					 (call/xc 
+					  (lambda (k) 
+					    (if in?
+						(extract k)
+						k)))))))
+				  (+ 2 3)))])
+			(if in?
+			    k
+			    (extract k))))))])
+  (go call/cc #t)
+  (go call/cc #f)
+  (go call/ec #t))
 
-;; nested full continuation, mark shared
-(wcm-test '(12 11 10)
-	  (lambda ()
-	    (let ([k (with-continuation-mark 'x 10
-		       (begin0
-			(with-continuation-mark 'x 11
-			  (let/cc k0
-			    (begin0
-			     (with-continuation-mark 'x 12
-			       (let/cc k 
-				 k))
-			     (cons 4 5))))
-			(cons 2 3)))])
-	      (continuation-mark-set->list 
-	       (continuation-marks k)
-	       'x))))
+;; nested continuation, mark shared
+(let* ([extract
+	(lambda (k)
+	  (continuation-mark-set->list 
+	   (continuation-marks k)
+	   'x))]
+       [go
+	(lambda (call/xc in?)
+	  (wcm-test '(12 11 10)
+		    (lambda ()
+		      (let ([k (with-continuation-mark 'x 10
+				 (begin0
+				  (with-continuation-mark 'x 11
+				    (call/xc 
+				     (lambda (k0)
+				       (begin0
+					(with-continuation-mark 'x 12
+					  (call/xc 
+					   (lambda (k)
+					     (if in?
+						 (extract k)
+						 k))))
+					(cons 4 5)))))
+				  (cons 2 3)))])
+			(if in?
+			    k
+			    (extract k))))))])
+  (go call/cc #t)
+  (go call/cc #f)
+  (go call/ec #t))
 
 ;; escape continuation, same thread
 (wcm-test '(11 10)
diff --git a/notes/mzscheme/HISTORY b/notes/mzscheme/HISTORY
index 34eaccda4c..e5c2cdfb5b 100644
--- a/notes/mzscheme/HISTORY
+++ b/notes/mzscheme/HISTORY
@@ -1,4 +1,17 @@
 
+Version 301.7
+Inside MzScheme: added scheme_make_prim_closure_w_arity(), etc.
+
+Version 301.6
+The body of `let/cc' and the procedure passed to `call/ec' are
+ evaluated/called as a tail expression/call
+Added struct-type-make-constructor and struct-type-make-predicate
+Added JIT support for 3m
+
+Version 301.5
+For nested captured continuations, the shared continuation tail is
+ represented by shared data
+
 Version 301.4
 Added just-in-time native-code compiler with a new eval-jit-enabled
  parameter
diff --git a/src/configure b/src/configure
index 36a1a21a28..a683445be2 100755
--- a/src/configure
+++ b/src/configure
@@ -8291,14 +8291,6 @@ fi
 
 fi
 
-   if test "${no_x}" = "yes" ; then
-     echo "******************************************************"
-     echo "configure: cannot find X11 headers and/or libraries,"
-     echo "           which are needed to compile MrEd"
-     echo "******************************************************"
-     echo configure aborted
-     exit 1
-   fi
   fi
 
   MAKE_MRED=mr
diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac
index 67af6595a3..990133b202 100644
--- a/src/mzscheme/configure.ac
+++ b/src/mzscheme/configure.ac
@@ -304,14 +304,6 @@ if test "${enable_mred}" = "yes" ; then
    :
   else
    AC_PATH_XTRA
-   if test "${no_x}" = "yes" ; then
-     echo "******************************************************"
-     echo "configure: cannot find X11 headers and/or libraries,"
-     echo "           which are needed to compile MrEd"
-     echo "******************************************************"
-     echo configure aborted
-     exit 1
-   fi
   fi
 
   MAKE_MRED=mr
diff --git a/src/mzscheme/include/mzscheme.exp b/src/mzscheme/include/mzscheme.exp
index 041a38a9b8..1cc5f666d5 100644
--- a/src/mzscheme/include/mzscheme.exp
+++ b/src/mzscheme/include/mzscheme.exp
@@ -116,10 +116,10 @@ scheme_apply_to_list
 scheme_eval_string
 scheme_eval_string_multi
 scheme_eval_string_all
-_scheme_apply_known_closed_prim
-_scheme_apply_known_closed_prim_multi
-_scheme_apply_closed_prim
-_scheme_apply_closed_prim_multi
+_scheme_apply_known_prim_closure
+_scheme_apply_known_prim_closure_multi
+_scheme_apply_prim_closure
+_scheme_apply_prim_closure_multi
 scheme_values
 scheme_check_one_value
 scheme_tail_apply
@@ -181,14 +181,16 @@ scheme_is_hash_table_equal
 scheme_clone_hash_table
 scheme_make_prim
 scheme_make_noneternal_prim
-scheme_make_closed_prim
 scheme_make_prim_w_arity
 scheme_make_folding_prim
 scheme_make_noncm_prim
 scheme_make_noneternal_prim_w_arity
+scheme_make_prim_w_everything
+scheme_make_prim_closure_w_arity
+scheme_make_folding_prim_closure
+scheme_make_closed_prim
 scheme_make_closed_prim_w_arity
 scheme_make_folding_closed_prim
-scheme_make_prim_w_everything
 scheme_make_closed_prim_w_everything
 scheme_prim_is_method
 scheme_make_pair
diff --git a/src/mzscheme/include/mzscheme3m.exp b/src/mzscheme/include/mzscheme3m.exp
index 8d782dc014..d93f3e525c 100644
--- a/src/mzscheme/include/mzscheme3m.exp
+++ b/src/mzscheme/include/mzscheme3m.exp
@@ -116,10 +116,10 @@ scheme_apply_to_list
 scheme_eval_string
 scheme_eval_string_multi
 scheme_eval_string_all
-_scheme_apply_known_closed_prim
-_scheme_apply_known_closed_prim_multi
-_scheme_apply_closed_prim
-_scheme_apply_closed_prim_multi
+_scheme_apply_known_prim_closure
+_scheme_apply_known_prim_closure_multi
+_scheme_apply_prim_closure
+_scheme_apply_prim_closure_multi
 scheme_values
 scheme_check_one_value
 scheme_tail_apply
@@ -188,14 +188,16 @@ scheme_is_hash_table_equal
 scheme_clone_hash_table
 scheme_make_prim
 scheme_make_noneternal_prim
-scheme_make_closed_prim
 scheme_make_prim_w_arity
 scheme_make_folding_prim
 scheme_make_noncm_prim
 scheme_make_noneternal_prim_w_arity
+scheme_make_prim_w_everything
+scheme_make_prim_closure_w_arity
+scheme_make_folding_prim_closure
+scheme_make_closed_prim
 scheme_make_closed_prim_w_arity
 scheme_make_folding_closed_prim
-scheme_make_prim_w_everything
 scheme_make_closed_prim_w_everything
 scheme_prim_is_method
 scheme_make_pair
diff --git a/src/mzscheme/include/mzwin.def b/src/mzscheme/include/mzwin.def
index 025ea89bd6..03cc1456dc 100644
--- a/src/mzscheme/include/mzwin.def
+++ b/src/mzscheme/include/mzwin.def
@@ -173,14 +173,16 @@ EXPORTS
  scheme_clone_hash_table
  scheme_make_prim
  scheme_make_noneternal_prim
- scheme_make_closed_prim
  scheme_make_prim_w_arity
  scheme_make_folding_prim
  scheme_make_noncm_prim
  scheme_make_noneternal_prim_w_arity
+ scheme_make_prim_w_everything
+ scheme_make_prim_closure_w_arity
+ scheme_make_folding_prim_closure
+ scheme_make_closed_prim
  scheme_make_closed_prim_w_arity
  scheme_make_folding_closed_prim
- scheme_make_prim_w_everything
  scheme_make_closed_prim_w_everything
  scheme_prim_is_method
  scheme_make_pair
diff --git a/src/mzscheme/include/scheme.h b/src/mzscheme/include/scheme.h
index e973c05c50..d2dc74dbd9 100644
--- a/src/mzscheme/include/scheme.h
+++ b/src/mzscheme/include/scheme.h
@@ -193,10 +193,6 @@ extern "C"
 
 typedef short Scheme_Type;
 
-/* Used to use `short' for app arg counts, etc., but adding limit
-   checks is difficult, and seems arbitrary. We can switch back
-   to short if the expense turns out to be noticable; in that case
-   also define MZSHORT_IS_SHORT. */
 typedef int mzshort;
 
 typedef unsigned int mzchar;
@@ -577,17 +573,17 @@ typedef void (*Scheme_Type_Printer)(Scheme_Object *v, int for_display, Scheme_Pr
 #define SCHEME_PRIM_IS_BINARY_INLINED 512
 #define SCHEME_PRIM_IS_USER_PARAMETER 1024
 #define SCHEME_PRIM_IS_METHOD 2048
-#define SCHEME_PRIM_IS_POST_DATA 4096
+#define SCHEME_PRIM_IS_CLOSURE 4096
 #define SCHEME_PRIM_IS_NONCM 8192
 #define SCHEME_PRIM_IS_UNARY_INLINED 16384
 
 #define SCHEME_PRIM_PROC_FLAGS(x) (((Scheme_Prim_Proc_Header *)x)->flags)
 
-typedef struct Scheme_Object *
-(Scheme_Prim)(int argc, struct Scheme_Object *argv[]);
+typedef struct Scheme_Object *(Scheme_Prim)(int argc, Scheme_Object *argv[]);
 
-typedef struct Scheme_Object *
-(Scheme_Closed_Prim)(void *d, int argc, struct Scheme_Object *argv[]);
+typedef struct Scheme_Object *(Scheme_Primitive_Closure_Proc)(int argc, struct Scheme_Object *argv[], Scheme_Object *p);
+
+#define SCHEME_MAX_ARGS 0x3FFFFFFE
 
 typedef struct {
   Scheme_Object so;
@@ -596,16 +592,40 @@ typedef struct {
 
 typedef struct {
   Scheme_Prim_Proc_Header pp;
-  Scheme_Prim *prim_val;
+  Scheme_Primitive_Closure_Proc *prim_val;
   const char *name;
-  mzshort mina, maxa;
+  mzshort mina;
+  /* If mina < 0; mina is negated case count minus one for a case-lambda
+     generated by mzc, where the primitive checks argument arity
+     itself, and mu.cases is available instead of mu.maxa. */
+  union {
+    mzshort *cases;
+    mzshort maxa;   /* > SCHEME_MAX_ARGS => any number of arguments */
+  } mu;
 } Scheme_Primitive_Proc;
 
 typedef struct {
   Scheme_Primitive_Proc pp;
   mzshort minr, maxr;
+  /* Never combined with a closure */
 } Scheme_Prim_W_Result_Arity;
 
+typedef struct Scheme_Primitive_Closure {
+  Scheme_Primitive_Proc p;
+  /* The rest is here only if SCHEME_PRIM_IS_CLOSURE
+     is set in p.pp.flags. */
+#ifdef MZ_PRECISE_GC
+  mzshort count;
+#endif
+  Scheme_Object *val[1];
+} Scheme_Primitive_Closure;
+
+#define SCHEME_PRIM_CLOSURE_ELS(p) ((Scheme_Primitive_Closure *)p)->val
+
+/* ------ Old-style primitive closures ------- */
+
+typedef struct Scheme_Object *(Scheme_Closed_Prim)(void *d, int argc, struct Scheme_Object *argv[]);
+
 typedef struct {
   Scheme_Prim_Proc_Header pp;
   Scheme_Closed_Prim *prim_val;
@@ -627,88 +647,45 @@ typedef struct {
 
 /* ------------------------------------------------- */
 /*                 mzc closure glue
-    The following structures are used by mzc to implement closures
-    where the closure data is allocated as part of the
-    Scheme_Closed_Primitive_Proc record.  In 3m mode, a length must be
-    included, and all of the closur-data elements are assumed to be
-    pointers. Furthermore, in 3m mode, a cases and non-cases closure
-    must have closure data starting at the same point, since two
-    kinds can flow to the same MZC_PARAM_TO_SWITCH().
+    The following are used by mzc to implement closures.
 */
 
-typedef struct {
-  union {
-    Scheme_Closed_Primitive_Proc p;
-#ifdef MZ_PRECISE_GC
-    Scheme_Closed_Case_Primitive_Proc other;
-#endif
-  } u;
-#ifdef MZ_PRECISE_GC
-  mzshort len;
-#endif
-} Scheme_Closed_Primitive_Post_Proc;
-
-typedef struct {
-  Scheme_Closed_Primitive_Post_Proc p;
-  void *a[1];
-} Scheme_Closed_Primitive_Post_Ext_Proc;
-
-typedef struct {
-  union {
-    Scheme_Closed_Case_Primitive_Proc p;
-#ifdef MZ_PRECISE_GC
-    Scheme_Closed_Primitive_Proc other;
-#endif
-  } u;
-#ifdef MZ_PRECISE_GC
-  mzshort len;
-#endif
-} Scheme_Closed_Case_Primitive_Post_Proc;
-
-typedef struct {
-  Scheme_Closed_Case_Primitive_Post_Proc p;
-  void *a[1];
-} Scheme_Closed_Case_Primitive_Post_Ext_Proc;
-
-#define _scheme_fill_prim_closure(rec, cfunc, dt, nm, amin, amax, flgs) \
-  ((rec)->pp.so.type = scheme_closed_prim_type, \
+#define _scheme_fill_prim_closure(rec, cfunc, nm, amin, amax, flgs) \
+  ((rec)->pp.so.type = scheme_prim_type, \
    (rec)->prim_val = cfunc, \
-   (rec)->data = (void *)(dt), \
    (rec)->name = nm, \
-   (rec)->mina = amin, \
-   (rec)->maxa = amax, \
+   (rec)->mina = amin,	  \
+   (rec)->mu.maxa = (amax == -1 ? SCHEME_MAX_ARGS + 1 : amax), \
    (rec)->pp.flags = flgs, \
    rec)
 
 #ifdef MZ_PRECISE_GC
-# define _scheme_fill_prim_closure_post(rec, cfunc, dt, nm, amin, amax, flgs, ln) \
-  ((rec)->len = ln,							\
-   _scheme_fill_prim_closure(&(rec)->u.p, cfunc, dt, nm, amin, amax,	\
-			     flgs | SCHEME_PRIM_IS_POST_DATA))
+# define _scheme_fill_prim_closure_post(rec, cfunc, nm, amin, amax, flgs, ln) \
+  ((rec)->count = ln,							\
+   _scheme_fill_prim_closure(&(rec)->p, cfunc, nm, amin, amax,	\
+			     flgs | SCHEME_PRIM_IS_CLOSURE))
 #else
-# define _scheme_fill_prim_closure_post(rec, cfunc, dt, nm, amin, amax, flgs, ln) \
-  _scheme_fill_prim_closure(&(rec)->u.p, cfunc, dt, nm, amin, amax, flgs)
+# define _scheme_fill_prim_closure_post(rec, cfunc, nm, amin, amax, flgs, ln) \
+  _scheme_fill_prim_closure(&(rec)->p, cfunc, nm, amin, amax, flgs)
 #endif
 
-#define _scheme_fill_prim_case_closure(rec, cfunc, dt, nm, ccount, cses, flgs) \
-  ((rec)->p.pp.so.type = scheme_closed_prim_type, \
-   (rec)->p.prim_val = cfunc, \
-   (rec)->p.data = (void *)(dt), \
-   (rec)->p.name = nm, \
-   (rec)->p.mina = -2, \
-   (rec)->p.maxa = -(ccount), \
-   (rec)->p.pp.flags = flgs, \
-   (rec)->cases = cses, \
+#define _scheme_fill_prim_case_closure(rec, cfunc, nm, ccount, cses, flgs) \
+  ((rec)->pp.so.type = scheme_prim_type, \
+   (rec)->prim_val = cfunc, \
+   (rec)->name = nm, \
+   (rec)->mina = -(ccount+1), \
+   (rec)->pp.flags = flgs, \
+   (rec)->mu.cases = cses, \
    rec)
 
 #ifdef MZ_PRECISE_GC
-# define _scheme_fill_prim_case_closure_post(rec, cfunc, dt, nm, ccount, cses, flgs, ln) \
-  ((rec)->len = ln,							\
-   _scheme_fill_prim_case_closure(&(rec)->u.p, cfunc, dt, nm, ccount, cses, \
-				  flgs | SCHEME_PRIM_IS_POST_DATA))
+# define _scheme_fill_prim_case_closure_post(rec, cfunc, nm, ccount, cses, flgs, ln) \
+  ((rec)->count = ln,							\
+   _scheme_fill_prim_case_closure(&((rec)->p), cfunc, nm, ccount, cses,	\
+				  flgs | SCHEME_PRIM_IS_CLOSURE))
 #else
-# define _scheme_fill_prim_case_closure_post(rec, cfunc, dt, nm, ccount, cses, flgs, ln) \
-  _scheme_fill_prim_case_closure(&(rec)->u.p, cfunc, dt, nm, ccount, cses, flgs)
+# define _scheme_fill_prim_case_closure_post(rec, cfunc, nm, ccount, cses, flgs, ln) \
+  _scheme_fill_prim_case_closure(&((rec)->p), cfunc, nm, ccount, cses, flgs)
 #endif
 
 /* ------------------------------------------------- */
@@ -721,7 +698,7 @@ typedef struct {
 #define SCHEME_ECONTP(obj)    SAME_TYPE(SCHEME_TYPE(obj), scheme_escaping_cont_type)
 #define SCHEME_CONT_MARK_SETP(obj)    SAME_TYPE(SCHEME_TYPE(obj), scheme_cont_mark_set_type)
 #define SCHEME_PROC_STRUCTP(obj) SAME_TYPE(SCHEME_TYPE(obj), scheme_proc_struct_type)
-#define SCHEME_STRUCT_PROCP(obj) (SCHEME_CLSD_PRIMP(obj) && (((Scheme_Closed_Primitive_Proc *)(obj))->pp.flags & SCHEME_PRIM_IS_STRUCT_PROC))
+#define SCHEME_STRUCT_PROCP(obj) (SCHEME_PRIMP(obj) && (((Scheme_Primitive_Proc *)(obj))->pp.flags & SCHEME_PRIM_IS_STRUCT_PROC))
 #define SCHEME_CLOSUREP(obj) (SAME_TYPE(SCHEME_TYPE(obj), scheme_closure_type) || SAME_TYPE(SCHEME_TYPE(obj), scheme_case_closure_type))
 
 #define SCHEME_PRIM(obj)     (((Scheme_Primitive_Proc *)(obj))->prim_val)
@@ -1322,9 +1299,13 @@ typedef void (*Scheme_Invoke_Proc)(Scheme_Env *env, long phase_shift,
 #define _scheme_tail_eval_wp scheme_tail_eval_wp
 
 #define _scheme_direct_apply_primitive_multi(prim, argc, argv) \
-    (((Scheme_Primitive_Proc *)prim)->prim_val(argc, argv))
+  (((Scheme_Primitive_Proc *)prim)->prim_val(argc, argv, prim))
 #define _scheme_direct_apply_primitive(prim, argc, argv) \
-    scheme_check_one_value(_scheme_direct_apply_primitive_multi(prim, argc, argv))
+  scheme_check_one_value(_scheme_direct_apply_primitive_multi(prim, argc, argv))
+#define _scheme_direct_apply_primitive_closure_multi(prim, argc, argv) \
+  _scheme_direct_apply_primitive_multi(prim, argc, argv)
+#define _scheme_direct_apply_primitive_closure(prim, argc, argv) \
+  _scheme_direct_apply_primitive(prim, argc, argv)
 #define _scheme_direct_apply_closed_primitive_multi(prim, argc, argv) \
     (((Scheme_Closed_Primitive_Proc *)prim)->prim_val(((Scheme_Closed_Primitive_Proc *)prim)->data, argc, argv))
 #define _scheme_direct_apply_closed_primitive(prim, argc, argv) \
diff --git a/src/mzscheme/src/cstartup.inc b/src/mzscheme/src/cstartup.inc
index 30db68c182..f69b82624c 100644
--- a/src/mzscheme/src/cstartup.inc
+++ b/src/mzscheme/src/cstartup.inc
@@ -1,5 +1,5 @@
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,37,252,205,4,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,37,252,205,4,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,65,35,37,115,116,120,
 1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,16,30,3,2,
 2,71,105,100,101,110,116,105,102,105,101,114,63,4,254,1,30,5,2,2,69,
@@ -62,7 +62,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 1241);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,90,252,111,10,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,90,252,111,10,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,71,35,37,113,113,45,
 97,110,100,45,111,114,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,
 158,16,1,30,3,2,2,69,113,113,45,97,112,112,101,110,100,4,254,1,16,
@@ -193,7 +193,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 2683);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,58,252,142,5,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,58,252,142,5,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,66,35,37,99,111,110,
 100,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,0,16,0,
 11,11,16,0,32,11,16,1,64,99,111,110,100,3,16,1,11,16,1,2,3,
@@ -265,7 +265,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 1434);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,24,252,148,2,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,24,252,148,2,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,73,35,37,115,116,114,
 117,99,116,45,105,110,102,111,1,29,2,11,11,10,10,10,32,80,158,32,32,
 20,97,158,16,9,30,3,2,2,74,105,100,101,110,116,105,102,105,101,114,47,
@@ -301,7 +301,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 672);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,27,252,146,3,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,27,252,146,3,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,71,35,37,100,115,45,
 104,101,108,112,101,114,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,
 158,16,6,30,3,2,2,1,20,108,105,115,116,45,62,105,109,109,117,116,97,
@@ -349,7 +349,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 926);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,121,252,230,12,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,121,252,230,12,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,74,35,37,100,101,102,
 105,110,101,45,101,116,45,97,108,1,29,2,11,11,10,10,10,32,80,158,32,
 32,20,97,158,16,0,16,0,11,11,16,0,32,11,16,6,66,117,110,108,101,
@@ -372,27 +372,27 @@
 100,20,0,30,21,2,12,69,115,116,120,45,62,108,105,115,116,22,4,16,4,
 18,16,2,97,64,104,101,114,101,23,37,97,35,10,32,11,16,12,2,3,2,
 2,2,4,2,2,2,5,2,2,2,6,2,2,2,7,2,2,2,8,2,2,
-97,34,10,33,11,16,54,1,24,115,116,114,117,99,116,45,105,110,102,111,45,
-112,114,101,100,105,99,97,116,101,45,105,100,24,73,35,37,115,116,114,117,99,
-116,45,105,110,102,111,25,71,115,116,120,45,118,101,99,116,111,114,63,26,2,
-12,63,97,110,100,27,2,19,2,15,2,12,74,115,116,120,45,118,101,99,116,
-111,114,45,114,101,102,28,2,12,2,13,2,12,70,115,116,120,45,114,111,116,
+97,34,10,33,11,16,54,71,115,116,120,45,118,101,99,116,111,114,63,24,2,
+12,63,97,110,100,25,2,19,2,15,2,12,74,115,116,120,45,118,101,99,116,
+111,114,45,114,101,102,26,2,12,1,24,115,116,114,117,99,116,45,105,110,102,
+111,45,97,99,99,101,115,115,111,114,45,105,100,115,27,73,35,37,115,116,114,
+117,99,116,45,105,110,102,111,28,2,13,2,12,70,115,116,120,45,114,111,116,
 97,116,101,29,2,12,62,111,114,30,2,19,67,99,111,110,115,47,35,102,31,
 2,12,71,115,116,120,45,114,111,116,97,116,101,42,32,2,12,74,115,112,108,
-105,116,45,115,116,120,45,108,105,115,116,33,2,12,1,24,115,116,114,117,99,
-116,45,105,110,102,111,45,97,99,99,101,115,115,111,114,45,105,100,115,34,2,
-25,64,99,111,110,100,35,66,35,37,99,111,110,100,36,2,17,2,12,69,115,
-116,120,45,112,97,105,114,63,37,2,12,79,115,116,114,117,99,116,45,105,110,
-102,111,45,116,121,112,101,45,105,100,38,2,25,69,115,116,120,45,110,117,108,
-108,63,39,2,12,70,113,117,97,115,105,113,117,111,116,101,40,2,19,71,115,
-116,120,45,110,117,108,108,47,35,102,41,2,12,1,23,115,116,114,117,99,116,
-45,105,110,102,111,45,109,117,116,97,116,111,114,45,105,100,115,42,2,25,69,
-97,112,112,101,110,100,47,35,102,43,2,12,69,115,116,120,45,108,105,115,116,
-63,44,2,12,72,115,116,114,117,99,116,45,105,110,102,111,63,45,2,25,1,
-26,115,116,114,117,99,116,45,105,110,102,111,45,99,111,110,115,116,114,117,99,
-116,111,114,45,105,100,46,2,25,73,115,116,120,45,99,104,101,99,107,47,101,
-115,99,47,2,12,2,22,2,12,72,103,101,116,45,115,116,120,45,105,110,102,
-111,48,71,35,37,100,115,45,104,101,108,112,101,114,49,96,33,8,254,1,11,
+105,116,45,115,116,120,45,108,105,115,116,33,2,12,64,99,111,110,100,34,66,
+35,37,99,111,110,100,35,2,17,2,12,69,115,116,120,45,112,97,105,114,63,
+36,2,12,79,115,116,114,117,99,116,45,105,110,102,111,45,116,121,112,101,45,
+105,100,37,2,28,69,115,116,120,45,110,117,108,108,63,38,2,12,70,113,117,
+97,115,105,113,117,111,116,101,39,2,19,71,115,116,120,45,110,117,108,108,47,
+35,102,40,2,12,1,23,115,116,114,117,99,116,45,105,110,102,111,45,109,117,
+116,97,116,111,114,45,105,100,115,41,2,28,69,97,112,112,101,110,100,47,35,
+102,42,2,12,1,26,115,116,114,117,99,116,45,105,110,102,111,45,99,111,110,
+115,116,114,117,99,116,111,114,45,105,100,43,2,28,69,115,116,120,45,108,105,
+115,116,63,44,2,12,72,115,116,114,117,99,116,45,105,110,102,111,63,45,2,
+28,73,115,116,120,45,99,104,101,99,107,47,101,115,99,46,2,12,2,22,2,
+12,72,103,101,116,45,115,116,120,45,105,110,102,111,47,71,35,37,100,115,45,
+104,101,108,112,101,114,48,1,24,115,116,114,117,99,116,45,105,110,102,111,45,
+112,114,101,100,105,99,97,116,101,45,105,100,49,2,28,96,33,8,254,1,11,
 16,0,9,18,103,2,23,44,35,34,33,16,4,43,11,2,23,3,1,7,101,
 110,118,50,51,56,51,50,16,4,42,11,64,98,97,115,101,51,3,1,7,101,
 110,118,50,51,56,53,52,16,4,41,11,64,99,111,100,101,53,3,1,7,101,
@@ -492,8 +492,8 @@
 95,196,192,250,22,58,2,63,248,22,58,23,17,203,23,16,28,196,250,22,217,
 195,75,100,105,115,97,112,112,101,97,114,101,100,45,117,115,101,100,248,22,252,
 77,3,200,192,33,20,97,158,16,9,2,18,2,16,2,21,2,11,30,101,2,
-12,2,44,8,30,102,2,12,2,37,11,2,14,30,103,2,12,2,39,10,30,
-104,2,49,2,48,0,16,2,18,16,2,158,93,101,77,99,117,114,114,101,110,
+12,2,44,8,30,102,2,12,2,36,11,2,14,30,103,2,12,2,38,10,30,
+104,2,48,2,47,0,16,2,18,16,2,158,93,101,77,99,117,114,114,101,110,
 116,45,105,110,115,112,101,99,116,111,114,105,8,29,35,34,33,16,4,8,28,
 11,2,78,3,1,7,101,110,118,50,52,48,49,106,16,4,59,11,63,115,116,
 120,107,3,1,7,101,110,118,50,52,48,53,108,16,4,58,11,2,55,3,1,
@@ -506,11 +506,11 @@
 110,118,50,52,50,50,116,16,6,8,30,11,76,115,117,112,101,114,45,105,100,
 47,115,116,114,117,99,116,58,117,68,115,116,120,45,105,110,102,111,118,3,1,
 7,101,110,118,50,52,50,52,119,2,119,9,11,9,93,68,35,37,107,101,114,
-110,101,108,120,98,2,120,2,12,2,19,2,36,2,25,2,49,0};
+110,101,108,120,98,2,120,2,12,2,19,2,35,2,28,2,48,0};
     EVAL_ONE_SIZED_STR((char *)expr, 3314);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,18,252,4,1,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,18,252,4,1,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,74,35,37,115,109,97,
 108,108,45,115,99,104,101,109,101,1,29,2,11,11,10,10,10,32,80,158,32,
 32,20,97,158,16,0,16,0,11,11,16,0,32,11,16,10,66,117,110,108,101,
@@ -526,7 +526,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 272);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,190,252,235,31,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,190,252,235,31,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,64,35,37,115,99,1,
 29,2,11,11,10,10,10,48,80,158,32,32,20,97,158,16,37,30,3,2,2,
 64,46,46,46,63,4,254,1,30,5,2,2,68,115,116,120,45,109,101,109,113,
@@ -569,27 +569,27 @@
 97,114,76,254,1,30,77,2,2,1,26,115,101,116,45,115,121,110,116,97,120,
 45,109,97,112,112,105,110,103,45,118,97,108,118,97,114,33,78,254,1,16,2,
 18,98,63,46,46,46,79,38,97,36,10,32,11,16,114,2,64,2,2,2,8,
-2,2,2,27,2,2,2,16,2,2,2,74,2,2,74,115,121,110,116,97,120,
-45,109,97,112,112,105,110,103,80,2,2,2,12,2,2,2,56,2,2,74,45,
-100,101,102,105,110,101,45,115,121,110,116,97,120,81,74,35,37,100,101,102,105,
-110,101,45,101,116,45,97,108,82,2,62,2,2,73,100,101,102,105,110,101,45,
-115,116,114,117,99,116,83,2,82,2,78,2,2,2,37,2,18,2,19,2,18,
-67,45,100,101,102,105,110,101,84,2,82,67,99,111,110,115,47,35,102,85,2,
-18,2,25,2,2,71,115,116,120,45,110,117,108,108,47,35,102,86,2,18,2,
-4,2,2,64,99,111,110,100,87,66,35,37,99,111,110,100,88,2,70,2,2,
-2,31,2,18,2,10,2,2,2,23,2,18,69,115,116,120,45,108,105,115,116,
-63,89,2,18,62,111,114,90,2,41,2,76,2,2,69,115,116,120,45,62,108,
-105,115,116,91,2,18,64,119,104,101,110,92,2,82,2,14,2,2,66,117,110,
-108,101,115,115,93,2,82,2,29,2,2,66,108,101,116,47,101,99,94,2,82,
-2,39,2,18,74,115,116,120,45,118,101,99,116,111,114,45,114,101,102,95,2,
-18,2,50,2,2,69,97,112,112,101,110,100,47,35,102,96,2,18,2,72,2,
-2,73,115,116,120,45,99,104,101,99,107,47,101,115,99,97,2,18,63,97,110,
-100,98,2,41,70,115,116,120,45,114,111,116,97,116,101,99,2,18,2,68,2,
-2,74,115,112,108,105,116,45,115,116,120,45,108,105,115,116,100,2,18,2,21,
-2,18,71,115,116,120,45,114,111,116,97,116,101,42,101,2,18,70,113,117,97,
-115,105,113,117,111,116,101,102,2,41,2,44,2,2,2,60,2,2,2,66,2,
-2,2,46,2,2,2,48,2,2,2,58,2,2,2,35,2,2,2,6,2,2,
-2,33,2,2,2,52,2,2,2,54,2,2,96,35,33,11,16,0,96,34,8,
+2,2,2,27,2,2,2,16,2,2,74,115,121,110,116,97,120,45,109,97,112,
+112,105,110,103,80,2,2,2,12,2,2,2,56,2,2,74,45,100,101,102,105,
+110,101,45,115,121,110,116,97,120,81,74,35,37,100,101,102,105,110,101,45,101,
+116,45,97,108,82,2,62,2,2,73,100,101,102,105,110,101,45,115,116,114,117,
+99,116,83,2,82,2,37,2,18,2,19,2,18,67,45,100,101,102,105,110,101,
+84,2,82,67,99,111,110,115,47,35,102,85,2,18,2,25,2,2,71,115,116,
+120,45,110,117,108,108,47,35,102,86,2,18,2,4,2,2,64,99,111,110,100,
+87,66,35,37,99,111,110,100,88,2,48,2,2,2,31,2,18,2,10,2,2,
+2,23,2,18,69,115,116,120,45,108,105,115,116,63,89,2,18,2,70,2,2,
+62,111,114,90,2,41,2,76,2,2,69,115,116,120,45,62,108,105,115,116,91,
+2,18,64,119,104,101,110,92,2,82,66,117,110,108,101,115,115,93,2,82,2,
+29,2,2,66,108,101,116,47,101,99,94,2,82,2,39,2,18,74,115,116,120,
+45,118,101,99,116,111,114,45,114,101,102,95,2,18,2,50,2,2,69,97,112,
+112,101,110,100,47,35,102,96,2,18,2,72,2,2,73,115,116,120,45,99,104,
+101,99,107,47,101,115,99,97,2,18,63,97,110,100,98,2,41,70,115,116,120,
+45,114,111,116,97,116,101,99,2,18,2,68,2,2,74,115,112,108,105,116,45,
+115,116,120,45,108,105,115,116,100,2,18,2,21,2,18,71,115,116,120,45,114,
+111,116,97,116,101,42,101,2,18,70,113,117,97,115,105,113,117,111,116,101,102,
+2,41,2,44,2,2,2,60,2,2,2,66,2,2,2,46,2,2,2,14,2,
+2,2,58,2,2,2,35,2,2,2,74,2,2,2,6,2,2,2,33,2,2,
+2,78,2,2,2,52,2,2,2,54,2,2,96,35,33,11,16,0,96,34,8,
 254,1,11,16,0,16,4,33,11,61,115,103,3,1,7,101,110,118,50,52,50,
 57,104,18,103,2,79,45,36,35,34,16,10,44,11,61,112,105,67,112,114,111,
 116,111,45,114,106,61,107,107,64,100,101,115,116,108,3,1,7,101,110,118,50,
@@ -919,7 +919,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 8183);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,155,252,152,16,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,155,252,152,16,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,69,35,37,115,116,120,
 99,97,115,101,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,
 1,30,3,2,2,1,20,101,108,108,105,112,115,105,115,45,99,111,117,110,116,
@@ -1125,7 +1125,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 4260);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,71,252,7,7,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,71,252,7,7,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,68,35,37,115,116,120,
 108,111,99,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,2,
 30,3,2,2,68,108,111,99,45,105,110,115,112,4,254,1,30,5,2,2,68,
@@ -1215,7 +1215,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 1811);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,115,252,74,10,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,115,252,74,10,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,70,35,37,119,105,116,
 104,45,115,116,120,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,
 16,7,30,3,2,2,76,119,105,116,104,45,115,121,110,116,97,120,45,102,97,
@@ -1345,7 +1345,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 2646);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,192,252,53,32,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,192,252,53,32,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,76,35,37,115,116,120,
 99,97,115,101,45,115,99,104,101,109,101,1,29,2,11,11,10,10,10,32,80,
 158,32,32,20,97,158,16,2,30,3,2,2,1,26,99,104,101,99,107,45,100,
@@ -1416,12 +1416,12 @@
 8,2,30,2,23,2,35,2,47,2,6,74,115,116,120,45,118,101,99,116,111,
 114,45,114,101,102,68,2,6,73,115,121,110,116,97,120,45,99,97,115,101,42,
 42,69,2,33,2,26,2,2,2,49,2,6,2,61,2,6,2,22,2,35,2,
-45,2,6,2,11,2,2,2,4,2,2,71,115,116,120,45,114,111,116,97,116,
-101,42,70,2,6,2,57,2,6,74,115,112,108,105,116,45,115,116,120,45,108,
-105,115,116,71,2,6,2,13,2,2,2,15,2,32,2,21,2,32,2,17,2,
-34,2,7,2,6,2,24,2,31,2,27,2,32,69,115,116,120,45,110,117,108,
-108,63,72,2,6,2,28,2,35,2,59,2,6,2,9,2,2,2,14,2,2,
-2,29,2,32,2,12,2,31,2,10,2,2,2,20,2,32,2,51,2,6,2,
+45,2,6,2,11,2,2,71,115,116,120,45,114,111,116,97,116,101,42,70,2,
+6,2,57,2,6,74,115,112,108,105,116,45,115,116,120,45,108,105,115,116,71,
+2,6,2,13,2,2,2,15,2,32,2,21,2,32,2,17,2,34,2,7,2,
+6,2,24,2,31,2,27,2,32,69,115,116,120,45,110,117,108,108,63,72,2,
+6,2,28,2,35,2,59,2,6,2,9,2,2,2,14,2,2,2,29,2,32,
+2,4,2,2,2,12,2,31,2,10,2,2,2,20,2,32,2,51,2,6,2,
 19,2,31,2,25,2,32,2,53,2,6,2,55,2,6,2,43,2,6,97,35,
 10,33,11,16,66,2,18,2,30,2,16,2,33,2,67,2,6,2,8,2,30,
 2,23,2,35,2,47,2,6,2,68,2,6,2,69,2,33,2,49,2,6,2,
@@ -1690,7 +1690,7 @@
 41,193,11,11,11,11,28,192,27,248,22,51,194,27,248,22,77,195,27,248,22,
 86,196,27,248,22,87,197,28,249,22,4,80,158,40,42,248,22,215,27,83,160,
 41,32,42,45,250,22,208,83,160,41,33,45,45,201,195,249,80,158,40,43,201,
-27,251,22,60,200,201,199,202,27,83,160,41,34,42,45,91,159,33,11,90,161,
+27,251,22,60,200,199,201,202,27,83,160,41,34,42,45,91,159,33,11,90,161,
 33,32,11,83,160,38,32,33,11,247,248,22,8,89,162,32,33,40,9,226,12,
 2,3,1,250,22,31,89,162,32,32,36,9,225,6,3,7,90,161,33,33,10,
 247,22,252,177,2,248,22,252,177,2,89,162,32,33,36,9,224,3,1,248,193,
@@ -1703,11 +1703,11 @@
 160,41,38,43,45,250,22,208,83,160,41,39,46,45,250,22,59,83,160,41,40,
 49,45,83,160,41,41,49,45,250,22,208,83,160,41,42,52,45,254,22,61,83,
 160,41,43,59,45,248,22,87,23,26,83,160,41,44,59,45,83,160,41,45,59,
-45,248,22,77,23,26,83,160,41,46,59,45,250,22,2,89,162,33,33,47,9,
+45,248,22,86,23,26,83,160,41,46,59,45,250,22,2,89,162,33,33,47,9,
 223,30,250,22,208,83,160,41,47,35,45,249,22,59,248,22,51,199,250,22,208,
 83,160,41,48,40,45,250,22,59,83,160,41,49,43,45,83,160,41,50,43,45,
 248,22,77,205,83,160,41,51,40,45,83,160,41,52,35,45,248,22,51,23,29,
-248,22,86,23,29,83,160,41,53,52,45,83,160,41,54,46,45,83,160,41,55,
+248,22,77,23,29,83,160,41,53,52,45,83,160,41,54,46,45,83,160,41,55,
 41,45,197,89,162,32,32,33,9,223,0,192,89,162,32,32,34,9,223,3,248,
 22,252,177,2,208,247,197,247,193,32,20,97,158,16,13,2,42,2,44,2,46,
 2,48,2,50,2,54,2,56,2,52,2,58,2,112,2,156,2,62,2,64,16,
@@ -1742,7 +1742,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 8257);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,134,252,9,15,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,134,252,9,15,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,67,35,37,113,113,115,
 116,120,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,2,30,
 3,2,2,79,99,104,101,99,107,45,115,112,108,105,99,105,110,103,45,108,105,
@@ -1865,11 +1865,11 @@
 99,116,65,2,61,2,9,2,2,69,115,116,120,45,110,117,108,108,63,66,2,
 6,70,113,117,97,115,105,113,117,111,116,101,67,2,47,70,115,121,110,116,97,
 120,47,108,111,99,68,2,49,2,7,2,6,2,8,2,2,64,119,104,101,110,
-69,2,61,2,11,2,2,75,108,101,116,114,101,99,45,115,121,110,116,97,120,
-101,115,70,2,53,66,117,110,108,101,115,115,71,2,61,72,115,121,110,116,97,
-120,45,99,97,115,101,42,72,2,49,2,10,2,2,1,26,99,104,101,99,107,
-45,100,117,112,108,105,99,97,116,101,45,105,100,101,110,116,105,102,105,101,114,
-73,2,53,66,108,101,116,47,101,99,74,2,61,73,108,101,116,114,101,99,45,
+69,2,61,1,26,99,104,101,99,107,45,100,117,112,108,105,99,97,116,101,45,
+105,100,101,110,116,105,102,105,101,114,70,2,53,2,11,2,2,75,108,101,116,
+114,101,99,45,115,121,110,116,97,120,101,115,71,2,53,66,117,110,108,101,115,
+115,72,2,61,72,115,121,110,116,97,120,45,99,97,115,101,42,73,2,49,2,
+10,2,2,66,108,101,116,47,101,99,74,2,61,73,108,101,116,114,101,99,45,
 115,121,110,116,97,120,75,2,53,69,115,116,120,45,62,108,105,115,116,76,2,
 6,2,24,2,6,97,35,10,33,11,16,78,2,41,2,6,2,34,2,6,2,
 42,2,36,2,43,2,44,2,45,2,6,2,46,2,47,2,48,2,49,2,50,
@@ -1877,8 +1877,8 @@
 6,2,37,2,36,2,39,2,6,2,55,2,53,2,56,2,53,2,57,2,6,
 2,58,2,6,2,59,2,53,2,60,2,61,2,62,2,61,2,63,2,64,2,
 28,2,6,2,32,2,6,2,65,2,61,2,66,2,6,2,67,2,47,2,68,
-2,49,2,7,2,6,2,69,2,61,2,70,2,53,2,71,2,61,2,72,2,
-49,2,73,2,53,2,74,2,61,2,75,2,53,2,76,2,6,2,24,2,6,
+2,49,2,7,2,6,2,69,2,61,2,70,2,53,2,71,2,53,2,72,2,
+61,2,73,2,49,2,74,2,61,2,75,2,53,2,76,2,6,2,24,2,6,
 96,34,8,254,1,11,16,0,16,8,33,11,68,111,114,105,103,45,115,116,120,
 77,64,98,111,100,121,78,68,109,107,45,102,105,110,97,108,79,3,1,7,101,
 110,118,51,48,52,51,80,2,80,2,80,18,101,2,40,42,36,35,34,33,16,
@@ -1929,7 +1929,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 3861);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,207,252,210,29,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,207,252,210,29,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,68,35,37,100,101,102,
 105,110,101,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,0,
 16,0,11,11,16,0,32,11,16,4,76,98,101,103,105,110,45,102,111,114,45,
@@ -2087,11 +2087,11 @@
 115,112,108,105,99,105,110,103,66,67,35,37,113,113,115,116,120,67,2,38,2,
 13,70,113,117,97,115,105,113,117,111,116,101,68,2,49,70,115,121,110,116,97,
 120,47,108,111,99,69,2,26,2,22,2,13,68,117,110,115,121,110,116,97,120,
-70,2,67,64,119,104,101,110,71,2,61,71,113,117,97,115,105,115,121,110,116,
-97,120,72,2,67,75,108,101,116,114,101,99,45,115,121,110,116,97,120,101,115,
-73,2,35,66,117,110,108,101,115,115,74,2,61,72,115,121,110,116,97,120,45,
-99,97,115,101,42,75,2,26,75,113,117,97,115,105,115,121,110,116,97,120,47,
-108,111,99,76,2,67,2,36,2,35,66,108,101,116,47,101,99,77,2,61,73,
+70,2,67,64,119,104,101,110,71,2,61,2,36,2,35,71,113,117,97,115,105,
+115,121,110,116,97,120,72,2,67,75,108,101,116,114,101,99,45,115,121,110,116,
+97,120,101,115,73,2,35,66,117,110,108,101,115,115,74,2,61,72,115,121,110,
+116,97,120,45,99,97,115,101,42,75,2,26,75,113,117,97,115,105,115,121,110,
+116,97,120,47,108,111,99,76,2,67,66,108,101,116,47,101,99,77,2,61,73,
 108,101,116,114,101,99,45,115,121,110,116,97,120,78,2,35,2,24,2,13,2,
 14,2,13,96,35,8,254,1,11,16,0,16,4,34,11,77,100,101,102,105,110,
 101,45,118,97,108,117,101,115,45,115,116,120,79,3,1,7,101,110,118,51,49,
@@ -2102,25 +2102,25 @@
 112,114,111,116,111,88,64,98,111,100,121,89,3,1,7,101,110,118,51,49,56,
 50,90,2,90,2,90,16,6,40,11,2,10,2,11,3,1,7,101,110,118,51,
 49,56,55,91,2,91,18,16,2,95,66,115,114,99,116,97,103,92,44,93,8,
-252,134,8,95,9,8,252,134,8,2,46,18,104,64,100,101,115,116,93,48,37,
-36,35,34,33,42,41,16,6,47,11,2,10,2,11,2,91,2,91,16,6,46,
-11,3,1,4,103,51,54,54,94,3,1,4,103,51,54,55,95,3,1,7,101,
-110,118,51,49,57,52,96,2,96,16,6,45,11,62,105,100,97,63,97,114,103,
-98,3,1,7,101,110,118,51,49,57,53,99,2,99,18,158,2,41,48,18,16,
-2,95,2,92,49,93,8,252,140,8,95,9,8,252,140,8,2,46,18,158,2,
-93,48,18,158,63,99,116,120,100,48,18,158,66,108,97,109,98,100,97,101,48,
-18,158,2,100,48,18,16,2,95,2,92,50,93,8,252,141,8,95,9,8,252,
-141,8,2,46,18,104,2,93,53,37,36,35,34,33,42,41,47,16,8,52,11,
-3,1,4,103,51,54,51,102,3,1,4,103,51,54,52,103,3,1,4,103,51,
-54,53,104,3,1,7,101,110,118,51,50,50,49,105,2,105,2,105,16,8,51,
-11,2,97,2,98,64,114,101,115,116,106,3,1,7,101,110,118,51,50,50,50,
-107,2,107,2,107,18,158,2,41,53,18,16,2,95,2,92,54,93,8,252,147,
-8,95,9,8,252,147,8,2,46,18,158,2,93,53,18,158,2,100,53,18,158,
-2,101,53,18,158,2,100,53,18,158,2,41,43,18,16,2,95,2,92,55,93,
-8,252,159,8,95,9,8,252,159,8,2,46,18,104,2,93,58,37,36,35,34,
-33,42,41,40,16,8,57,11,3,1,4,103,51,55,54,108,3,1,4,103,51,
+252,134,8,95,9,8,252,134,8,2,46,18,104,64,100,101,115,116,93,47,37,
+36,35,34,33,42,41,40,16,6,46,11,3,1,4,103,51,54,54,94,3,1,
+4,103,51,54,55,95,3,1,7,101,110,118,51,49,57,52,96,2,96,16,6,
+45,11,62,105,100,97,63,97,114,103,98,3,1,7,101,110,118,51,49,57,53,
+99,2,99,18,158,2,41,47,18,16,2,95,2,92,48,93,8,252,140,8,95,
+9,8,252,140,8,2,46,18,158,2,93,47,18,158,63,99,116,120,100,47,18,
+158,66,108,97,109,98,100,97,101,47,18,158,2,100,47,18,16,2,95,2,92,
+49,93,8,252,141,8,95,9,8,252,141,8,2,46,18,104,2,93,52,37,36,
+35,34,33,42,41,40,16,8,51,11,3,1,4,103,51,54,51,102,3,1,4,
+103,51,54,52,103,3,1,4,103,51,54,53,104,3,1,7,101,110,118,51,50,
+50,49,105,2,105,2,105,16,8,50,11,2,97,2,98,64,114,101,115,116,106,
+3,1,7,101,110,118,51,50,50,50,107,2,107,2,107,18,158,2,41,52,18,
+16,2,95,2,92,53,93,8,252,147,8,95,9,8,252,147,8,2,46,18,158,
+2,93,52,18,158,2,100,52,18,158,2,101,52,18,158,2,100,52,18,158,2,
+41,43,18,16,2,95,2,92,54,93,8,252,159,8,95,9,8,252,159,8,2,
+46,18,104,2,93,58,37,36,35,34,33,42,41,16,6,57,11,2,10,2,11,
+2,91,2,91,16,8,56,11,3,1,4,103,51,55,54,108,3,1,4,103,51,
 55,55,109,3,1,4,103,51,55,56,110,3,1,7,101,110,118,51,50,53,52,
-111,2,111,2,111,16,8,56,11,69,115,111,109,101,116,104,105,110,103,112,64,
+111,2,111,2,111,16,8,55,11,69,115,111,109,101,116,104,105,110,103,112,64,
 109,111,114,101,113,2,106,3,1,7,101,110,118,51,50,53,53,114,2,114,2,
 114,18,158,2,100,58,18,158,2,100,58,18,102,2,41,8,28,37,36,35,34,
 33,42,41,16,6,59,11,2,97,66,109,107,45,114,104,115,115,3,1,7,101,
@@ -2297,7 +2297,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 7646);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,252,211,1,252,208,91,159,32,20,97,158,16,1,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,252,211,1,252,208,91,159,32,20,97,158,16,1,
 20,23,65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,73,35,37,109,
 111,114,101,45,115,99,104,101,109,101,1,29,2,11,11,10,10,10,46,80,158,
 32,32,20,97,158,16,24,30,3,2,2,74,115,116,114,117,99,116,58,112,114,
@@ -2335,13 +2335,13 @@
 99,107,45,102,111,114,45,98,114,101,97,107,51,254,1,16,0,11,11,16,14,
 2,41,2,39,2,31,2,33,2,29,2,37,2,27,2,6,2,10,2,43,2,
 12,2,35,2,25,2,4,46,11,16,18,2,49,2,23,2,45,2,16,2,14,
-2,8,64,116,105,109,101,52,74,119,105,116,104,45,104,97,110,100,108,101,114,
-115,42,53,78,112,97,114,97,109,101,116,101,114,105,122,101,45,98,114,101,97,
-107,54,66,108,101,116,47,99,99,55,72,112,97,114,97,109,101,116,101,114,105,
-122,101,56,65,100,101,108,97,121,57,73,119,105,116,104,45,104,97,110,100,108,
-101,114,115,58,64,99,97,115,101,59,69,102,108,117,105,100,45,108,101,116,60,
-71,115,101,116,33,45,118,97,108,117,101,115,61,62,100,111,62,70,108,101,116,
-45,115,116,114,117,99,116,63,16,18,11,11,11,11,11,11,11,11,11,11,11,
+2,8,64,116,105,109,101,52,78,112,97,114,97,109,101,116,101,114,105,122,101,
+45,98,114,101,97,107,53,66,108,101,116,47,99,99,54,72,112,97,114,97,109,
+101,116,101,114,105,122,101,55,65,100,101,108,97,121,56,73,119,105,116,104,45,
+104,97,110,100,108,101,114,115,57,64,99,97,115,101,58,69,102,108,117,105,100,
+45,108,101,116,59,71,115,101,116,33,45,118,97,108,117,101,115,60,62,100,111,
+61,70,108,101,116,45,115,116,114,117,99,116,62,74,119,105,116,104,45,104,97,
+110,100,108,101,114,115,42,63,16,18,11,11,11,11,11,11,11,11,11,11,11,
 11,11,11,11,11,11,11,16,18,2,49,2,23,2,45,2,16,2,14,2,8,
 2,52,2,53,2,54,2,55,2,56,2,57,2,58,2,59,2,60,2,61,2,
 62,2,63,38,50,106,16,5,93,69,99,97,115,101,45,116,101,115,116,64,89,
@@ -2378,26 +2378,26 @@
 75,0,30,76,2,66,71,115,116,120,45,110,117,108,108,47,35,102,77,9,30,
 78,2,66,69,115,116,120,45,108,105,115,116,63,79,8,30,80,2,66,69,115,
 116,120,45,62,108,105,115,116,81,4,16,25,18,98,64,104,101,114,101,82,38,
-97,36,10,32,11,16,106,2,53,2,2,2,21,2,18,2,37,2,2,2,19,
-2,18,74,45,100,101,102,105,110,101,45,115,121,110,116,97,120,83,74,35,37,
-100,101,102,105,110,101,45,101,116,45,97,108,84,2,41,2,2,73,100,101,102,
+97,36,10,32,11,16,106,2,63,2,2,2,16,2,2,2,53,2,2,74,45,
+100,101,102,105,110,101,45,115,121,110,116,97,120,83,74,35,37,100,101,102,105,
+110,101,45,101,116,45,97,108,84,2,23,2,2,2,6,2,2,73,100,101,102,
 105,110,101,45,115,116,114,117,99,116,85,2,84,76,98,101,103,105,110,45,102,
 111,114,45,115,121,110,116,97,120,86,68,35,37,100,101,102,105,110,101,87,77,
 100,101,102,105,110,101,45,102,111,114,45,115,121,110,116,97,120,88,2,87,2,
-12,2,2,2,6,2,2,67,45,100,101,102,105,110,101,89,2,84,2,63,2,
-2,2,4,2,2,2,8,2,2,2,25,2,2,2,56,2,2,63,97,110,100,
-90,71,35,37,113,113,45,97,110,100,45,111,114,91,2,27,2,2,2,10,2,
-2,64,119,104,101,110,92,2,84,2,31,2,2,66,117,110,108,101,115,115,93,
-2,84,2,61,2,2,66,108,101,116,47,101,99,94,2,84,2,33,2,2,2,
-47,2,18,73,100,101,102,105,110,101,45,115,121,110,116,97,120,95,2,87,2,
-43,2,2,2,60,2,2,2,29,2,2,2,55,2,2,62,111,114,96,2,91,
-70,113,117,97,115,105,113,117,111,116,101,97,2,91,2,59,2,2,2,49,2,
-2,1,22,98,114,101,97,107,45,112,97,114,97,109,101,116,101,114,105,122,97,
-116,105,111,110,98,2,2,2,52,2,2,2,16,2,2,2,51,2,18,2,54,
-2,2,2,23,2,2,2,39,2,2,2,57,2,2,2,45,2,2,67,112,114,
-111,109,105,115,101,99,2,2,2,58,2,2,2,62,2,2,2,14,2,2,2,
-64,2,2,64,99,111,110,100,100,66,35,37,99,111,110,100,101,66,100,101,102,
-105,110,101,102,2,87,2,35,2,2,97,35,10,33,11,16,86,71,119,105,116,
+12,2,2,67,45,100,101,102,105,110,101,89,2,84,2,35,2,2,2,4,2,
+2,2,45,2,2,2,8,2,2,2,25,2,2,2,55,2,2,2,37,2,2,
+63,97,110,100,90,71,35,37,113,113,45,97,110,100,45,111,114,91,2,27,2,
+2,2,10,2,2,64,119,104,101,110,92,2,84,2,41,2,2,2,31,2,2,
+66,117,110,108,101,115,115,93,2,84,2,60,2,2,66,108,101,116,47,101,99,
+94,2,84,2,33,2,2,2,47,2,18,73,100,101,102,105,110,101,45,115,121,
+110,116,97,120,95,2,87,2,43,2,2,2,59,2,2,2,29,2,2,2,54,
+2,2,62,111,114,96,2,91,70,113,117,97,115,105,113,117,111,116,101,97,2,
+91,2,58,2,2,2,49,2,2,1,22,98,114,101,97,107,45,112,97,114,97,
+109,101,116,101,114,105,122,97,116,105,111,110,98,2,2,2,52,2,2,2,51,
+2,18,2,62,2,2,2,39,2,2,2,56,2,2,2,21,2,18,67,112,114,
+111,109,105,115,101,99,2,2,2,57,2,2,2,61,2,2,2,14,2,2,2,
+64,2,2,2,19,2,18,64,99,111,110,100,100,66,35,37,99,111,110,100,101,
+66,100,101,102,105,110,101,102,2,87,97,35,10,33,11,16,86,71,119,105,116,
 104,45,115,121,110,116,97,120,103,70,35,37,119,105,116,104,45,115,116,120,104,
 66,115,121,110,116,97,120,105,69,35,37,115,116,120,99,97,115,101,106,71,115,
 116,120,45,118,101,99,116,111,114,63,107,2,66,2,90,2,91,2,71,2,66,
@@ -2407,21 +2407,21 @@
 99,97,115,101,45,115,99,104,101,109,101,111,2,73,2,66,70,115,116,120,45,
 114,111,116,97,116,101,112,2,66,73,115,116,120,45,99,104,101,99,107,47,101,
 115,99,113,2,66,2,69,2,66,72,115,121,110,116,97,120,45,114,117,108,101,
-115,114,2,111,1,26,99,104,101,99,107,45,100,117,112,108,105,99,97,116,101,
-45,105,100,101,110,116,105,102,105,101,114,115,2,111,71,115,116,120,45,114,111,
-116,97,116,101,42,116,2,66,2,75,2,66,74,115,112,108,105,116,45,115,116,
-120,45,108,105,115,116,117,2,66,75,115,121,110,116,97,120,45,105,100,45,114,
-117,108,101,115,118,2,111,2,100,2,101,71,115,121,110,116,97,120,45,99,97,
-115,101,119,68,35,37,115,116,120,108,111,99,120,2,83,2,84,2,96,2,91,
-71,113,117,97,115,105,115,121,110,116,97,120,121,67,35,37,113,113,115,116,120,
-122,71,105,100,101,110,116,105,102,105,101,114,63,123,2,66,70,115,121,110,116,
-97,120,47,108,111,99,124,2,120,2,85,2,84,77,117,110,115,121,110,116,97,
-120,45,115,112,108,105,99,105,110,103,125,2,122,69,115,116,120,45,110,117,108,
-108,63,126,2,66,2,97,2,91,2,77,2,66,70,108,101,116,45,115,121,110,
-116,97,120,127,2,111,68,117,110,115,121,110,116,97,120,128,2,122,2,92,2,
-84,72,115,121,110,116,97,120,45,99,97,115,101,42,129,2,120,75,108,101,116,
+115,114,2,111,71,115,116,120,45,114,111,116,97,116,101,42,115,2,66,2,75,
+2,66,74,115,112,108,105,116,45,115,116,120,45,108,105,115,116,116,2,66,75,
+115,121,110,116,97,120,45,105,100,45,114,117,108,101,115,117,2,111,2,100,2,
+101,71,115,121,110,116,97,120,45,99,97,115,101,118,68,35,37,115,116,120,108,
+111,99,119,2,83,2,84,2,96,2,91,71,113,117,97,115,105,115,121,110,116,
+97,120,120,67,35,37,113,113,115,116,120,121,71,105,100,101,110,116,105,102,105,
+101,114,63,122,2,66,70,115,121,110,116,97,120,47,108,111,99,123,2,119,2,
+85,2,84,77,117,110,115,121,110,116,97,120,45,115,112,108,105,99,105,110,103,
+124,2,121,69,115,116,120,45,110,117,108,108,63,125,2,66,2,97,2,91,2,
+77,2,66,70,108,101,116,45,115,121,110,116,97,120,126,2,111,68,117,110,115,
+121,110,116,97,120,127,2,121,2,92,2,84,1,26,99,104,101,99,107,45,100,
+117,112,108,105,99,97,116,101,45,105,100,101,110,116,105,102,105,101,114,128,2,
+111,72,115,121,110,116,97,120,45,99,97,115,101,42,129,2,119,75,108,101,116,
 114,101,99,45,115,121,110,116,97,120,101,115,130,2,111,2,93,2,84,2,79,
-2,66,75,113,117,97,115,105,115,121,110,116,97,120,47,108,111,99,131,2,122,
+2,66,75,113,117,97,115,105,115,121,110,116,97,120,47,108,111,99,131,2,121,
 2,89,2,84,2,94,2,84,73,108,101,116,114,101,99,45,115,121,110,116,97,
 120,132,2,111,2,81,2,66,2,67,2,66,96,34,8,254,1,11,16,0,16,
 4,33,11,61,120,133,3,1,7,101,110,118,51,52,56,48,134,18,16,2,95,
@@ -2440,7 +2440,7 @@
 4,103,52,49,54,150,3,1,7,101,110,118,51,53,48,50,151,2,151,2,151,
 16,6,45,11,2,141,2,142,3,1,7,101,110,118,51,53,48,51,152,2,152,
 18,158,2,144,47,18,158,64,109,101,109,118,153,47,18,158,2,144,47,18,158,
-2,146,47,18,158,2,144,47,18,158,2,144,47,11,16,5,93,2,59,89,162,
+2,146,47,18,158,2,144,47,18,158,2,144,47,11,16,5,93,2,58,89,162,
 32,33,8,28,9,223,0,27,249,22,208,83,160,41,32,35,43,196,27,28,248,
 80,158,35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,80,158,38,
 35,197,28,248,80,158,38,32,193,27,248,80,158,39,34,194,28,192,249,80,158,
@@ -2503,7 +2503,7 @@
 162,32,33,36,9,224,3,1,248,193,89,162,32,32,36,9,224,2,3,28,248,
 22,252,174,2,193,248,22,252,179,2,193,249,80,158,35,42,21,95,63,108,101,
 116,159,93,94,2,133,2,155,96,2,154,95,2,64,2,133,94,2,142,2,156,
-96,2,0,2,157,2,158,2,156,97,2,59,2,133,62,99,49,160,62,99,50,
+96,2,0,2,157,2,158,2,156,97,2,58,2,133,62,99,49,160,62,99,50,
 161,2,156,83,160,41,58,35,43,89,162,32,32,8,28,9,225,6,5,4,27,
 250,22,208,83,160,41,59,38,43,250,22,208,83,160,41,8,28,41,43,250,22,
 59,83,160,41,8,29,44,43,250,22,208,83,160,41,8,30,47,43,248,22,59,
@@ -2546,7 +2546,7 @@
 252,32,2,11,6,31,31,98,97,100,32,115,121,110,116,97,120,32,40,105,108,
 108,101,103,97,108,32,117,115,101,32,111,102,32,96,46,39,41,23,15,247,193,
 32,20,97,158,16,11,2,65,2,68,2,70,2,72,2,74,2,76,30,163,2,
-66,2,123,2,2,78,2,80,30,164,2,120,68,114,101,108,111,99,97,116,101,
+66,2,122,2,2,78,2,80,30,164,2,119,68,114,101,108,111,99,97,116,101,
 165,1,30,166,2,106,1,20,101,108,108,105,112,115,105,115,45,99,111,117,110,
 116,45,101,114,114,111,114,167,0,16,50,18,98,2,82,49,36,35,34,16,4,
 48,11,2,133,3,1,7,101,110,118,51,53,49,48,168,18,16,2,95,2,135,
@@ -2558,17 +2558,17 @@
 8,29,97,8,28,10,32,11,16,58,2,105,29,173,11,11,2,107,2,66,2,
 90,2,91,2,71,2,66,2,108,2,66,73,115,121,110,116,97,120,45,99,97,
 115,101,42,42,174,2,173,2,73,2,66,2,112,2,66,2,96,2,91,2,69,
-2,66,2,116,2,66,2,75,2,66,2,117,2,66,2,89,2,84,2,83,2,
-84,2,100,2,101,2,123,2,66,2,167,2,173,2,85,2,84,2,126,2,66,
+2,66,2,115,2,66,2,75,2,66,2,116,2,66,2,89,2,84,2,83,2,
+84,2,100,2,101,2,122,2,66,2,167,2,173,2,85,2,84,2,125,2,66,
 2,97,2,91,2,77,2,66,2,92,2,84,2,93,2,84,2,79,2,66,2,
 94,2,84,2,113,2,66,2,81,2,66,2,67,2,66,97,59,10,33,11,16,
 70,2,107,2,66,2,90,2,91,2,71,2,66,2,108,2,66,74,103,101,116,
 45,109,97,116,99,104,45,118,97,114,115,175,64,35,37,115,99,176,2,73,2,
 66,2,112,2,66,2,96,2,91,2,69,2,66,72,110,111,45,101,108,108,105,
-112,115,101,115,63,177,2,176,2,116,2,66,2,75,2,66,2,117,2,66,72,
+112,115,101,115,63,177,2,176,2,115,2,66,2,75,2,66,2,116,2,66,72,
 115,116,120,45,109,101,109,113,45,112,111,115,178,2,176,2,89,2,84,2,83,
-2,84,2,100,2,101,2,123,2,66,74,109,97,107,101,45,109,97,116,99,104,
-38,101,110,118,179,2,176,2,85,2,84,2,126,2,66,2,97,2,91,79,109,
+2,84,2,100,2,101,2,122,2,66,74,109,97,107,101,45,109,97,116,99,104,
+38,101,110,118,179,2,176,2,85,2,84,2,125,2,66,2,97,2,91,79,109,
 97,107,101,45,115,121,110,116,97,120,45,109,97,112,112,105,110,103,180,2,176,
 1,20,115,121,110,116,97,120,45,109,97,112,112,105,110,103,45,100,101,112,116,
 104,181,2,176,2,77,2,66,72,109,97,107,101,45,112,101,120,112,97,110,100,
@@ -2618,8 +2618,8 @@
 8,51,18,158,2,144,8,51,18,158,2,144,8,51,18,158,2,154,8,51,18,
 158,2,144,8,51,18,158,2,64,8,51,18,158,2,133,8,51,18,158,2,144,
 8,51,18,158,2,144,8,51,18,158,2,0,8,51,18,158,2,144,8,51,18,
-158,2,144,8,51,18,158,2,59,8,51,18,158,2,133,8,51,18,158,2,144,
-8,51,18,158,2,144,8,51,18,158,2,144,8,51,11,16,5,93,2,62,89,
+158,2,144,8,51,18,158,2,58,8,51,18,158,2,133,8,51,18,158,2,144,
+8,51,18,158,2,144,8,51,18,158,2,144,8,51,11,16,5,93,2,61,89,
 162,32,33,8,31,9,223,0,27,249,22,208,83,160,41,32,35,45,196,27,28,
 248,80,158,35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,80,158,
 38,35,197,28,248,80,158,38,32,193,27,27,248,80,158,40,34,195,28,248,80,
@@ -2744,7 +2744,7 @@
 3,1,7,101,110,118,51,55,51,56,252,10,1,16,4,8,79,11,65,95,101,
 108,115,101,252,11,1,3,1,7,101,110,118,51,55,51,57,252,12,1,9,16,
 2,158,2,156,8,82,9,8,82,95,9,8,252,84,9,2,104,11,16,5,93,
-2,57,89,162,32,33,56,9,223,0,27,249,22,208,83,160,41,32,35,39,196,
+2,56,89,162,32,33,56,9,223,0,27,249,22,208,83,160,41,32,35,39,196,
 27,28,248,80,158,35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,
 80,158,38,35,197,28,248,80,158,38,32,193,27,248,80,158,39,34,194,28,192,
 249,80,158,40,36,194,248,80,158,41,37,248,80,158,42,35,197,11,11,11,28,
@@ -2759,7 +2759,7 @@
 85,93,8,252,108,9,95,9,8,252,108,9,2,106,18,100,2,136,8,88,36,
 35,34,8,83,16,6,8,87,11,3,1,4,103,52,54,52,252,14,1,3,1,
 4,103,52,54,53,252,15,1,3,1,7,101,110,118,51,55,52,56,252,16,1,
-2,252,16,1,16,6,8,86,11,2,57,63,101,120,112,252,17,1,3,1,7,
+2,252,16,1,16,6,8,86,11,2,56,63,101,120,112,252,17,1,3,1,7,
 101,110,118,51,55,52,57,252,18,1,2,252,18,1,18,158,2,144,8,88,18,
 158,2,6,8,88,18,158,2,144,8,88,18,158,66,108,97,109,98,100,97,252,
 19,1,8,88,18,158,9,8,88,18,158,2,144,8,88,18,158,2,144,8,88,
@@ -2768,7 +2768,7 @@
 34,39,32,248,22,59,248,247,22,252,79,3,83,160,41,35,40,32,248,22,59,
 248,247,22,252,79,3,83,160,41,36,40,32,10,40,20,97,158,16,0,16,5,
 18,97,2,4,8,89,36,35,34,18,158,2,6,8,89,18,158,2,8,8,89,
-18,158,2,10,8,89,18,158,2,12,8,89,11,16,5,93,2,56,89,162,32,
+18,158,2,10,8,89,18,158,2,12,8,89,11,16,5,93,2,55,89,162,32,
 33,56,9,223,0,27,249,22,208,83,160,41,32,35,45,196,27,28,248,80,158,
 35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,80,158,38,35,197,
 28,248,80,158,38,32,193,28,248,80,158,38,36,248,80,158,39,34,194,27,248,
@@ -2852,7 +2852,7 @@
 1,4,103,52,55,53,252,50,1,3,1,7,101,110,118,51,56,49,48,252,51,
 1,16,4,8,110,11,2,252,11,1,3,1,7,101,110,118,51,56,49,49,252,
 52,1,9,16,2,158,2,156,8,113,9,8,113,95,9,8,252,140,9,2,104,
-11,16,5,93,2,54,89,162,32,33,8,36,9,223,0,27,249,22,208,83,160,
+11,16,5,93,2,53,89,162,32,33,8,36,9,223,0,27,249,22,208,83,160,
 41,32,35,39,196,27,28,248,80,158,35,32,194,249,80,158,36,33,248,80,158,
 37,34,196,27,248,80,158,38,35,197,28,248,80,158,38,32,193,249,80,158,39,
 33,248,80,158,40,34,195,27,248,80,158,41,35,196,28,248,80,158,41,32,193,
@@ -2894,7 +2894,7 @@
 252,79,3,83,160,41,35,40,32,248,22,59,248,247,22,252,79,3,83,160,41,
 36,40,32,10,40,20,97,158,16,0,16,5,18,158,2,35,8,89,18,158,2,
 37,8,89,18,158,2,39,8,89,18,158,2,41,8,89,18,158,2,43,8,89,
-11,16,5,94,2,58,2,53,27,89,162,32,33,34,62,119,104,252,63,1,223,
+11,16,5,94,2,57,2,63,27,89,162,32,33,34,62,119,104,252,63,1,223,
 1,89,162,32,33,56,9,224,0,1,27,249,22,208,83,160,41,32,36,44,197,
 27,28,248,80,158,36,32,194,249,80,158,37,33,248,80,158,38,34,196,27,248,
 80,158,39,35,197,28,248,80,158,39,32,193,28,248,80,158,39,36,248,80,158,
@@ -2929,7 +2929,7 @@
 156,95,2,159,93,94,63,98,112,122,252,70,1,95,2,252,21,1,11,2,47,
 96,2,252,20,1,2,47,94,2,252,61,1,11,93,94,67,99,97,108,108,47,
 101,99,252,71,1,95,2,252,19,1,93,2,142,96,2,252,20,1,2,47,2,
-252,70,1,95,2,56,93,94,1,25,99,117,114,114,101,110,116,45,101,120,99,
+252,70,1,95,2,55,93,94,1,25,99,117,114,114,101,110,116,45,101,120,99,
 101,112,116,105,111,110,45,104,97,110,100,108,101,114,252,72,1,95,2,252,19,
 1,93,61,101,252,73,1,94,2,142,95,2,252,19,1,9,96,2,159,64,108,
 111,111,112,252,74,1,93,94,2,252,64,1,2,252,64,1,96,2,100,94,94,
@@ -3030,7 +3030,7 @@
 8,131,18,158,2,252,71,1,8,131,18,158,2,144,8,131,18,158,2,252,19,
 1,8,131,18,158,93,16,2,158,2,142,8,131,9,8,131,18,158,2,144,8,
 131,18,158,2,252,20,1,8,131,18,158,2,47,8,131,18,158,2,252,70,1,
-8,131,18,158,2,144,8,131,18,158,2,56,8,131,18,158,2,144,8,131,18,
+8,131,18,158,2,144,8,131,18,158,2,55,8,131,18,158,2,144,8,131,18,
 158,2,144,8,131,18,158,2,252,72,1,8,131,18,158,2,144,8,131,18,158,
 2,252,19,1,8,131,18,158,93,16,2,158,2,252,73,1,8,131,9,8,131,
 18,158,2,144,8,131,18,158,2,142,8,131,18,158,2,144,8,131,18,158,2,
@@ -3059,7 +3059,7 @@
 158,2,252,81,1,8,131,9,8,131,9,8,131,9,8,131,9,8,131,9,8,
 141,95,9,8,252,198,9,2,106,18,158,2,144,8,131,18,158,2,144,8,131,
 18,158,2,144,8,131,18,158,2,144,8,131,18,158,2,144,8,131,18,158,2,
-144,8,131,18,158,2,144,8,131,18,158,2,144,8,131,11,16,5,93,2,61,
+144,8,131,18,158,2,144,8,131,18,158,2,144,8,131,11,16,5,93,2,60,
 89,162,32,33,58,9,223,0,27,249,22,208,83,160,41,32,35,46,196,27,28,
 248,80,158,35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,80,158,
 38,35,197,28,248,80,158,38,32,193,28,248,80,158,38,36,248,80,158,39,34,
@@ -3114,7 +3114,7 @@
 22,208,83,160,41,8,32,44,46,250,22,208,83,160,41,8,33,47,46,250,22,
 59,83,160,41,8,34,50,46,248,22,51,203,248,22,52,203,83,160,41,8,35,
 47,46,195,247,196,247,193,32,20,97,158,16,14,2,65,2,68,2,70,2,72,
-2,76,2,74,2,78,2,80,2,163,30,252,109,1,2,111,2,115,0,30,252,
+2,76,2,74,2,78,2,80,2,163,30,252,109,1,2,111,2,128,0,30,252,
 110,1,2,104,2,109,0,2,164,2,166,2,234,16,36,18,98,2,82,8,143,
 36,35,34,16,4,8,142,11,2,252,25,1,3,1,7,101,110,118,51,56,57,
 48,252,111,1,18,16,2,95,2,135,8,144,93,8,252,222,9,95,9,8,252,
@@ -3160,7 +3160,7 @@
 7,101,110,118,51,57,53,53,252,138,1,2,252,138,1,2,252,138,1,16,8,
 8,169,11,2,141,2,252,108,1,2,252,24,1,3,1,7,101,110,118,51,57,
 53,54,252,139,1,2,252,139,1,2,252,139,1,18,158,2,144,8,171,18,158,
-2,252,107,1,8,171,18,158,2,144,8,171,11,16,5,93,2,55,89,162,32,
+2,252,107,1,8,171,18,158,2,144,8,171,11,16,5,93,2,54,89,162,32,
 33,8,32,9,223,0,27,249,22,208,83,160,41,32,35,39,196,27,28,248,80,
 158,35,32,194,249,80,158,36,33,248,80,158,37,34,196,27,248,80,158,38,35,
 197,28,248,80,158,38,32,193,249,80,158,39,33,248,80,158,40,34,195,27,248,
@@ -3186,7 +3186,7 @@
 1,2,252,147,1,18,158,2,144,8,177,18,158,67,99,97,108,108,47,99,99,
 252,148,1,8,177,18,158,2,144,8,177,18,158,2,252,19,1,8,177,18,158,
 2,144,8,177,18,158,2,144,8,177,18,158,2,144,8,177,18,158,2,144,8,
-177,11,16,5,93,2,63,89,162,32,33,51,9,223,0,27,249,22,208,83,160,
+177,11,16,5,93,2,62,89,162,32,33,51,9,223,0,27,249,22,208,83,160,
 41,32,35,41,196,27,28,248,80,158,35,32,194,249,80,158,36,33,248,80,158,
 37,34,196,27,248,80,158,38,35,197,28,248,80,158,38,32,193,249,80,158,39,
 33,248,80,158,40,34,195,27,248,80,158,41,35,196,28,248,80,158,41,32,193,
@@ -3227,7 +3227,7 @@
 101,110,118,51,57,56,57,252,162,1,2,252,162,1,2,252,162,1,2,252,162,
 1,2,252,162,1,18,158,2,144,8,188,18,158,2,159,8,188,18,158,9,8,
 188,18,158,2,144,8,188,18,158,2,85,8,188,18,158,2,144,8,188,18,158,
-2,144,8,188,11,16,5,93,2,60,89,162,32,33,55,9,223,0,27,249,22,
+2,144,8,188,11,16,5,93,2,59,89,162,32,33,55,9,223,0,27,249,22,
 208,83,160,41,32,35,46,196,27,28,248,80,158,35,32,194,249,80,158,36,33,
 248,80,158,37,34,196,27,248,80,158,38,35,197,28,248,80,158,38,32,193,28,
 248,80,158,38,36,248,80,158,39,34,194,27,248,80,158,39,35,194,28,248,80,
@@ -3416,11 +3416,11 @@
 198,199,83,158,36,20,92,94,20,14,159,80,158,32,53,249,80,158,34,45,195,
 32,87,94,247,80,158,32,55,247,194,247,80,158,32,55,96,68,35,37,107,101,
 114,110,101,108,252,209,1,74,35,37,115,109,97,108,108,45,115,99,104,101,109,
-101,252,210,1,2,87,2,18,96,2,252,209,1,2,66,2,111,2,122,0};
+101,252,210,1,2,87,2,18,96,2,252,209,1,2,66,2,111,2,121,0};
     EVAL_ONE_SIZED_STR((char *)expr, 23518);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,252,216,1,252,120,53,159,32,20,97,158,16,1,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,252,216,1,252,120,53,159,32,20,97,158,16,1,
 20,23,65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,66,35,37,109,
 105,115,99,1,29,2,11,11,10,10,10,44,80,158,32,32,20,97,158,16,47,
 30,3,2,2,72,112,97,116,104,45,115,116,114,105,110,103,63,4,254,1,30,
@@ -3518,70 +3518,70 @@
 102,103,1,30,104,2,100,67,115,116,120,45,99,97,114,105,5,30,106,2,100,
 67,115,116,120,45,99,100,114,107,6,30,108,2,100,69,115,116,120,45,108,105,
 115,116,63,109,8,30,110,2,100,69,115,116,120,45,62,108,105,115,116,111,4,
-16,44,18,98,64,104,101,114,101,112,38,97,36,10,32,11,16,162,74,119,105,
-116,104,45,104,97,110,100,108,101,114,115,42,113,73,35,37,109,111,114,101,45,
-115,99,104,101,109,101,114,2,69,2,2,2,28,2,2,1,30,110,101,119,45,
-109,101,109,116,114,97,99,101,45,116,114,97,99,107,105,110,103,45,102,117,110,
-99,116,105,111,110,115,70,35,37,109,101,109,116,114,97,99,101,116,2,6,2,
-2,78,112,97,114,97,109,101,116,101,114,105,122,101,45,98,114,101,97,107,117,
-2,114,77,100,101,102,105,110,101,45,102,111,114,45,115,121,110,116,97,120,118,
-68,35,37,100,101,102,105,110,101,119,1,31,117,110,105,111,110,101,100,45,109,
-101,109,116,114,97,99,101,45,116,114,97,99,107,105,110,103,45,118,97,108,117,
-101,120,2,116,2,4,2,2,2,14,2,2,73,100,101,102,105,110,101,45,115,
-116,114,117,99,116,121,74,35,37,100,101,102,105,110,101,45,101,116,45,97,108,
-122,76,98,101,103,105,110,45,102,111,114,45,115,121,110,116,97,120,123,2,119,
-2,98,2,2,2,65,2,2,71,115,101,116,33,45,118,97,108,117,101,115,124,
-2,114,74,45,100,101,102,105,110,101,45,115,121,110,116,97,120,125,2,122,2,
-22,2,2,2,36,2,2,67,45,100,101,102,105,110,101,126,2,122,2,53,2,
-2,2,26,2,2,68,112,114,111,109,105,115,101,63,127,2,114,2,30,2,2,
-72,112,97,114,97,109,101,116,101,114,105,122,101,128,2,114,2,51,2,2,63,
-97,110,100,129,71,35,37,113,113,45,97,110,100,45,111,114,130,2,18,2,2,
-2,40,2,2,62,111,114,131,2,130,2,89,2,2,64,119,104,101,110,132,2,
-122,66,117,110,108,101,115,115,133,2,122,2,77,2,2,2,20,2,2,66,108,
-101,116,47,101,99,134,2,122,2,75,2,2,70,108,101,116,45,115,116,114,117,
-99,116,135,2,114,73,100,101,102,105,110,101,45,115,121,110,116,97,120,136,2,
-119,2,59,2,2,2,61,2,2,2,34,2,2,69,102,108,117,105,100,45,108,
-101,116,137,2,114,2,81,2,2,2,93,2,2,66,108,101,116,47,99,99,138,
-2,114,2,71,2,2,2,95,2,2,70,113,117,97,115,105,113,117,111,116,101,
-139,2,130,2,67,2,2,2,32,2,2,2,10,2,2,2,38,2,2,64,99,
-97,115,101,140,2,114,1,32,99,97,108,108,45,119,105,116,104,45,98,114,101,
-97,107,45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,141,2,
-114,2,63,2,2,2,12,2,2,2,91,2,2,2,79,2,2,64,116,105,109,
-101,142,2,114,1,24,99,117,114,114,101,110,116,45,112,97,114,97,109,101,116,
-101,114,105,122,97,116,105,111,110,143,2,114,2,47,2,2,2,49,2,2,2,
-57,2,2,2,83,2,2,2,55,2,2,2,8,2,2,1,26,99,97,108,108,
+16,44,18,98,64,104,101,114,101,112,38,97,36,10,32,11,16,162,2,30,2,
+2,74,119,105,116,104,45,104,97,110,100,108,101,114,115,42,113,73,35,37,109,
+111,114,101,45,115,99,104,101,109,101,114,1,24,99,117,114,114,101,110,116,45,
+112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,115,2,114,2,28,
+2,2,2,6,2,2,78,112,97,114,97,109,101,116,101,114,105,122,101,45,98,
+114,101,97,107,116,2,114,77,100,101,102,105,110,101,45,102,111,114,45,115,121,
+110,116,97,120,117,68,35,37,100,101,102,105,110,101,118,1,26,99,97,108,108,
 45,119,105,116,104,45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,
-110,144,2,114,2,73,2,2,2,16,2,2,65,100,101,108,97,121,145,2,114,
-2,87,2,2,1,30,99,117,114,114,101,110,116,45,98,114,101,97,107,45,112,
-97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,146,2,114,2,97,2,
-2,2,85,2,2,73,119,105,116,104,45,104,97,110,100,108,101,114,115,147,2,
-114,62,100,111,148,2,114,65,102,111,114,99,101,149,2,114,2,24,2,2,1,
-30,109,101,109,111,114,121,45,116,114,97,99,101,45,99,111,110,116,105,110,117,
-97,116,105,111,110,45,109,97,114,107,150,2,116,64,99,111,110,100,151,66,35,
-37,99,111,110,100,152,66,100,101,102,105,110,101,153,2,119,97,35,10,33,11,
+110,119,2,114,2,4,2,2,2,14,2,2,73,100,101,102,105,110,101,45,115,
+116,114,117,99,116,120,74,35,37,100,101,102,105,110,101,45,101,116,45,97,108,
+121,76,98,101,103,105,110,45,102,111,114,45,115,121,110,116,97,120,122,2,118,
+2,98,2,2,1,30,99,117,114,114,101,110,116,45,98,114,101,97,107,45,112,
+97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,123,2,114,71,115,101,
+116,33,45,118,97,108,117,101,115,124,2,114,74,45,100,101,102,105,110,101,45,
+115,121,110,116,97,120,125,2,121,2,22,2,2,1,30,109,101,109,111,114,121,
+45,116,114,97,99,101,45,99,111,110,116,105,110,117,97,116,105,111,110,45,109,
+97,114,107,126,70,35,37,109,101,109,116,114,97,99,101,127,67,45,100,101,102,
+105,110,101,128,2,121,2,53,2,2,2,69,2,2,2,77,2,2,68,112,114,
+111,109,105,115,101,63,129,2,114,1,30,110,101,119,45,109,101,109,116,114,97,
+99,101,45,116,114,97,99,107,105,110,103,45,102,117,110,99,116,105,111,110,130,
+2,127,72,112,97,114,97,109,101,116,101,114,105,122,101,131,2,114,2,40,2,
+2,63,97,110,100,132,71,35,37,113,113,45,97,110,100,45,111,114,133,2,18,
+2,2,62,111,114,134,2,133,2,89,2,2,1,31,117,110,105,111,110,101,100,
+45,109,101,109,116,114,97,99,101,45,116,114,97,99,107,105,110,103,45,118,97,
+108,117,101,135,2,127,64,119,104,101,110,136,2,121,66,117,110,108,101,115,115,
+137,2,121,2,51,2,2,2,20,2,2,66,108,101,116,47,101,99,138,2,121,
+2,75,2,2,70,108,101,116,45,115,116,114,117,99,116,139,2,114,73,100,101,
+102,105,110,101,45,115,121,110,116,97,120,140,2,118,2,59,2,2,2,61,2,
+2,2,34,2,2,69,102,108,117,105,100,45,108,101,116,141,2,114,2,81,2,
+2,2,36,2,2,66,108,101,116,47,99,99,142,2,114,2,26,2,2,2,57,
+2,2,2,95,2,2,70,113,117,97,115,105,113,117,111,116,101,143,2,133,2,
+67,2,2,2,32,2,2,2,10,2,2,2,38,2,2,64,99,97,115,101,144,
+2,114,1,32,99,97,108,108,45,119,105,116,104,45,98,114,101,97,107,45,112,
+97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,145,2,114,2,63,2,
+2,2,12,2,2,2,91,2,2,2,79,2,2,64,116,105,109,101,146,2,114,
+2,65,2,2,2,47,2,2,2,49,2,2,2,93,2,2,2,83,2,2,2,
+97,2,2,2,55,2,2,2,8,2,2,2,71,2,2,2,73,2,2,65,100,
+101,108,97,121,147,2,114,2,87,2,2,2,16,2,2,2,85,2,2,73,119,
+105,116,104,45,104,97,110,100,108,101,114,115,148,2,114,62,100,111,149,2,114,
+65,102,111,114,99,101,150,2,114,2,24,2,2,64,99,111,110,100,151,66,35,
+37,99,111,110,100,152,66,100,101,102,105,110,101,153,2,118,97,35,10,33,11,
 16,78,71,119,105,116,104,45,115,121,110,116,97,120,154,70,35,37,119,105,116,
 104,45,115,116,120,155,66,115,121,110,116,97,120,156,69,35,37,115,116,120,99,
-97,115,101,157,71,115,116,120,45,118,101,99,116,111,114,63,158,2,100,2,129,
-2,130,2,105,2,100,74,115,116,120,45,118,101,99,116,111,114,45,114,101,102,
+97,115,101,157,71,115,116,120,45,118,101,99,116,111,114,63,158,2,100,2,132,
+2,133,2,105,2,100,74,115,116,120,45,118,101,99,116,111,114,45,114,101,102,
 159,2,100,1,20,103,101,110,101,114,97,116,101,45,116,101,109,112,111,114,97,
 114,105,101,115,160,2,155,72,108,101,116,45,115,121,110,116,97,120,101,115,161,
 76,35,37,115,116,120,99,97,115,101,45,115,99,104,101,109,101,162,2,107,2,
 100,70,115,116,120,45,114,111,116,97,116,101,163,2,100,73,115,116,120,45,99,
 104,101,99,107,47,101,115,99,164,2,100,2,103,2,100,72,115,121,110,116,97,
-120,45,114,117,108,101,115,165,2,162,1,26,99,104,101,99,107,45,100,117,112,
-108,105,99,97,116,101,45,105,100,101,110,116,105,102,105,101,114,166,2,162,71,
-115,116,120,45,114,111,116,97,116,101,42,167,2,100,69,97,112,112,101,110,100,
-47,35,102,168,2,100,74,115,112,108,105,116,45,115,116,120,45,108,105,115,116,
-169,2,100,75,115,121,110,116,97,120,45,105,100,45,114,117,108,101,115,170,2,
-162,2,151,2,152,71,115,121,110,116,97,120,45,99,97,115,101,171,68,35,37,
-115,116,120,108,111,99,172,2,125,2,122,2,131,2,130,71,105,100,101,110,116,
-105,102,105,101,114,63,173,2,100,70,115,121,110,116,97,120,47,108,111,99,174,
-2,172,2,121,2,122,69,115,116,120,45,110,117,108,108,63,175,2,100,2,139,
-2,130,71,115,116,120,45,110,117,108,108,47,35,102,176,2,100,70,108,101,116,
-45,115,121,110,116,97,120,177,2,162,2,132,2,122,72,115,121,110,116,97,120,
-45,99,97,115,101,42,178,2,172,75,108,101,116,114,101,99,45,115,121,110,116,
-97,120,101,115,179,2,162,2,133,2,122,2,109,2,100,2,126,2,122,2,134,
-2,122,73,108,101,116,114,101,99,45,115,121,110,116,97,120,180,2,162,2,111,
+120,45,114,117,108,101,115,165,2,162,71,115,116,120,45,114,111,116,97,116,101,
+42,166,2,100,69,97,112,112,101,110,100,47,35,102,167,2,100,74,115,112,108,
+105,116,45,115,116,120,45,108,105,115,116,168,2,100,75,115,121,110,116,97,120,
+45,105,100,45,114,117,108,101,115,169,2,162,2,151,2,152,71,115,121,110,116,
+97,120,45,99,97,115,101,170,68,35,37,115,116,120,108,111,99,171,2,125,2,
+121,2,134,2,133,71,105,100,101,110,116,105,102,105,101,114,63,172,2,100,70,
+115,121,110,116,97,120,47,108,111,99,173,2,171,2,120,2,121,69,115,116,120,
+45,110,117,108,108,63,174,2,100,2,143,2,133,71,115,116,120,45,110,117,108,
+108,47,35,102,175,2,100,70,108,101,116,45,115,121,110,116,97,120,176,2,162,
+2,136,2,121,1,26,99,104,101,99,107,45,100,117,112,108,105,99,97,116,101,
+45,105,100,101,110,116,105,102,105,101,114,177,2,162,72,115,121,110,116,97,120,
+45,99,97,115,101,42,178,2,171,75,108,101,116,114,101,99,45,115,121,110,116,
+97,120,101,115,179,2,162,2,137,2,121,2,109,2,100,2,128,2,121,2,138,
+2,121,73,108,101,116,114,101,99,45,115,121,110,116,97,120,180,2,162,2,111,
 2,100,2,101,2,100,96,34,8,254,1,11,16,0,16,4,33,11,61,120,181,
 3,1,7,101,110,118,52,49,48,53,182,18,100,2,112,41,36,35,34,33,16,
 8,40,11,3,1,4,103,53,50,54,183,3,1,4,103,53,50,55,184,3,1,
@@ -3599,27 +3599,27 @@
 114,107,203,3,1,7,101,110,118,52,49,52,53,204,18,158,63,99,116,120,205,
 49,18,158,63,108,101,116,206,49,18,158,2,205,49,18,158,2,205,49,18,16,
 2,103,93,16,2,158,11,49,9,57,97,56,10,32,11,16,58,2,156,29,207,
-11,11,2,158,2,100,2,129,2,130,2,105,2,100,2,159,2,100,73,115,121,
+11,11,2,158,2,100,2,132,2,133,2,105,2,100,2,159,2,100,73,115,121,
 110,116,97,120,45,99,97,115,101,42,42,208,2,207,2,107,2,100,2,163,2,
-100,2,131,2,130,2,103,2,100,2,167,2,100,2,168,2,100,2,169,2,100,
-2,126,2,122,2,125,2,122,2,151,2,152,2,173,2,100,1,20,101,108,108,
+100,2,134,2,133,2,103,2,100,2,166,2,100,2,167,2,100,2,168,2,100,
+2,128,2,121,2,125,2,121,2,151,2,152,2,172,2,100,1,20,101,108,108,
 105,112,115,105,115,45,99,111,117,110,116,45,101,114,114,111,114,209,2,207,2,
-121,2,122,2,175,2,100,2,139,2,130,2,176,2,100,2,132,2,122,2,133,
-2,122,2,109,2,100,2,134,2,122,2,164,2,100,2,111,2,100,2,101,2,
-100,97,55,10,33,11,16,70,2,158,2,100,2,129,2,130,2,105,2,100,2,
+120,2,121,2,174,2,100,2,143,2,133,2,175,2,100,2,136,2,121,2,137,
+2,121,2,109,2,100,2,138,2,121,2,164,2,100,2,111,2,100,2,101,2,
+100,97,55,10,33,11,16,70,2,158,2,100,2,132,2,133,2,105,2,100,2,
 159,2,100,74,103,101,116,45,109,97,116,99,104,45,118,97,114,115,210,64,35,
-37,115,99,211,2,107,2,100,2,163,2,100,2,131,2,130,2,103,2,100,72,
-110,111,45,101,108,108,105,112,115,101,115,63,212,2,211,2,167,2,100,2,168,
-2,100,2,169,2,100,72,115,116,120,45,109,101,109,113,45,112,111,115,213,2,
-211,2,126,2,122,2,125,2,122,2,151,2,152,2,173,2,100,74,109,97,107,
-101,45,109,97,116,99,104,38,101,110,118,214,2,211,2,121,2,122,2,175,2,
-100,2,139,2,130,79,109,97,107,101,45,115,121,110,116,97,120,45,109,97,112,
+37,115,99,211,2,107,2,100,2,163,2,100,2,134,2,133,2,103,2,100,72,
+110,111,45,101,108,108,105,112,115,101,115,63,212,2,211,2,166,2,100,2,167,
+2,100,2,168,2,100,72,115,116,120,45,109,101,109,113,45,112,111,115,213,2,
+211,2,128,2,121,2,125,2,121,2,151,2,152,2,172,2,100,74,109,97,107,
+101,45,109,97,116,99,104,38,101,110,118,214,2,211,2,120,2,121,2,174,2,
+100,2,143,2,133,79,109,97,107,101,45,115,121,110,116,97,120,45,109,97,112,
 112,105,110,103,215,2,211,1,20,115,121,110,116,97,120,45,109,97,112,112,105,
-110,103,45,100,101,112,116,104,216,2,211,2,176,2,100,72,109,97,107,101,45,
-112,101,120,112,97,110,100,217,2,211,2,132,2,122,75,115,121,110,116,97,120,
+110,103,45,100,101,112,116,104,216,2,211,2,175,2,100,72,109,97,107,101,45,
+112,101,120,112,97,110,100,217,2,211,2,136,2,121,75,115,121,110,116,97,120,
 45,109,97,112,112,105,110,103,63,218,2,211,1,21,115,121,110,116,97,120,45,
-109,97,112,112,105,110,103,45,118,97,108,118,97,114,219,2,211,2,133,2,122,
-2,109,2,100,2,134,2,122,2,164,2,100,2,111,2,100,2,101,2,100,96,
+109,97,112,112,105,110,103,45,118,97,108,118,97,114,219,2,211,2,137,2,121,
+2,109,2,100,2,138,2,121,2,164,2,100,2,111,2,100,2,101,2,100,96,
 54,8,254,1,11,16,0,16,4,53,11,2,181,3,1,6,101,110,118,51,56,
 48,220,16,4,52,11,68,104,101,114,101,45,115,116,120,221,3,1,6,101,110,
 118,51,56,50,222,16,4,51,11,2,221,2,222,13,16,3,33,2,207,2,157,
@@ -3628,12 +3628,12 @@
 49,18,158,2,205,49,18,158,2,205,49,18,158,2,206,49,18,158,2,205,49,
 18,158,2,205,49,18,158,2,205,49,18,158,66,108,97,109,98,100,97,226,49,
 18,158,2,205,49,18,158,2,206,49,18,158,2,205,49,18,158,2,205,49,18,
-158,2,205,49,18,158,2,120,49,18,158,2,205,49,18,158,2,205,49,18,158,
+158,2,205,49,18,158,2,135,49,18,158,2,205,49,18,158,2,205,49,18,158,
 2,205,49,18,158,2,205,49,18,158,1,22,119,105,116,104,45,99,111,110,116,
-105,110,117,97,116,105,111,110,45,109,97,114,107,227,49,18,158,2,150,49,18,
+105,110,117,97,116,105,111,110,45,109,97,114,107,227,49,18,158,2,126,49,18,
 158,2,205,49,18,158,2,205,49,18,158,2,205,49,18,158,2,205,49,18,158,
 2,205,49,18,158,2,205,49,18,158,64,115,101,116,33,228,49,18,158,2,205,
-49,18,158,2,115,49,18,158,2,205,49,18,158,2,205,49,18,158,2,205,49,
+49,18,158,2,130,49,18,158,2,205,49,18,158,2,205,49,18,158,2,205,49,
 18,158,2,205,49,11,134,83,159,32,93,80,158,32,32,89,162,32,33,36,2,
 4,222,27,248,22,252,16,3,194,28,192,192,28,248,22,252,135,1,194,27,248,
 22,252,29,3,195,28,192,192,248,22,252,30,3,195,11,83,159,32,93,80,158,
@@ -4067,16 +4067,16 @@
 105,60,61,63,252,204,1,70,99,104,97,114,45,99,105,62,61,63,252,205,1,
 71,99,104,97,114,45,117,112,99,97,115,101,252,206,1,68,98,111,111,108,101,
 97,110,63,252,207,1,64,101,113,118,63,252,208,1,66,101,113,117,97,108,63,
-252,209,1,2,149,76,99,97,108,108,45,119,105,116,104,45,118,97,108,117,101,
+252,209,1,2,150,76,99,97,108,108,45,119,105,116,104,45,118,97,108,117,101,
 115,252,210,1,66,118,97,108,117,101,115,252,211,1,64,101,118,97,108,252,212,
 1,2,71,2,93,2,97,2,91,72,100,121,110,97,109,105,99,45,119,105,110,
 100,252,213,1,9,193,97,68,35,37,107,101,114,110,101,108,252,214,1,2,114,
-74,35,37,115,109,97,108,108,45,115,99,104,101,109,101,252,215,1,2,116,2,
-119,95,2,252,214,1,2,100,2,162,0};
+74,35,37,115,109,97,108,108,45,115,99,104,101,109,101,252,215,1,2,127,2,
+118,95,2,252,214,1,2,100,2,162,0};
     EVAL_ONE_SIZED_STR((char *)expr, 13702);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,66,252,59,4,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,66,252,59,4,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,72,35,37,115,116,120,
 109,122,45,98,111,100,121,1,29,2,11,11,18,95,11,35,97,33,10,32,11,
 16,58,71,119,105,116,104,45,115,121,110,116,97,120,3,70,35,37,119,105,116,
@@ -4098,17 +4098,17 @@
 115,105,113,117,111,116,101,28,2,10,1,20,35,37,112,108,97,105,110,45,109,
 111,100,117,108,101,45,98,101,103,105,110,29,158,68,35,37,107,101,114,110,101,
 108,30,74,35,37,109,111,100,117,108,101,45,98,101,103,105,110,31,70,115,121,
-110,116,97,120,47,108,111,99,32,2,12,64,119,104,101,110,33,2,22,75,108,
-101,116,114,101,99,45,115,121,110,116,97,120,101,115,34,2,15,66,117,110,108,
-101,115,115,35,2,22,72,115,121,110,116,97,120,45,99,97,115,101,42,36,2,
-12,1,26,99,104,101,99,107,45,100,117,112,108,105,99,97,116,101,45,105,100,
-101,110,116,105,102,105,101,114,37,2,15,66,108,101,116,47,101,99,38,2,22,
-73,108,101,116,114,101,99,45,115,121,110,116,97,120,39,2,15,73,100,101,102,
-105,110,101,45,115,121,110,116,97,120,40,2,8,1,28,109,122,115,99,104,101,
-109,101,45,105,110,45,115,116,120,45,109,111,100,117,108,101,45,98,101,103,105,
-110,41,2,2,10,10,32,80,158,32,32,20,97,158,16,0,16,0,11,11,16,
-0,32,11,16,1,2,41,16,1,11,16,1,2,41,32,33,93,16,5,93,2,
-41,89,162,32,33,44,9,223,0,28,248,80,158,33,32,194,250,22,208,83,160,
+110,116,97,120,47,108,111,99,32,2,12,64,119,104,101,110,33,2,22,1,26,
+99,104,101,99,107,45,100,117,112,108,105,99,97,116,101,45,105,100,101,110,116,
+105,102,105,101,114,34,2,15,75,108,101,116,114,101,99,45,115,121,110,116,97,
+120,101,115,35,2,15,66,117,110,108,101,115,115,36,2,22,72,115,121,110,116,
+97,120,45,99,97,115,101,42,37,2,12,1,28,109,122,115,99,104,101,109,101,
+45,105,110,45,115,116,120,45,109,111,100,117,108,101,45,98,101,103,105,110,38,
+2,2,66,108,101,116,47,101,99,39,2,22,73,108,101,116,114,101,99,45,115,
+121,110,116,97,120,40,2,15,73,100,101,102,105,110,101,45,115,121,110,116,97,
+120,41,2,8,10,10,32,80,158,32,32,20,97,158,16,0,16,0,11,11,16,
+0,32,11,16,1,2,38,16,1,11,16,1,2,38,32,33,93,16,5,93,2,
+38,89,162,32,33,44,9,223,0,28,248,80,158,33,32,194,250,22,208,83,160,
 41,32,35,34,250,22,60,83,160,41,33,38,34,249,22,208,201,249,22,58,83,
 160,41,34,42,34,68,109,122,115,99,104,101,109,101,42,248,80,158,39,33,200,
 196,250,22,252,32,2,11,6,10,10,98,97,100,32,115,121,110,116,97,120,196,
@@ -4132,7 +4132,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 1095);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,91,252,159,6,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,91,252,159,6,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,68,109,122,115,99,104,
 101,109,101,1,29,2,11,11,10,10,10,32,80,158,32,32,20,97,158,16,0,
 16,0,74,35,37,109,111,100,117,108,101,45,98,101,103,105,110,3,10,16,0,
@@ -4167,20 +4167,20 @@
 118,97,108,45,112,114,105,110,116,45,108,111,111,112,33,1,25,115,99,104,101,
 109,101,45,114,101,112,111,114,116,45,101,110,118,105,114,111,110,109,101,110,116,
 34,73,100,101,102,105,110,101,45,115,121,110,116,97,120,35,78,112,97,114,97,
-109,101,116,101,114,105,122,101,45,98,114,101,97,107,36,77,117,110,115,121,110,
-116,97,120,45,115,112,108,105,99,105,110,103,37,79,109,101,109,111,114,121,45,
-116,114,97,99,101,45,108,97,109,98,100,97,38,70,108,101,116,45,115,116,114,
-117,99,116,39,71,119,105,116,104,45,115,121,110,116,97,120,40,70,115,121,110,
-116,97,120,47,108,111,99,41,64,99,111,110,100,42,64,119,104,101,110,43,66,
-117,110,108,101,115,115,44,66,108,101,116,47,101,99,45,66,115,121,110,116,97,
-120,46,70,113,117,97,115,105,113,117,111,116,101,47,71,115,121,110,116,97,120,
-45,99,97,115,101,48,62,100,111,49,70,108,101,116,45,115,121,110,116,97,120,
-50,66,100,101,102,105,110,101,51,2,3,1,28,109,122,115,99,104,101,109,101,
-45,105,110,45,115,116,120,45,109,111,100,117,108,101,45,98,101,103,105,110,52,
-64,99,97,115,101,53,65,100,101,108,97,121,54,63,97,110,100,55,62,111,114,
-56,71,115,101,116,33,45,118,97,108,117,101,115,57,69,102,108,117,105,100,45,
-108,101,116,58,66,108,101,116,47,99,99,59,64,116,105,109,101,60,73,100,101,
-102,105,110,101,45,115,116,114,117,99,116,61,68,117,110,115,121,110,116,97,120,
+109,101,116,101,114,105,122,101,45,98,114,101,97,107,36,62,100,111,37,70,108,
+101,116,45,115,116,114,117,99,116,38,77,117,110,115,121,110,116,97,120,45,115,
+112,108,105,99,105,110,103,39,71,119,105,116,104,45,115,121,110,116,97,120,40,
+70,108,101,116,45,115,121,110,116,97,120,41,64,99,111,110,100,42,64,119,104,
+101,110,43,66,117,110,108,101,115,115,44,66,108,101,116,47,101,99,45,66,115,
+121,110,116,97,120,46,70,113,117,97,115,105,113,117,111,116,101,47,71,115,121,
+110,116,97,120,45,99,97,115,101,48,70,115,121,110,116,97,120,47,108,111,99,
+49,2,3,1,28,109,122,115,99,104,101,109,101,45,105,110,45,115,116,120,45,
+109,111,100,117,108,101,45,98,101,103,105,110,50,64,99,97,115,101,51,65,100,
+101,108,97,121,52,66,100,101,102,105,110,101,53,63,97,110,100,54,62,111,114,
+55,71,115,101,116,33,45,118,97,108,117,101,115,56,69,102,108,117,105,100,45,
+108,101,116,57,66,108,101,116,47,99,99,58,64,116,105,109,101,59,73,100,101,
+102,105,110,101,45,115,116,114,117,99,116,60,79,109,101,109,111,114,121,45,116,
+114,97,99,101,45,108,97,109,98,100,97,61,68,117,110,115,121,110,116,97,120,
 62,71,113,117,97,115,105,115,121,110,116,97,120,63,77,100,101,102,105,110,101,
 45,102,111,114,45,115,121,110,116,97,120,64,76,98,101,103,105,110,45,102,111,
 114,45,115,121,110,116,97,120,65,75,113,117,97,115,105,115,121,110,116,97,120,
@@ -4196,20 +4196,20 @@
 78,2,77,2,76,2,77,2,76,2,77,2,77,2,76,70,35,37,119,105,116,
 104,45,115,116,120,79,2,77,65,35,37,115,116,120,80,2,77,2,77,2,77,
 2,77,2,77,2,77,2,77,2,77,2,77,2,77,2,77,2,76,2,77,2,
-77,2,77,68,35,37,100,101,102,105,110,101,81,2,76,67,35,37,113,113,115,
-116,120,82,2,77,2,76,2,79,68,35,37,115,116,120,108,111,99,83,66,35,
-37,99,111,110,100,84,74,35,37,100,101,102,105,110,101,45,101,116,45,97,108,
-85,2,85,2,85,69,35,37,115,116,120,99,97,115,101,86,71,35,37,113,113,
-45,97,110,100,45,111,114,87,2,83,2,76,2,78,2,81,68,35,37,107,101,
-114,110,101,108,88,72,35,37,115,116,120,109,122,45,98,111,100,121,89,2,76,
-2,76,2,87,2,87,2,76,2,76,2,76,2,76,2,85,2,82,2,82,2,
+77,2,77,68,35,37,100,101,102,105,110,101,81,2,76,2,76,2,76,67,35,
+37,113,113,115,116,120,82,2,79,2,78,66,35,37,99,111,110,100,83,74,35,
+37,100,101,102,105,110,101,45,101,116,45,97,108,84,2,84,2,84,69,35,37,
+115,116,120,99,97,115,101,85,71,35,37,113,113,45,97,110,100,45,111,114,86,
+68,35,37,115,116,120,108,111,99,87,2,87,68,35,37,107,101,114,110,101,108,
+88,72,35,37,115,116,120,109,122,45,98,111,100,121,89,2,76,2,76,2,81,
+2,86,2,86,2,76,2,76,2,76,2,76,2,84,2,77,2,82,2,82,2,
 81,2,81,2,82,2,78,2,78,2,76,2,78,2,78,2,78,2,76,2,76,
-2,83,16,73,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,
+2,87,16,73,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,
 12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,2,22,
 2,23,2,24,2,25,2,26,2,27,2,28,2,29,2,30,2,31,2,32,2,
 33,2,34,2,35,2,36,2,37,2,38,2,39,2,40,2,41,2,42,2,43,
-2,44,2,45,2,46,2,47,2,48,2,49,2,50,2,51,1,20,35,37,112,
-108,97,105,110,45,109,111,100,117,108,101,45,98,101,103,105,110,90,2,3,2,
+2,44,2,45,2,46,2,47,2,48,2,49,1,20,35,37,112,108,97,105,110,
+45,109,111,100,117,108,101,45,98,101,103,105,110,90,2,3,2,51,2,52,2,
 53,2,54,2,55,2,56,2,57,2,58,2,59,2,60,2,61,2,62,2,63,
 2,64,2,65,2,66,2,67,2,68,2,69,2,70,2,71,2,72,2,73,2,
 74,2,75,8,31,8,73,9,9,100,2,88,2,76,2,77,2,78,2,80,2,
@@ -4217,7 +4217,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 1707);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,203,252,109,23,159,32,20,97,158,16,1,20,23,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,203,252,109,23,159,32,20,97,158,16,1,20,23,
 65,98,101,103,105,110,0,16,0,83,158,39,20,94,114,66,35,37,114,53,114,
 115,1,29,2,11,11,10,10,10,33,80,158,32,32,20,97,158,16,1,30,3,
 2,2,69,117,110,100,101,102,105,110,101,100,4,254,1,16,0,11,11,16,1,
@@ -4249,7 +4249,7 @@
 28,248,22,56,193,21,94,9,9,248,80,158,35,40,193,11,28,192,249,80,158,
 39,41,194,27,248,80,158,41,35,197,28,248,80,158,41,36,193,248,80,158,41,
 39,193,11,11,11,11,28,192,27,248,22,51,194,27,248,22,77,195,27,248,22,
-86,196,27,248,22,87,197,249,80,158,39,42,200,27,250,22,60,198,199,200,27,
+86,196,27,248,22,87,197,249,80,158,39,42,200,27,250,22,60,200,198,199,27,
 83,160,41,32,41,44,91,159,33,11,90,161,33,32,11,83,160,38,32,33,11,
 247,248,22,8,89,162,32,33,40,9,226,11,2,3,1,250,22,31,89,162,32,
 32,36,9,225,6,3,7,90,161,33,33,10,247,22,252,177,2,248,22,252,177,
@@ -4260,9 +4260,9 @@
 110,105,116,49,37,2,36,64,98,111,100,121,38,2,36,83,160,41,33,35,44,
 89,162,32,32,52,9,225,6,5,4,27,250,22,208,83,160,41,34,38,44,250,
 22,208,83,160,41,35,41,44,253,22,61,83,160,41,36,47,44,83,160,41,37,
-47,44,248,22,79,206,83,160,41,38,47,44,250,22,2,89,162,33,33,41,9,
+47,44,248,22,51,206,83,160,41,38,47,44,250,22,2,89,162,33,33,41,9,
 223,18,250,22,208,83,160,41,39,35,44,249,22,59,248,22,51,199,248,22,77,
-199,83,160,41,40,35,44,248,22,79,23,17,248,22,77,23,17,248,22,51,206,
+199,83,160,41,40,35,44,248,22,51,23,17,248,22,79,23,17,248,22,77,206,
 83,160,41,41,41,44,197,89,162,32,32,33,9,223,0,192,89,162,32,32,34,
 9,223,3,248,22,252,177,2,208,27,28,248,80,158,35,32,196,249,80,158,36,
 33,248,80,158,37,34,198,27,248,80,158,38,35,199,28,248,80,158,38,32,193,
@@ -4322,7 +4322,7 @@
 197,28,248,80,158,52,36,193,248,80,158,52,39,193,11,11,11,11,11,11,11,
 11,11,11,28,192,27,248,22,51,194,27,248,22,77,195,27,248,22,86,196,27,
 248,22,89,197,27,249,22,69,199,36,27,249,22,69,200,37,27,249,22,68,201,
-38,249,80,158,44,42,205,27,252,22,60,202,201,204,203,200,27,83,160,41,8,
+38,249,80,158,44,42,205,27,252,22,60,202,203,204,201,200,27,83,160,41,8,
 31,46,44,91,159,33,11,90,161,33,32,11,83,160,38,32,33,11,247,248,22,
 8,89,162,32,33,40,9,226,16,2,3,1,250,22,31,89,162,32,32,36,9,
 225,6,3,7,90,161,33,33,10,247,22,252,177,2,248,22,252,177,2,89,162,
@@ -4334,10 +4334,10 @@
 89,162,32,32,54,9,225,6,5,4,27,250,22,208,83,160,41,8,33,38,44,
 250,22,208,83,160,41,8,34,41,44,253,22,61,83,160,41,8,35,47,44,83,
 160,41,8,36,47,44,248,22,86,206,250,22,208,83,160,41,8,37,50,44,249,
-22,55,83,160,41,8,38,52,44,248,22,89,23,19,83,160,41,8,39,50,44,
+22,55,83,160,41,8,38,52,44,248,22,77,23,19,83,160,41,8,39,50,44,
 250,22,2,89,162,33,33,41,9,223,18,250,22,208,83,160,41,8,40,35,44,
 249,22,59,248,22,51,199,248,22,77,199,83,160,41,8,41,35,44,248,22,51,
-23,17,248,22,77,23,17,248,22,88,206,83,160,41,8,42,41,44,197,89,162,
+23,17,248,22,89,23,17,248,22,88,206,83,160,41,8,42,41,44,197,89,162,
 32,32,33,9,223,0,192,89,162,32,32,34,9,223,3,248,22,252,177,2,208,
 250,22,252,32,2,11,6,10,10,98,97,100,32,115,121,110,116,97,120,199,32,
 20,97,158,16,12,30,43,65,35,37,115,116,120,44,69,115,116,120,45,112,97,
@@ -4359,82 +4359,82 @@
 77,16,4,35,11,63,101,120,110,78,3,1,7,101,110,118,52,52,50,52,79,
 95,9,8,252,76,11,2,68,18,99,64,100,101,115,116,80,45,97,44,10,32,
 11,16,150,74,119,105,116,104,45,104,97,110,100,108,101,114,115,42,81,2,32,
-1,29,102,105,110,100,45,108,105,98,114,97,114,121,45,99,111,108,108,101,99,
-116,105,111,110,45,112,97,116,104,115,82,66,35,37,109,105,115,99,83,2,13,
-2,31,1,20,102,105,110,100,45,101,120,101,99,117,116,97,98,108,101,45,112,
-97,116,104,84,2,83,76,110,111,114,109,97,108,45,99,97,115,101,45,112,97,
-116,104,85,2,83,75,99,111,108,108,101,99,116,105,111,110,45,112,97,116,104,
-86,2,83,78,112,97,114,97,109,101,116,101,114,105,122,101,45,98,114,101,97,
-107,87,2,32,77,100,101,102,105,110,101,45,102,111,114,45,115,121,110,116,97,
-120,88,2,33,74,35,37,109,111,100,117,108,101,45,98,101,103,105,110,89,158,
-72,35,37,115,116,120,109,122,45,98,111,100,121,90,1,28,109,122,115,99,104,
-101,109,101,45,105,110,45,115,116,120,45,109,111,100,117,108,101,45,98,101,103,
-105,110,91,1,32,99,97,108,108,45,119,105,116,104,45,98,114,101,97,107,45,
-112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,92,2,32,72,112,
-97,116,104,45,115,116,114,105,110,103,63,93,2,83,71,114,97,116,105,111,110,
-97,108,105,122,101,94,2,83,73,100,101,102,105,110,101,45,115,116,114,117,99,
-116,95,74,35,37,100,101,102,105,110,101,45,101,116,45,97,108,96,76,98,101,
-103,105,110,45,102,111,114,45,115,121,110,116,97,120,97,2,33,79,109,101,109,
-111,114,121,45,116,114,97,99,101,45,108,97,109,98,100,97,98,2,83,1,23,
-105,110,116,101,114,97,99,116,105,111,110,45,101,110,118,105,114,111,110,109,101,
-110,116,99,2,83,73,108,111,97,100,45,114,101,108,97,116,105,118,101,100,2,
-83,75,108,101,116,114,101,99,45,115,121,110,116,97,120,101,115,101,2,31,2,
-4,2,2,2,14,2,31,1,27,112,97,116,104,45,108,105,115,116,45,115,116,
-114,105,110,103,45,62,112,97,116,104,45,108,105,115,116,102,2,83,2,9,2,
-30,71,105,100,101,110,116,105,102,105,101,114,63,103,2,44,72,112,97,114,97,
-109,101,116,101,114,105,122,101,104,2,32,1,20,103,101,110,101,114,97,116,101,
-45,116,101,109,112,111,114,97,114,105,101,115,105,70,35,37,119,105,116,104,45,
-115,116,120,106,2,6,2,29,67,108,111,97,100,47,99,100,107,2,83,1,25,
-99,117,114,114,101,110,116,45,108,111,97,100,47,117,115,101,45,99,111,109,112,
-105,108,101,100,108,2,83,2,7,2,29,77,117,110,115,121,110,116,97,120,45,
-115,112,108,105,99,105,110,103,109,67,35,37,113,113,115,116,120,110,64,119,104,
-101,110,111,2,96,72,108,101,116,45,115,121,110,116,97,120,101,115,112,2,31,
-1,26,99,97,108,108,45,119,105,116,104,45,112,97,114,97,109,101,116,101,114,
-105,122,97,116,105,111,110,113,2,32,66,117,110,108,101,115,115,114,2,96,71,
-115,101,116,33,45,118,97,108,117,101,115,115,2,32,72,115,121,110,116,97,120,
-45,114,117,108,101,115,116,2,31,70,108,101,116,45,115,116,114,117,99,116,117,
-2,32,2,18,2,33,75,115,121,110,116,97,120,45,105,100,45,114,117,108,101,
-115,118,2,31,1,20,35,37,112,108,97,105,110,45,109,111,100,117,108,101,45,
-98,101,103,105,110,119,158,2,28,2,89,69,102,108,117,105,100,45,108,101,116,
-120,2,32,66,115,121,110,116,97,120,121,2,68,1,25,115,99,104,101,109,101,
-45,114,101,112,111,114,116,45,101,110,118,105,114,111,110,109,101,110,116,122,2,
-83,71,115,121,110,116,97,120,45,99,97,115,101,123,2,65,66,108,101,116,47,
-99,99,124,2,32,71,99,104,97,110,110,101,108,45,112,117,116,125,2,83,73,
-119,105,116,104,45,104,97,110,100,108,101,114,115,126,2,32,68,117,110,115,121,
-110,116,97,120,127,2,110,2,27,2,32,1,26,99,104,101,99,107,45,100,117,
-112,108,105,99,97,116,101,45,105,100,101,110,116,105,102,105,101,114,128,2,31,
-70,115,121,110,116,97,120,47,108,111,99,129,2,65,71,113,117,97,115,105,115,
-121,110,116,97,120,130,2,110,66,108,101,116,47,101,99,131,2,96,64,116,105,
-109,101,132,2,32,1,24,99,117,114,114,101,110,116,45,112,97,114,97,109,101,
-116,101,114,105,122,97,116,105,111,110,133,2,32,72,115,121,110,116,97,120,45,
-99,97,115,101,42,134,2,65,77,108,111,97,100,47,117,115,101,45,99,111,109,
-112,105,108,101,100,135,2,83,69,103,117,97,114,100,45,101,118,116,136,2,83,
-1,30,99,117,114,114,101,110,116,45,98,114,101,97,107,45,112,97,114,97,109,
-101,116,101,114,105,122,97,116,105,111,110,137,2,32,75,113,117,97,115,105,115,
-121,110,116,97,120,47,108,111,99,138,2,110,79,112,97,116,104,45,114,101,112,
-108,97,99,101,45,115,117,102,102,105,120,139,2,83,65,112,111,114,116,63,140,
-2,83,2,8,2,2,65,102,111,114,99,101,141,2,32,2,16,2,32,75,99,
-104,97,110,110,101,108,45,116,114,121,45,103,101,116,142,2,83,71,119,105,116,
-104,45,115,121,110,116,97,120,143,2,106,1,20,114,101,97,100,45,101,118,97,
-108,45,112,114,105,110,116,45,108,111,111,112,144,2,83,71,99,104,97,110,110,
-101,108,45,103,101,116,145,2,83,2,17,2,29,2,22,2,32,76,110,117,108,
-108,45,101,110,118,105,114,111,110,109,101,110,116,146,2,83,1,23,108,111,97,
+2,13,2,31,1,20,102,105,110,100,45,101,120,101,99,117,116,97,98,108,101,
+45,112,97,116,104,82,66,35,37,109,105,115,99,83,76,110,111,114,109,97,108,
+45,99,97,115,101,45,112,97,116,104,84,2,83,1,24,99,117,114,114,101,110,
+116,45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,85,2,32,
+75,99,111,108,108,101,99,116,105,111,110,45,112,97,116,104,86,2,83,78,112,
+97,114,97,109,101,116,101,114,105,122,101,45,98,114,101,97,107,87,2,32,77,
+100,101,102,105,110,101,45,102,111,114,45,115,121,110,116,97,120,88,2,33,1,
+26,99,97,108,108,45,119,105,116,104,45,112,97,114,97,109,101,116,101,114,105,
+122,97,116,105,111,110,89,2,32,74,35,37,109,111,100,117,108,101,45,98,101,
+103,105,110,90,158,72,35,37,115,116,120,109,122,45,98,111,100,121,91,1,28,
+109,122,115,99,104,101,109,101,45,105,110,45,115,116,120,45,109,111,100,117,108,
+101,45,98,101,103,105,110,92,72,112,97,116,104,45,115,116,114,105,110,103,63,
+93,2,83,71,114,97,116,105,111,110,97,108,105,122,101,94,2,83,73,100,101,
+102,105,110,101,45,115,116,114,117,99,116,95,74,35,37,100,101,102,105,110,101,
+45,101,116,45,97,108,96,76,98,101,103,105,110,45,102,111,114,45,115,121,110,
+116,97,120,97,2,33,79,109,101,109,111,114,121,45,116,114,97,99,101,45,108,
+97,109,98,100,97,98,2,83,1,30,99,117,114,114,101,110,116,45,98,114,101,
+97,107,45,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,99,2,
+32,1,23,105,110,116,101,114,97,99,116,105,111,110,45,101,110,118,105,114,111,
+110,109,101,110,116,100,2,83,73,108,111,97,100,45,114,101,108,97,116,105,118,
+101,101,2,83,75,108,101,116,114,101,99,45,115,121,110,116,97,120,101,115,102,
+2,31,2,4,2,2,2,14,2,31,1,29,102,105,110,100,45,108,105,98,114,
+97,114,121,45,99,111,108,108,101,99,116,105,111,110,45,112,97,116,104,115,103,
+2,83,2,9,2,30,71,105,100,101,110,116,105,102,105,101,114,63,104,2,44,
+72,112,97,114,97,109,101,116,101,114,105,122,101,105,2,32,1,20,103,101,110,
+101,114,97,116,101,45,116,101,109,112,111,114,97,114,105,101,115,106,70,35,37,
+119,105,116,104,45,115,116,120,107,2,6,2,29,67,108,111,97,100,47,99,100,
+108,2,83,2,7,2,29,77,117,110,115,121,110,116,97,120,45,115,112,108,105,
+99,105,110,103,109,67,35,37,113,113,115,116,120,110,64,119,104,101,110,111,2,
+96,72,108,101,116,45,115,121,110,116,97,120,101,115,112,2,31,66,117,110,108,
+101,115,115,113,2,96,71,115,101,116,33,45,118,97,108,117,101,115,114,2,32,
+72,115,121,110,116,97,120,45,114,117,108,101,115,115,2,31,70,108,101,116,45,
+115,116,114,117,99,116,116,2,32,2,18,2,33,75,115,121,110,116,97,120,45,
+105,100,45,114,117,108,101,115,117,2,31,1,20,35,37,112,108,97,105,110,45,
+109,111,100,117,108,101,45,98,101,103,105,110,118,158,2,28,2,90,69,102,108,
+117,105,100,45,108,101,116,119,2,32,66,115,121,110,116,97,120,120,2,68,71,
+115,121,110,116,97,120,45,99,97,115,101,121,2,65,66,108,101,116,47,99,99,
+122,2,32,1,27,112,97,116,104,45,108,105,115,116,45,115,116,114,105,110,103,
+45,62,112,97,116,104,45,108,105,115,116,123,2,83,71,99,104,97,110,110,101,
+108,45,112,117,116,124,2,83,73,119,105,116,104,45,104,97,110,100,108,101,114,
+115,125,2,32,68,117,110,115,121,110,116,97,120,126,2,110,2,27,2,32,1,
+32,99,97,108,108,45,119,105,116,104,45,98,114,101,97,107,45,112,97,114,97,
+109,101,116,101,114,105,122,97,116,105,111,110,127,2,32,1,25,99,117,114,114,
+101,110,116,45,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,
+128,2,83,70,115,121,110,116,97,120,47,108,111,99,129,2,65,71,113,117,97,
+115,105,115,121,110,116,97,120,130,2,110,66,108,101,116,47,101,99,131,2,96,
+64,116,105,109,101,132,2,32,72,115,121,110,116,97,120,45,99,97,115,101,42,
+133,2,65,77,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,
+134,2,83,69,103,117,97,114,100,45,101,118,116,135,2,83,75,99,104,97,110,
+110,101,108,45,116,114,121,45,103,101,116,136,2,83,75,113,117,97,115,105,115,
+121,110,116,97,120,47,108,111,99,137,2,110,79,112,97,116,104,45,114,101,112,
+108,97,99,101,45,115,117,102,102,105,120,138,2,83,65,112,111,114,116,63,139,
+2,83,1,25,115,99,104,101,109,101,45,114,101,112,111,114,116,45,101,110,118,
+105,114,111,110,109,101,110,116,140,2,83,2,8,2,2,2,16,2,32,76,110,
+117,108,108,45,101,110,118,105,114,111,110,109,101,110,116,141,2,83,71,119,105,
+116,104,45,115,121,110,116,97,120,142,2,107,1,20,114,101,97,100,45,101,118,
+97,108,45,112,114,105,110,116,45,108,111,111,112,143,2,83,71,99,104,97,110,
+110,101,108,45,103,101,116,144,2,83,2,17,2,29,2,22,2,32,65,102,111,
+114,99,101,145,2,32,1,26,99,104,101,99,107,45,100,117,112,108,105,99,97,
+116,101,45,105,100,101,110,116,105,102,105,101,114,146,2,31,1,23,108,111,97,
 100,45,114,101,108,97,116,105,118,101,45,101,120,116,101,110,115,105,111,110,147,
 2,83,68,112,114,111,109,105,115,101,63,148,2,32,2,21,2,33,97,43,10,
-33,11,16,146,2,81,2,32,2,82,2,83,2,13,2,31,2,84,2,83,2,
-85,2,83,2,86,2,83,2,87,2,32,2,88,2,33,2,89,158,2,90,2,
-91,2,92,2,32,2,93,2,83,2,94,2,83,2,95,2,96,2,97,2,33,
-2,98,2,83,2,99,2,83,2,100,2,83,2,101,2,31,2,14,2,31,2,
-102,2,83,2,9,2,30,2,103,2,44,2,104,2,32,2,105,2,106,2,6,
-2,29,2,107,2,83,2,108,2,83,2,7,2,29,2,109,2,110,2,111,2,
-96,2,112,2,31,2,113,2,32,2,114,2,96,2,115,2,32,2,116,2,31,
-2,117,2,32,2,18,2,33,2,118,2,31,2,119,158,2,28,2,89,2,120,
-2,32,2,121,2,68,2,122,2,83,2,123,2,65,2,124,2,32,2,125,2,
-83,2,126,2,32,2,127,2,110,2,27,2,32,2,128,2,31,2,129,2,65,
-2,130,2,110,2,131,2,96,2,132,2,32,2,133,2,32,2,134,2,65,2,
-135,2,83,2,136,2,83,2,137,2,32,2,138,2,110,2,139,2,83,2,140,
-2,83,2,141,2,32,2,16,2,32,2,142,2,83,2,143,2,106,2,144,2,
-83,2,145,2,83,2,17,2,29,2,22,2,32,2,146,2,83,2,147,2,83,
+33,11,16,146,2,81,2,32,2,13,2,31,2,82,2,83,2,84,2,83,2,
+85,2,32,2,86,2,83,2,87,2,32,2,88,2,33,2,89,2,32,2,90,
+158,2,91,2,92,2,93,2,83,2,94,2,83,2,95,2,96,2,97,2,33,
+2,98,2,83,2,99,2,32,2,100,2,83,2,101,2,83,2,102,2,31,2,
+14,2,31,2,103,2,83,2,9,2,30,2,104,2,44,2,105,2,32,2,106,
+2,107,2,6,2,29,2,108,2,83,2,7,2,29,2,109,2,110,2,111,2,
+96,2,112,2,31,2,113,2,96,2,114,2,32,2,115,2,31,2,116,2,32,
+2,18,2,33,2,117,2,31,2,118,158,2,28,2,90,2,119,2,32,2,120,
+2,68,2,121,2,65,2,122,2,32,2,123,2,83,2,124,2,83,2,125,2,
+32,2,126,2,110,2,27,2,32,2,127,2,32,2,128,2,83,2,129,2,65,
+2,130,2,110,2,131,2,96,2,132,2,32,2,133,2,65,2,134,2,83,2,
+135,2,83,2,136,2,83,2,137,2,110,2,138,2,83,2,139,2,83,2,140,
+2,83,2,16,2,32,2,141,2,83,2,142,2,107,2,143,2,83,2,144,2,
+83,2,17,2,29,2,22,2,32,2,145,2,32,2,146,2,31,2,147,2,83,
 2,148,2,32,2,21,2,33,96,42,8,254,1,11,16,0,16,8,41,11,3,
 1,4,103,53,53,53,149,3,1,4,103,53,53,54,150,3,1,4,103,53,53,
 55,151,3,1,7,101,110,118,52,52,49,51,152,2,152,2,152,16,8,40,11,
@@ -4453,22 +4453,22 @@
 10,52,11,2,39,2,35,2,37,2,38,3,1,7,101,110,118,52,52,52,57,
 164,2,164,2,164,2,164,18,158,2,154,54,18,158,2,10,54,18,158,2,154,
 54,18,16,2,106,93,16,2,158,2,4,54,9,8,33,97,8,32,10,32,11,
-16,58,2,121,29,165,11,11,71,115,116,120,45,118,101,99,116,111,114,63,166,
+16,58,2,120,29,165,11,11,71,115,116,120,45,118,101,99,116,111,114,63,166,
 2,44,2,6,2,29,2,49,2,44,74,115,116,120,45,118,101,99,116,111,114,
 45,114,101,102,167,2,44,73,115,121,110,116,97,120,45,99,97,115,101,42,42,
 168,2,165,2,51,2,44,2,61,2,44,2,7,2,29,2,47,2,44,71,115,
 116,120,45,114,111,116,97,116,101,42,169,2,44,2,63,2,44,74,115,112,108,
 105,116,45,115,116,120,45,108,105,115,116,170,2,44,67,45,100,101,102,105,110,
 101,171,2,96,74,45,100,101,102,105,110,101,45,115,121,110,116,97,120,172,2,
-96,2,9,2,30,2,103,2,44,2,69,2,165,2,95,2,96,69,115,116,120,
+96,2,9,2,30,2,104,2,44,2,69,2,165,2,95,2,96,69,115,116,120,
 45,110,117,108,108,63,173,2,44,2,17,2,29,2,57,2,44,2,111,2,96,
-2,114,2,96,2,53,2,44,2,131,2,96,2,55,2,44,2,59,2,44,2,
+2,113,2,96,2,53,2,44,2,131,2,96,2,55,2,44,2,59,2,44,2,
 45,2,44,97,8,31,10,33,11,16,70,2,166,2,44,2,6,2,29,2,49,
 2,44,2,167,2,44,74,103,101,116,45,109,97,116,99,104,45,118,97,114,115,
 174,64,35,37,115,99,175,2,51,2,44,2,61,2,44,2,7,2,29,2,47,
 2,44,72,110,111,45,101,108,108,105,112,115,101,115,63,176,2,175,2,169,2,
 44,2,63,2,44,2,170,2,44,72,115,116,120,45,109,101,109,113,45,112,111,
-115,177,2,175,2,171,2,96,2,172,2,96,2,9,2,30,2,103,2,44,74,
+115,177,2,175,2,171,2,96,2,172,2,96,2,9,2,30,2,104,2,44,74,
 109,97,107,101,45,109,97,116,99,104,38,101,110,118,178,2,175,2,95,2,96,
 2,173,2,44,2,17,2,29,79,109,97,107,101,45,115,121,110,116,97,120,45,
 109,97,112,112,105,110,103,179,2,175,1,20,115,121,110,116,97,120,45,109,97,
@@ -4476,7 +4476,7 @@
 107,101,45,112,101,120,112,97,110,100,181,2,175,2,111,2,96,75,115,121,110,
 116,97,120,45,109,97,112,112,105,110,103,63,182,2,175,1,21,115,121,110,116,
 97,120,45,109,97,112,112,105,110,103,45,118,97,108,118,97,114,183,2,175,2,
-114,2,96,2,53,2,44,2,131,2,96,2,55,2,44,2,59,2,44,2,45,
+113,2,96,2,53,2,44,2,131,2,96,2,55,2,44,2,59,2,44,2,45,
 2,44,96,8,30,8,254,1,11,16,0,16,4,8,29,11,61,120,184,3,1,
 6,101,110,118,51,56,48,185,16,4,8,28,11,68,104,101,114,101,45,115,116,
 120,186,3,1,6,101,110,118,51,56,50,187,16,4,59,11,2,186,2,187,13,
@@ -4507,7 +4507,7 @@
     EVAL_ONE_SIZED_STR((char *)expr, 6009);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,5,93,159,32,20,97,158,16,1,20,23,65,98,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,5,93,159,32,20,97,158,16,1,20,23,65,98,
 101,103,105,110,0,16,0,83,160,40,80,158,32,32,32,18,158,94,96,67,114,
 101,113,117,105,114,101,1,34,10,11,158,95,158,64,111,110,108,121,2,34,158,
 68,109,122,115,99,104,101,109,101,3,34,158,1,22,110,97,109,101,115,112,97,
@@ -4515,14 +4515,14 @@
     EVAL_ONE_SIZED_STR((char *)expr, 103);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,3,73,159,33,20,97,158,16,1,20,23,65,98,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,3,73,159,33,20,97,158,16,1,20,23,65,98,
 101,103,105,110,0,16,0,87,94,248,22,240,68,109,122,115,99,104,101,109,101,
 1,83,160,40,80,158,32,32,33,18,158,94,96,78,114,101,113,117,105,114,101,
 45,102,111,114,45,115,121,110,116,97,120,2,34,10,11,158,2,1,34,34,0};
     EVAL_ONE_SIZED_STR((char *)expr, 83);
   }
   {
-    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,54,2,66,159,36,20,97,158,16,0,16,0,248,22,
+    static MZCOMPILED_STRING_FAR unsigned char expr[] = {35,126,5,51,48,49,46,55,2,66,159,36,20,97,158,16,0,16,0,248,22,
 232,248,249,22,234,66,35,37,109,105,115,99,0,1,34,109,97,107,101,45,115,
 116,97,110,100,97,114,100,45,109,111,100,117,108,101,45,110,97,109,101,45,114,
 101,115,111,108,118,101,114,1,247,22,252,204,2,0};
diff --git a/src/mzscheme/src/error.c b/src/mzscheme/src/error.c
index b07fa7072c..6a0d63b29e 100644
--- a/src/mzscheme/src/error.c
+++ b/src/mzscheme/src/error.c
@@ -988,6 +988,9 @@ void scheme_wrong_count_m(const char *name, int minc, int maxc,
   if (!argc || !minc)
     is_method = 0;
 
+  if (maxc > SCHEME_MAX_ARGS)
+    maxc = -1;
+
   s = make_arity_expect_string(name, -1, minc, maxc, argc, argv, &len, is_method);
 
   scheme_raise_exn(MZEXN_FAIL_CONTRACT_ARITY, "%t", s, len);
@@ -1028,7 +1031,15 @@ char *scheme_make_arity_expect_string(Scheme_Object *proc,
   if (SCHEME_PRIMP(proc)) {
     name = ((Scheme_Primitive_Proc *)proc)->name;
     mina = ((Scheme_Primitive_Proc *)proc)->mina;
-    maxa = ((Scheme_Primitive_Proc *)proc)->maxa;
+    if (mina < 0) {
+      /* set min1 to -2 to indicates cases */
+      mina = -2;
+      maxa = 0;
+    } else {
+      maxa = ((Scheme_Primitive_Proc *)proc)->mu.maxa;
+      if (maxa > SCHEME_MAX_ARGS)
+	maxa = -1;
+    }
   } else if (SCHEME_CLSD_PRIMP(proc)) {
     name = ((Scheme_Closed_Primitive_Proc *)proc)->name;
     mina = ((Scheme_Closed_Primitive_Proc *)proc)->mina;
diff --git a/src/mzscheme/src/eval.c b/src/mzscheme/src/eval.c
index 0977ad5e1d..c873921c2c 100644
--- a/src/mzscheme/src/eval.c
+++ b/src/mzscheme/src/eval.c
@@ -3647,9 +3647,9 @@ static Scheme_Object *do_apply_known_k(void)
 
   p->ku.k.p2 = NULL;
 
-  return _scheme_apply_known_closed_prim_multi((Scheme_Object *)p->ku.k.p1, 
-					       p->ku.k.i1, 
-					       argv);
+  return _scheme_apply_known_prim_closure_multi((Scheme_Object *)p->ku.k.p1, 
+						p->ku.k.i1, 
+						argv);
 }
 
 #if 0
@@ -3665,36 +3665,36 @@ static Scheme_Object *do_apply_known_k(void)
 # define DEBUG_CHECK_TYPE(v) /**/
 #endif
 
-Scheme_Object *_scheme_apply_known_closed_prim_multi(Scheme_Object *rator,
-						     int argc,
-						     Scheme_Object **argv)
+Scheme_Object *_scheme_apply_known_prim_closure_multi(Scheme_Object *rator,
+						      int argc,
+						      Scheme_Object **argv)
 {
 #define PRIM_CHECK_ARITY 0
 #define PRIM_CHECK_MULTI 0
 #include "schapp.inc"
 }
 
-Scheme_Object *_scheme_apply_closed_prim_multi(Scheme_Object *rator,
-					       int argc,
-					       Scheme_Object **argv)
+Scheme_Object *_scheme_apply_prim_closure_multi(Scheme_Object *rator,
+						int argc,
+						Scheme_Object **argv)
 {
 #define PRIM_CHECK_ARITY 1
 #define PRIM_CHECK_MULTI 0
 #include "schapp.inc"
 }
 
-Scheme_Object *_scheme_apply_known_closed_prim(Scheme_Object *rator,
-					       int argc,
-					       Scheme_Object **argv)
+Scheme_Object *_scheme_apply_known_prim_closure(Scheme_Object *rator,
+						int argc,
+						Scheme_Object **argv)
 {
 #define PRIM_CHECK_ARITY 0
 #define PRIM_CHECK_MULTI 1
 #include "schapp.inc"
 }
 
-Scheme_Object *_scheme_apply_closed_prim(Scheme_Object *rator,
-					 int argc,
-					 Scheme_Object **argv)
+Scheme_Object *_scheme_apply_prim_closure(Scheme_Object *rator,
+					  int argc,
+					  Scheme_Object **argv)
 {
 #define PRIM_CHECK_ARITY 1
 #define PRIM_CHECK_MULTI 1
@@ -3909,6 +3909,7 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
 
     if (type == scheme_prim_type) {
       GC_CAN_IGNORE Scheme_Primitive_Proc *prim;
+      GC_CAN_IGNORE Scheme_Primitive_Closure_Proc *f;
       
 #define VACATE_TAIL_BUFFER_USE_RUNSTACK() \
       if (rands == p->tail_buffer) {                                \
@@ -3936,14 +3937,15 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
       prim = (Scheme_Primitive_Proc *)obj;
 
       if (num_rands < prim->mina 
-	  || (num_rands > prim->maxa && prim->maxa >= 0)) {
-	scheme_wrong_count_m(prim->name, prim->mina, prim->maxa,
+	  || (num_rands > prim->mu.maxa && prim->mina >= 0)) {
+	scheme_wrong_count_m(prim->name, prim->mina, prim->mu.maxa,
 			     num_rands, rands,
 			     prim->pp.flags & SCHEME_PRIM_IS_METHOD);
 	return NULL; /* Shouldn't get here */
       }
 
-      v = prim->prim_val(num_rands, rands);
+      f = prim->prim_val;
+      v = f(num_rands, rands, (Scheme_Object *)prim);
 
       DEBUG_CHECK_TYPE(v);
     } else if (type == scheme_closure_type) {
@@ -4128,28 +4130,6 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
       }
 
       goto eval_top;
-    } else if (type == scheme_closed_prim_type) {
-      GC_CAN_IGNORE Scheme_Closed_Primitive_Proc *prim;
-      
-      DO_CHECK_FOR_BREAK(p, UPDATE_THREAD_RSPTR_FOR_GC(); if (rands == p->tail_buffer) make_tail_buffer_safe(););
-
-      VACATE_TAIL_BUFFER_USE_RUNSTACK();
-
-      UPDATE_THREAD_RSPTR();
-
-      prim = (Scheme_Closed_Primitive_Proc *)obj;
-      
-      if (num_rands < prim->mina 
-	  || (num_rands > prim->maxa && prim->maxa >= 0)) {
-	scheme_wrong_count_m(prim->name, prim->mina, prim->maxa, 
-			     num_rands, rands,
-			     prim->pp.flags & SCHEME_PRIM_IS_METHOD);
-	return NULL; /* Shouldn't get here */
-      }
-      
-      v = prim->prim_val(prim->data, num_rands, rands);
-
-      DEBUG_CHECK_TYPE(v);
     } else if (type == scheme_case_closure_type) {
       Scheme_Case_Lambda *seq;
       Scheme_Closure_Data *data;
@@ -4361,6 +4341,28 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands,
       DO_CHECK_FOR_BREAK(p, UPDATE_THREAD_RSPTR_FOR_GC(); if (rands == p->tail_buffer) make_tail_buffer_safe(););
 
       goto apply_top;
+    } else if (type == scheme_closed_prim_type) {
+      GC_CAN_IGNORE Scheme_Closed_Primitive_Proc *prim;
+      
+      DO_CHECK_FOR_BREAK(p, UPDATE_THREAD_RSPTR_FOR_GC(); if (rands == p->tail_buffer) make_tail_buffer_safe(););
+
+      VACATE_TAIL_BUFFER_USE_RUNSTACK();
+
+      UPDATE_THREAD_RSPTR();
+
+      prim = (Scheme_Closed_Primitive_Proc *)obj;
+      
+      if (num_rands < prim->mina 
+	  || (num_rands > prim->maxa && prim->maxa >= 0)) {
+	scheme_wrong_count_m(prim->name, prim->mina, prim->maxa, 
+			     num_rands, rands,
+			     prim->pp.flags & SCHEME_PRIM_IS_METHOD);
+	return NULL; /* Shouldn't get here */
+      }
+      
+      v = prim->prim_val(prim->data, num_rands, rands);
+
+      DEBUG_CHECK_TYPE(v);
     } else {
       UPDATE_THREAD_RSPTR_FOR_ERROR();
       if (rands == p->tail_buffer)
diff --git a/src/mzscheme/src/fun.c b/src/mzscheme/src/fun.c
index d308c5d7d8..7b6ee549b3 100644
--- a/src/mzscheme/src/fun.c
+++ b/src/mzscheme/src/fun.c
@@ -436,6 +436,57 @@ scheme_make_void (void)
 /*                          primitive procedures                          */
 /*========================================================================*/
 
+static Scheme_Object *
+make_prim_closure(Scheme_Prim *fun, int eternal,
+		  const char *name,
+		  mzshort mina, mzshort maxa,
+		  int flags,
+		  mzshort minr, mzshort maxr,
+		  int closed, int count, Scheme_Object **vals)
+{
+  Scheme_Primitive_Proc *prim;
+  int hasr, size;
+
+  hasr = ((minr != 1) || (maxr != 1));
+  size = (hasr 
+	  ? sizeof(Scheme_Prim_W_Result_Arity) 
+	  : (closed
+	     ? (sizeof(Scheme_Primitive_Closure)
+		+ ((count - 1) * sizeof(Scheme_Object *)))
+	     : sizeof(Scheme_Primitive_Proc)));
+
+  if (eternal && scheme_starting_up && !closed)
+    prim = (Scheme_Primitive_Proc *)scheme_malloc_eternal_tagged(size);
+  else
+    prim = (Scheme_Primitive_Proc *)scheme_malloc_tagged(size);
+  prim->pp.so.type = scheme_prim_type;
+  prim->prim_val = (Scheme_Primitive_Closure_Proc *)fun;
+  prim->name = name;
+  prim->mina = mina;
+  if (maxa < 0)
+    maxa = SCHEME_MAX_ARGS + 1;
+  prim->mu.maxa = maxa;
+  prim->pp.flags = (flags
+		    | (scheme_defining_primitives ? SCHEME_PRIM_IS_PRIMITIVE : 0)
+		    | (hasr ? SCHEME_PRIM_IS_MULTI_RESULT : 0)
+		    | (closed ? SCHEME_PRIM_IS_CLOSURE : 0));
+
+  if (hasr) {
+    ((Scheme_Prim_W_Result_Arity *)prim)->minr = minr;
+    ((Scheme_Prim_W_Result_Arity *)prim)->maxr = maxr;
+  }
+  if (closed) {
+#ifdef MZ_PRECISE_GC
+    ((Scheme_Primitive_Closure *)prim)->count = count;
+#endif
+    memcpy(((Scheme_Primitive_Closure *)prim)->val,
+	   vals,
+	   count * sizeof(Scheme_Object *));
+  }
+
+  return (Scheme_Object *)prim;
+}
+
 Scheme_Object *
 scheme_make_prim_w_everything(Scheme_Prim *fun, int eternal,
 			      const char *name,
@@ -443,49 +494,33 @@ scheme_make_prim_w_everything(Scheme_Prim *fun, int eternal,
 			      int flags,
 			      mzshort minr, mzshort maxr)
 {
-  Scheme_Primitive_Proc *prim;
-  int hasr, size;
-
-  hasr = ((minr != 1) || (maxr != 1));
-  size = hasr ? sizeof(Scheme_Prim_W_Result_Arity) : sizeof(Scheme_Primitive_Proc);
-
-  if (eternal && scheme_starting_up)
-    prim = (Scheme_Primitive_Proc *)scheme_malloc_eternal_tagged(size);
-  else
-    prim = (Scheme_Primitive_Proc *)scheme_malloc_tagged(size);
-  prim->pp.so.type = scheme_prim_type;
-  SCHEME_PRIM(prim) = fun;
-  prim->name = name;
-  prim->mina = mina;
-  prim->maxa = maxa;
-  prim->pp.flags = (flags
-		    | (scheme_defining_primitives ? SCHEME_PRIM_IS_PRIMITIVE : 0)
-		    | (hasr ? SCHEME_PRIM_IS_MULTI_RESULT : 0));
-
-  if (hasr) {
-    ((Scheme_Prim_W_Result_Arity *)prim)->minr = minr;
-    ((Scheme_Prim_W_Result_Arity *)prim)->maxr = maxr;
-  }
-
-  return (Scheme_Object *)prim;
+  return make_prim_closure(fun, eternal,
+			   name,
+			   mina, maxa,
+			   flags,
+			   minr, maxr,
+			   0, 0, NULL);
 }
 
 Scheme_Object *scheme_make_prim(Scheme_Prim *fun)
 {
-  return scheme_make_prim_w_everything(fun, 1, NULL, 0, -1, 0, 1, 1);
+  return make_prim_closure(fun, 1, NULL, 0, -1, 0, 1, 1,
+			   0, 0, NULL);
 }
 
 Scheme_Object *
 scheme_make_noneternal_prim (Scheme_Prim *fun)
 {
-  return scheme_make_prim_w_everything(fun, 0, NULL, 0, -1, 0, 1, 1);
+  return make_prim_closure(fun, 0, NULL, 0, -1, 0, 1, 1,
+			   0, 0, NULL);
 }
 
 Scheme_Object *
 scheme_make_prim_w_arity(Scheme_Prim *fun, const char *name,
 			 mzshort mina, mzshort maxa)
 {
-  return scheme_make_prim_w_everything(fun, 1, name, mina, maxa, 0, 1, 1);
+  return make_prim_closure(fun, 1, name, mina, maxa, 0, 1, 1,
+			   0, 0, NULL);
 }
 
 Scheme_Object *
@@ -493,12 +528,13 @@ scheme_make_folding_prim(Scheme_Prim *fun, const char *name,
 			 mzshort mina, mzshort maxa,
 			 short folding)
 {
-  return scheme_make_prim_w_everything(fun, 1, name, mina, maxa,
-				       (folding 
-					? (SCHEME_PRIM_IS_FOLDING
-					   | SCHEME_PRIM_IS_NONCM)
-					: 0),
-				       1, 1);
+  return make_prim_closure(fun, 1, name, mina, maxa,
+			   (folding 
+			    ? (SCHEME_PRIM_IS_FOLDING
+			       | SCHEME_PRIM_IS_NONCM)
+			    : 0),
+			   1, 1,
+			   0, 0, NULL);
 }
 
 Scheme_Object *
@@ -506,17 +542,44 @@ scheme_make_noncm_prim(Scheme_Prim *fun, const char *name,
 		       mzshort mina, mzshort maxa)
 {
   /* A non-cm primitive leaves the mark stack unchanged when it returns,
-     and it can't return multiple values. */
-  return scheme_make_prim_w_everything(fun, 1, name, mina, maxa,
-				       SCHEME_PRIM_IS_NONCM,
-				       1, 1);
+     it can't return multiple values or a tail call, and it cannot
+     use its third argument (i.e., the closure pointer) */
+  return make_prim_closure(fun, 1, name, mina, maxa,
+			   SCHEME_PRIM_IS_NONCM,
+			   1, 1,
+			   0, 0, NULL);
 }
 
 Scheme_Object *
 scheme_make_noneternal_prim_w_arity(Scheme_Prim *fun, const char *name,
 				    mzshort mina, mzshort maxa)
 {
-  return scheme_make_prim_w_everything(fun, 0, name, mina, maxa, 0, 1, 1);
+  return make_prim_closure(fun, 0, name, mina, maxa, 0, 1, 1,
+			   0, 0, NULL);
+}
+
+Scheme_Object *scheme_make_prim_closure_w_arity(Scheme_Primitive_Closure_Proc *prim,
+						int size, Scheme_Object **vals,
+						const char *name,
+						mzshort mina, mzshort maxa)
+{
+  return make_prim_closure((Scheme_Prim *)prim, 1, name, mina, maxa, 0, 1, 1,
+			   1, size, vals);
+
+}
+
+Scheme_Object *scheme_make_folding_prim_closure(Scheme_Primitive_Closure_Proc *prim,
+						int size, Scheme_Object **vals,
+						const char *name,
+						mzshort mina, mzshort maxa,
+						short functional)
+{
+  return make_prim_closure((Scheme_Prim *)prim, 1, name, mina, maxa,
+			   (functional
+			    ? SCHEME_PRIM_IS_FOLDING
+			    : 0),
+			   1, 1,
+			   1, size, vals);
 }
 
 Scheme_Object *
@@ -1716,77 +1779,28 @@ Scheme_Object *scheme_get_or_check_arity(Scheme_Object *p, long a)
 {
   Scheme_Type type;
   mzshort mina, maxa;
-  int drop = 0;
+  int drop = 0, cases_count = 0;
+  mzshort *cases = NULL;
 
  top:
 
   type = SCHEME_TYPE(p);
   if (type == scheme_prim_type) {
     mina = ((Scheme_Primitive_Proc *)p)->mina;
-    maxa = ((Scheme_Primitive_Proc *)p)->maxa;
+    maxa = ((Scheme_Primitive_Proc *)p)->mu.maxa;
+    if (mina < 0) {
+      cases = ((Scheme_Primitive_Proc *)p)->mu.cases;
+      cases_count = -(mina + 1);
+    } else {
+      if (maxa > SCHEME_MAX_ARGS)
+	maxa = -1;
+    }
   } else if (type == scheme_closed_prim_type) {
     mina = ((Scheme_Closed_Primitive_Proc *)p)->mina;
     maxa = ((Scheme_Closed_Primitive_Proc *)p)->maxa;
-
     if (mina == -2) {
-      mzshort *cases = ((Scheme_Closed_Case_Primitive_Proc *)p)->cases;
-      int count = -maxa, i;
-
-      if (a == -1) {
-	Scheme_Object *arity, *a, *last = NULL;
-
-	arity = scheme_alloc_list(count);
-
-	for (i = 0, a = arity; i < count; i++) {
-	  Scheme_Object *av;
-	  int mn, mx;
-	  mn = cases[2 * i];
-	  mx = cases[(2 * i) + 1];
-
-	  if (mn >= drop) {
-	    mn -= drop;
-	    if (mx > 0)
-	      mx -= drop;
-
-	    av = scheme_make_arity(mn, mx);
-
-	    SCHEME_CAR(a) = av;
-	    last = a;
-	    a = SCHEME_CDR(a);
-	  }
-	}
-
-	/* If drop > 0, might have found no matches */
-	if (!SCHEME_NULLP(a)) {
-	  if (last)
-	    SCHEME_CDR(last) = scheme_null;
-	  else
-	    arity = scheme_null;
-	}
-
-	return arity;
-      }
-
-      if (a == -2) {
-	for (i = 0; i < count; i++) {
-	  if (cases[(2 * i) + 1] < 0)
-	    return scheme_true;
-	}
-
-	return scheme_false;
-      }
-
-      a += drop;
-
-      for (i = 0; i < count; i++) {
-	int na, xa;
-	na = cases[2 * i];
-	xa = cases[(2 * i) + 1];
-	if ((a >= na) && ((xa < 0) || (a <= xa)))
-	  return scheme_true;
-      }
-
-      return scheme_false;
+      cases_count = -maxa;
+      cases = ((Scheme_Closed_Case_Primitive_Proc *)p)->cases;
     }
   } else if (type == scheme_cont_type || type == scheme_escaping_cont_type) {
     mina = 0;
@@ -1953,6 +1967,66 @@ Scheme_Object *scheme_get_or_check_arity(Scheme_Object *p, long a)
     }
   }
 
+  if (cases) {
+    int count = cases_count, i;
+
+    if (a == -1) {
+      Scheme_Object *arity, *a, *last = NULL;
+
+      arity = scheme_alloc_list(count);
+
+      for (i = 0, a = arity; i < count; i++) {
+	Scheme_Object *av;
+	int mn, mx;
+	mn = cases[2 * i];
+	mx = cases[(2 * i) + 1];
+
+	if (mn >= drop) {
+	  mn -= drop;
+	  if (mx > 0)
+	    mx -= drop;
+
+	  av = scheme_make_arity(mn, mx);
+
+	  SCHEME_CAR(a) = av;
+	  last = a;
+	  a = SCHEME_CDR(a);
+	}
+      }
+
+      /* If drop > 0, might have found no matches */
+      if (!SCHEME_NULLP(a)) {
+	if (last)
+	  SCHEME_CDR(last) = scheme_null;
+	else
+	  arity = scheme_null;
+      }
+
+      return arity;
+    }
+
+    if (a == -2) {
+      for (i = 0; i < count; i++) {
+	if (cases[(2 * i) + 1] < 0)
+	  return scheme_true;
+      }
+
+      return scheme_false;
+    }
+
+    a += drop;
+
+    for (i = 0; i < count; i++) {
+      int na, xa;
+      na = cases[2 * i];
+      xa = cases[(2 * i) + 1];
+      if ((a >= na) && ((xa < 0) || (a <= xa)))
+	return scheme_true;
+    }
+
+    return scheme_false;
+  }
+
   if (a == -1) {
     if (mina < drop)
       return scheme_null;
diff --git a/src/mzscheme/src/jit.c b/src/mzscheme/src/jit.c
index 06b8ca6067..79600f82d5 100644
--- a/src/mzscheme/src/jit.c
+++ b/src/mzscheme/src/jit.c
@@ -922,7 +922,7 @@ static int generate_direct_prim_tail_call(mz_jit_state *jitter, int num_rands)
     JIT_UPDATE_THREAD_RSPTR();
   }
   jit_movi_i(JIT_R1, num_rands);
-  mz_prepare(2);
+  mz_prepare(2); /* a prim takes 3 args, but a NONCM prim ignores the 3rd */
   CHECK_LIMIT();
   jit_pusharg_p(JIT_RUNSTACK);
   jit_pusharg_i(JIT_R1);
@@ -1042,7 +1042,7 @@ static int generate_direct_prim_non_tail_call(mz_jit_state *jitter, int num_rand
   }
 
   jit_movi_i(JIT_R1, num_rands);
-  mz_prepare(2);
+  mz_prepare(2); /* a prim takes 3 args, but a NONCM prim ignores the 3rd */
   CHECK_LIMIT();
   jit_pusharg_p(JIT_RUNSTACK);
   jit_pusharg_i(JIT_R1);
@@ -1152,14 +1152,15 @@ static int generate_non_tail_call(mz_jit_state *jitter, int num_rands, int direc
     jit_ldxi_i(JIT_R0, JIT_V1, &((Scheme_Primitive_Proc *)0x0)->mina);
     ref7 = jit_bnei_i(jit_forward(), JIT_R0, num_rands);
     /* Fast prim application */
-    jit_ldxi_p(JIT_V1, JIT_V1, &((Scheme_Primitive_Proc *)0x0)->prim_val);
+    jit_ldxi_p(JIT_R1, JIT_V1, &((Scheme_Primitive_Proc *)0x0)->prim_val);
     if (need_set_rs) {
       JIT_UPDATE_THREAD_RSPTR();
     }
-    mz_prepare(2);
+    mz_prepare(3);
+    jit_pusharg_p(JIT_V1);
     jit_pusharg_p(JIT_RUNSTACK);
     jit_pusharg_i(JIT_R0);
-    (void)mz_finishr(JIT_V1);
+    (void)mz_finishr(JIT_R1);
     CHECK_LIMIT();
     jit_retval(JIT_R0);
     if (!multi_ok) {
@@ -1291,8 +1292,8 @@ static int generate_app(Scheme_App_Rec *app, Scheme_Object **alt_rands, int num_
 
   if (SCHEME_PRIMP(rator)) {
     if ((num_rands >= ((Scheme_Primitive_Proc *)rator)->mina)
-	&& ((num_rands <= ((Scheme_Primitive_Proc *)rator)->maxa)
-	    || (((Scheme_Primitive_Proc *)rator)->maxa < 0))
+	&& ((num_rands <= ((Scheme_Primitive_Proc *)rator)->mu.maxa)
+	    || (((Scheme_Primitive_Proc *)rator)->mina < 0))
 	&& is_noncm(rator))
       direct_prim = 1;
   } else {
@@ -2902,7 +2903,7 @@ static int generate(Scheme_Object *obj, mz_jit_state *jitter, int is_tail, int m
 #else
       int then_short_ok = 1;
 #endif
-	  START_JIT_DATA();
+      START_JIT_DATA();
 
 #ifdef MZ_USE_JIT_PPC
       /* It's possible that the code for a then
@@ -3663,8 +3664,15 @@ static int do_generate_common(mz_jit_state *jitter, void *_data)
   CHECK_LIMIT();
 
   /* *** stack_cache_pop_code *** */
+  /* DANGER: this code must save and restore (or avoid)
+     any registers that a function call would normally save 
+     and restore. JIT_AUX, which is used by things like jit_ldi,
+     is such a register for PPC. */
   stack_cache_pop_code = jit_get_ip().ptr;
   jit_movr_p(JIT_R0, JIT_RET);
+#ifdef MZ_USE_JIT_PPC
+  jit_movr_p(JIT_R(3), JIT_AUX);
+#endif
   /* Decrement stack_cache_stack_pos */
   jit_ldi_i(JIT_R1, &stack_cache_stack_pos);
   jit_subi_i(JIT_R2, JIT_R1, 1);
@@ -3676,6 +3684,9 @@ static int do_generate_common(mz_jit_state *jitter, void *_data)
   (void)jit_movi_p(JIT_R2, &stack_cache_stack);
   jit_ldxr_p(JIT_R2, JIT_R2, JIT_R1);
   jit_movr_p(JIT_RET, JIT_R0);
+#ifdef MZ_USE_JIT_PPC
+  jit_movr_p(JIT_AUX, JIT_R(3));
+#endif
   jit_jmpr(JIT_R2);
   CHECK_LIMIT();
 
diff --git a/src/mzscheme/src/mzmark.c b/src/mzscheme/src/mzmark.c
index fb2a4706d1..7f2d9ce6b5 100644
--- a/src/mzscheme/src/mzmark.c
+++ b/src/mzscheme/src/mzmark.c
@@ -650,31 +650,60 @@ static int prim_proc_SIZE(void *p) {
   Scheme_Primitive_Proc *prim = (Scheme_Primitive_Proc *)p;
 
   return
-  ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
-   ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
-   : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc)));
+  ((prim->pp.flags & SCHEME_PRIM_IS_CLOSURE)
+   ? (gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Closure))
+      + ((Scheme_Primitive_Closure *)prim)->count - 1)
+   : ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc))));
 }
 
 static int prim_proc_MARK(void *p) {
   Scheme_Primitive_Proc *prim = (Scheme_Primitive_Proc *)p;
 
   gcMARK(prim->name);
-
+  if (prim->mina < 0) {
+    gcMARK(prim->mu.cases);
+  }
+  if (prim->pp.flags & SCHEME_PRIM_IS_CLOSURE) {
+    Scheme_Primitive_Closure *cc = (Scheme_Primitive_Closure *)prim;
+    int i;
+    for (i = cc->count; i--; ) {
+      gcMARK(cc->val[i]);
+    }
+  }  
+  
   return
-  ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
-   ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
-   : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc)));
+  ((prim->pp.flags & SCHEME_PRIM_IS_CLOSURE)
+   ? (gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Closure))
+      + ((Scheme_Primitive_Closure *)prim)->count - 1)
+   : ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc))));
 }
 
 static int prim_proc_FIXUP(void *p) {
   Scheme_Primitive_Proc *prim = (Scheme_Primitive_Proc *)p;
 
   gcFIXUP(prim->name);
-
+  if (prim->mina < 0) {
+    gcFIXUP(prim->mu.cases);
+  }
+  if (prim->pp.flags & SCHEME_PRIM_IS_CLOSURE) {
+    Scheme_Primitive_Closure *cc = (Scheme_Primitive_Closure *)prim;
+    int i;
+    for (i = cc->count; i--; ) {
+      gcFIXUP(cc->val[i]);
+    }
+  }  
+  
   return
-  ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
-   ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
-   : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc)));
+  ((prim->pp.flags & SCHEME_PRIM_IS_CLOSURE)
+   ? (gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Closure))
+      + ((Scheme_Primitive_Closure *)prim)->count - 1)
+   : ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc))));
 }
 
 #define prim_proc_IS_ATOMIC 0
@@ -688,14 +717,8 @@ static int closed_prim_proc_SIZE(void *p) {
   ((c->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
    ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Prim_W_Result_Arity))
    : ((c->mina == -2)
-      ? ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Case_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc)))
-      : ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc)))));
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc))));
 }
 
 static int closed_prim_proc_MARK(void *p) {
@@ -703,23 +726,6 @@ static int closed_prim_proc_MARK(void *p) {
 
   gcMARK(c->name);
   gcMARK(SCHEME_CLSD_PRIM_DATA(c));
-  if (c->pp.flags & SCHEME_PRIM_IS_POST_DATA) {
-    if (c->mina == -2) {
-      Scheme_Closed_Case_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Case_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcMARK(cc->a[i]);
-      }
-    } else {
-      Scheme_Closed_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcMARK(cc->a[i]);
-      }
-    }
-  }
   if (c->mina == -2) {
     gcMARK(((Scheme_Closed_Case_Primitive_Proc *)c)->cases);
   }
@@ -728,14 +734,8 @@ static int closed_prim_proc_MARK(void *p) {
   ((c->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
    ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Prim_W_Result_Arity))
    : ((c->mina == -2)
-      ? ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Case_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc)))
-      : ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc)))));
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc))));
 }
 
 static int closed_prim_proc_FIXUP(void *p) {
@@ -743,23 +743,6 @@ static int closed_prim_proc_FIXUP(void *p) {
 
   gcFIXUP(c->name);
   gcFIXUP(SCHEME_CLSD_PRIM_DATA(c));
-  if (c->pp.flags & SCHEME_PRIM_IS_POST_DATA) {
-    if (c->mina == -2) {
-      Scheme_Closed_Case_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Case_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcFIXUP(cc->a[i]);
-      }
-    } else {
-      Scheme_Closed_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcFIXUP(cc->a[i]);
-      }
-    }
-  }
   if (c->mina == -2) {
     gcFIXUP(((Scheme_Closed_Case_Primitive_Proc *)c)->cases);
   }
@@ -768,14 +751,8 @@ static int closed_prim_proc_FIXUP(void *p) {
   ((c->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
    ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Prim_W_Result_Arity))
    : ((c->mina == -2)
-      ? ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Case_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc)))
-      : ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc)))));
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc))));
 }
 
 #define closed_prim_proc_IS_ATOMIC 0
diff --git a/src/mzscheme/src/mzmarksrc.c b/src/mzscheme/src/mzmarksrc.c
index 9960cee69c..a6cc85eb8f 100644
--- a/src/mzscheme/src/mzmarksrc.c
+++ b/src/mzscheme/src/mzmarksrc.c
@@ -244,11 +244,24 @@ prim_proc {
 
  mark:
   gcMARK(prim->name);
-
+  if (prim->mina < 0) {
+    gcMARK(prim->mu.cases);
+  }
+  if (prim->pp.flags & SCHEME_PRIM_IS_CLOSURE) {
+    Scheme_Primitive_Closure *cc = (Scheme_Primitive_Closure *)prim;
+    int i;
+    for (i = cc->count; i--; ) {
+      gcMARK(cc->val[i]);
+    }
+  }  
+  
  size:
-  ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
-   ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
-   : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc)));
+  ((prim->pp.flags & SCHEME_PRIM_IS_CLOSURE)
+   ? (gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Closure))
+      + ((Scheme_Primitive_Closure *)prim)->count - 1)
+   : ((prim->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Prim_W_Result_Arity))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Primitive_Proc))));
 }
 
 closed_prim_proc {
@@ -257,23 +270,6 @@ closed_prim_proc {
  mark:
   gcMARK(c->name);
   gcMARK(SCHEME_CLSD_PRIM_DATA(c));
-  if (c->pp.flags & SCHEME_PRIM_IS_POST_DATA) {
-    if (c->mina == -2) {
-      Scheme_Closed_Case_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Case_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcMARK(cc->a[i]);
-      }
-    } else {
-      Scheme_Closed_Primitive_Post_Ext_Proc *cc;
-      int i;
-      cc = (Scheme_Closed_Primitive_Post_Ext_Proc *)c;
-      for (i = cc->p.len; i--; ) {
-	gcMARK(cc->a[i]);
-      }
-    }
-  }
   if (c->mina == -2) {
     gcMARK(((Scheme_Closed_Case_Primitive_Proc *)c)->cases);
   }
@@ -282,14 +278,8 @@ closed_prim_proc {
   ((c->pp.flags & SCHEME_PRIM_IS_MULTI_RESULT)
    ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Prim_W_Result_Arity))
    : ((c->mina == -2)
-      ? ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Case_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc)))
-      : ((c->pp.flags & SCHEME_PRIM_IS_POST_DATA)
-	 ? (gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Post_Ext_Proc))
-	    + ((Scheme_Closed_Primitive_Post_Proc *)c)->len - 1)
-	 : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc)))));
+      ? gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Case_Primitive_Proc))
+      : gcBYTES_TO_WORDS(sizeof(Scheme_Closed_Primitive_Proc))));
 }
 
 scm_closure {
diff --git a/src/mzscheme/src/schapp.inc b/src/mzscheme/src/schapp.inc
index 6409e768fc..5177486a3e 100644
--- a/src/mzscheme/src/schapp.inc
+++ b/src/mzscheme/src/schapp.inc
@@ -1,8 +1,9 @@
 
   MZ_MARK_STACK_TYPE old_cont_mark_stack;
-  Scheme_Object *v;
-  Scheme_Closed_Primitive_Proc *prim;
-  Scheme_Thread *p = scheme_current_thread;
+  GC_CAN_IGNORE Scheme_Object *v;
+  GC_CAN_IGNORE Scheme_Primitive_Closure *prim;
+  GC_CAN_IGNORE Scheme_Thread *p = scheme_current_thread;
+  GC_CAN_IGNORE Scheme_Primitive_Closure_Proc *f;
 
 #if !PRIM_NO_STACK_CHECK
 # ifdef DO_STACK_CHECK
@@ -33,11 +34,11 @@
   DO_CHECK_FOR_BREAK(p, ;);
 #endif
 
-  prim = (Scheme_Closed_Primitive_Proc *)rator;
+  prim = (Scheme_Primitive_Closure *)rator;
 
 #if PRIM_CHECK_ARITY
-  if (argc < prim->mina || (argc > prim->maxa && prim->maxa >= 0)) {
-    scheme_wrong_count(prim->name, prim->mina, prim->maxa, argc, argv);
+  if (argc < prim->p.mina || (argc > prim->p.mu.maxa && prim->p.mina >= 0)) {
+    scheme_wrong_count(prim->p.name, prim->p.mina, prim->p.mu.maxa, argc, argv);
     return NULL; /* Shouldn't get here */
   }
 #endif
@@ -45,7 +46,9 @@
   MZ_CONT_MARK_POS++;
   old_cont_mark_stack = MZ_CONT_MARK_STACK;
 
-  v = prim->prim_val(prim->data, argc, argv);
+  f = prim->p.prim_val;
+  v = f(argc, argv, (Scheme_Object *)prim);
+
 #if !PRIM_NO_CHECK_VALUE
   v = _scheme_force_value(v);
 #endif
diff --git a/src/mzscheme/src/schemef.h b/src/mzscheme/src/schemef.h
index dec9fbf89b..6fbf5e6520 100644
--- a/src/mzscheme/src/schemef.h
+++ b/src/mzscheme/src/schemef.h
@@ -253,14 +253,14 @@ MZ_EXTERN Scheme_Object *scheme_eval_string(const char *str, Scheme_Env *env);
 MZ_EXTERN Scheme_Object *scheme_eval_string_multi(const char *str, Scheme_Env *env);
 MZ_EXTERN Scheme_Object *scheme_eval_string_all(const char *str, Scheme_Env *env, int all);
 
-MZ_EXTERN Scheme_Object *_scheme_apply_known_closed_prim(Scheme_Object *rator, int argc,
-					       Scheme_Object **argv);
-MZ_EXTERN Scheme_Object *_scheme_apply_known_closed_prim_multi(Scheme_Object *rator, int argc,
-						     Scheme_Object **argv);
-MZ_EXTERN Scheme_Object *_scheme_apply_closed_prim(Scheme_Object *rator, int argc,
-					 Scheme_Object **argv);
-MZ_EXTERN Scheme_Object *_scheme_apply_closed_prim_multi(Scheme_Object *rator, int argc,
-					       Scheme_Object **argv);
+MZ_EXTERN Scheme_Object *_scheme_apply_known_prim_closure(Scheme_Object *rator, int argc,
+							  Scheme_Object **argv);
+MZ_EXTERN Scheme_Object *_scheme_apply_known_prim_closure_multi(Scheme_Object *rator, int argc,
+								Scheme_Object **argv);
+MZ_EXTERN Scheme_Object *_scheme_apply_prim_closure(Scheme_Object *rator, int argc,
+						    Scheme_Object **argv);
+MZ_EXTERN Scheme_Object *_scheme_apply_prim_closure_multi(Scheme_Object *rator, int argc,
+							  Scheme_Object **argv);
 
 MZ_EXTERN Scheme_Object *scheme_values(int c, Scheme_Object **v);
 
@@ -389,7 +389,6 @@ MZ_EXTERN Scheme_Hash_Table *scheme_clone_hash_table(Scheme_Hash_Table *bt);
 
 MZ_EXTERN Scheme_Object *scheme_make_prim(Scheme_Prim *prim);
 MZ_EXTERN Scheme_Object *scheme_make_noneternal_prim(Scheme_Prim *prim);
-MZ_EXTERN Scheme_Object *scheme_make_closed_prim(Scheme_Closed_Prim *prim, void *data);
 MZ_EXTERN Scheme_Object *scheme_make_prim_w_arity(Scheme_Prim *prim, const char *name,
 					mzshort mina, mzshort maxa);
 MZ_EXTERN Scheme_Object *scheme_make_folding_prim(Scheme_Prim *prim,
@@ -402,18 +401,30 @@ MZ_EXTERN Scheme_Object *scheme_make_noncm_prim(Scheme_Prim *prim,
 MZ_EXTERN Scheme_Object *scheme_make_noneternal_prim_w_arity(Scheme_Prim *prim,
 						   const char *name,
 						   mzshort mina, mzshort maxa);
-MZ_EXTERN Scheme_Object *scheme_make_closed_prim_w_arity(Scheme_Closed_Prim *prim,
-					       void *data, const char *name,
-					       mzshort mina, mzshort maxa);
-MZ_EXTERN Scheme_Object *scheme_make_folding_closed_prim(Scheme_Closed_Prim *prim,
-					       void *data, const char *name,
-					       mzshort mina, mzshort maxa,
-					       short functional);
 MZ_EXTERN Scheme_Object *scheme_make_prim_w_everything(Scheme_Prim *fun, int eternal,
 						       const char *name,
 						       mzshort mina, mzshort maxa,
 						       int folding,
 						       mzshort minr, mzshort maxr);
+
+MZ_EXTERN Scheme_Object *scheme_make_prim_closure_w_arity(Scheme_Primitive_Closure_Proc *prim,
+							  int size, Scheme_Object **vals,
+							  const char *name,
+							  mzshort mina, mzshort maxa);
+MZ_EXTERN Scheme_Object *scheme_make_folding_prim_closure(Scheme_Primitive_Closure_Proc *prim,
+							  int size, Scheme_Object **vals,
+							  const char *name,
+							  mzshort mina, mzshort maxa,
+							  short functional);
+
+MZ_EXTERN Scheme_Object *scheme_make_closed_prim(Scheme_Closed_Prim *prim, void *data);
+MZ_EXTERN Scheme_Object *scheme_make_closed_prim_w_arity(Scheme_Closed_Prim *prim,
+							 void *data, const char *name,
+							 mzshort mina, mzshort maxa);
+MZ_EXTERN Scheme_Object *scheme_make_folding_closed_prim(Scheme_Closed_Prim *prim,
+							 void *data, const char *name,
+							 mzshort mina, mzshort maxa,
+							 short functional);
 MZ_EXTERN Scheme_Object *scheme_make_closed_prim_w_everything(Scheme_Closed_Prim *fun,
 							      void *data,
 							      const char *name,
diff --git a/src/mzscheme/src/schemex.h b/src/mzscheme/src/schemex.h
index 8265901d0a..1a4fde0fd4 100644
--- a/src/mzscheme/src/schemex.h
+++ b/src/mzscheme/src/schemex.h
@@ -203,14 +203,14 @@ Scheme_Object *(*scheme_apply_to_list)(Scheme_Object *rator, Scheme_Object *args
 Scheme_Object *(*scheme_eval_string)(const char *str, Scheme_Env *env);
 Scheme_Object *(*scheme_eval_string_multi)(const char *str, Scheme_Env *env);
 Scheme_Object *(*scheme_eval_string_all)(const char *str, Scheme_Env *env, int all);
-Scheme_Object *(*_scheme_apply_known_closed_prim)(Scheme_Object *rator, int argc,
-					       Scheme_Object **argv);
-Scheme_Object *(*_scheme_apply_known_closed_prim_multi)(Scheme_Object *rator, int argc,
-						     Scheme_Object **argv);
-Scheme_Object *(*_scheme_apply_closed_prim)(Scheme_Object *rator, int argc,
-					 Scheme_Object **argv);
-Scheme_Object *(*_scheme_apply_closed_prim_multi)(Scheme_Object *rator, int argc,
-					       Scheme_Object **argv);
+Scheme_Object *(*_scheme_apply_known_prim_closure)(Scheme_Object *rator, int argc,
+							  Scheme_Object **argv);
+Scheme_Object *(*_scheme_apply_known_prim_closure_multi)(Scheme_Object *rator, int argc,
+								Scheme_Object **argv);
+Scheme_Object *(*_scheme_apply_prim_closure)(Scheme_Object *rator, int argc,
+						    Scheme_Object **argv);
+Scheme_Object *(*_scheme_apply_prim_closure_multi)(Scheme_Object *rator, int argc,
+							  Scheme_Object **argv);
 Scheme_Object *(*scheme_values)(int c, Scheme_Object **v);
 Scheme_Object *(*scheme_check_one_value)(Scheme_Object *v);
 /* Tail calls - only use these when you're writing new functions/syntax */
@@ -313,7 +313,6 @@ Scheme_Hash_Table *(*scheme_clone_hash_table)(Scheme_Hash_Table *bt);
 /*========================================================================*/
 Scheme_Object *(*scheme_make_prim)(Scheme_Prim *prim);
 Scheme_Object *(*scheme_make_noneternal_prim)(Scheme_Prim *prim);
-Scheme_Object *(*scheme_make_closed_prim)(Scheme_Closed_Prim *prim, void *data);
 Scheme_Object *(*scheme_make_prim_w_arity)(Scheme_Prim *prim, const char *name,
 					mzshort mina, mzshort maxa);
 Scheme_Object *(*scheme_make_folding_prim)(Scheme_Prim *prim,
@@ -326,18 +325,28 @@ Scheme_Object *(*scheme_make_noncm_prim)(Scheme_Prim *prim,
 Scheme_Object *(*scheme_make_noneternal_prim_w_arity)(Scheme_Prim *prim,
 						   const char *name,
 						   mzshort mina, mzshort maxa);
-Scheme_Object *(*scheme_make_closed_prim_w_arity)(Scheme_Closed_Prim *prim,
-					       void *data, const char *name,
-					       mzshort mina, mzshort maxa);
-Scheme_Object *(*scheme_make_folding_closed_prim)(Scheme_Closed_Prim *prim,
-					       void *data, const char *name,
-					       mzshort mina, mzshort maxa,
-					       short functional);
 Scheme_Object *(*scheme_make_prim_w_everything)(Scheme_Prim *fun, int eternal,
 						       const char *name,
 						       mzshort mina, mzshort maxa,
 						       int folding,
 						       mzshort minr, mzshort maxr);
+Scheme_Object *(*scheme_make_prim_closure_w_arity)(Scheme_Primitive_Closure_Proc *prim,
+							  int size, Scheme_Object **vals,
+							  const char *name,
+							  mzshort mina, mzshort maxa);
+Scheme_Object *(*scheme_make_folding_prim_closure)(Scheme_Primitive_Closure_Proc *prim,
+							  int size, Scheme_Object **vals,
+							  const char *name,
+							  mzshort mina, mzshort maxa,
+							  short functional);
+Scheme_Object *(*scheme_make_closed_prim)(Scheme_Closed_Prim *prim, void *data);
+Scheme_Object *(*scheme_make_closed_prim_w_arity)(Scheme_Closed_Prim *prim,
+							 void *data, const char *name,
+							 mzshort mina, mzshort maxa);
+Scheme_Object *(*scheme_make_folding_closed_prim)(Scheme_Closed_Prim *prim,
+							 void *data, const char *name,
+							 mzshort mina, mzshort maxa,
+							 short functional);
 Scheme_Object *(*scheme_make_closed_prim_w_everything)(Scheme_Closed_Prim *fun,
 							      void *data,
 							      const char *name,
diff --git a/src/mzscheme/src/schemex.inc b/src/mzscheme/src/schemex.inc
index 845a17b05d..5a5de60336 100644
--- a/src/mzscheme/src/schemex.inc
+++ b/src/mzscheme/src/schemex.inc
@@ -124,10 +124,10 @@
   scheme_extension_table->scheme_eval_string = scheme_eval_string;
   scheme_extension_table->scheme_eval_string_multi = scheme_eval_string_multi;
   scheme_extension_table->scheme_eval_string_all = scheme_eval_string_all;
-  scheme_extension_table->_scheme_apply_known_closed_prim = _scheme_apply_known_closed_prim;
-  scheme_extension_table->_scheme_apply_known_closed_prim_multi = _scheme_apply_known_closed_prim_multi;
-  scheme_extension_table->_scheme_apply_closed_prim = _scheme_apply_closed_prim;
-  scheme_extension_table->_scheme_apply_closed_prim_multi = _scheme_apply_closed_prim_multi;
+  scheme_extension_table->_scheme_apply_known_prim_closure = _scheme_apply_known_prim_closure;
+  scheme_extension_table->_scheme_apply_known_prim_closure_multi = _scheme_apply_known_prim_closure_multi;
+  scheme_extension_table->_scheme_apply_prim_closure = _scheme_apply_prim_closure;
+  scheme_extension_table->_scheme_apply_prim_closure_multi = _scheme_apply_prim_closure_multi;
   scheme_extension_table->scheme_values = scheme_values;
   scheme_extension_table->scheme_check_one_value = scheme_check_one_value;
   scheme_extension_table->scheme_tail_apply = scheme_tail_apply;
@@ -209,14 +209,16 @@
   scheme_extension_table->scheme_clone_hash_table = scheme_clone_hash_table;
   scheme_extension_table->scheme_make_prim = scheme_make_prim;
   scheme_extension_table->scheme_make_noneternal_prim = scheme_make_noneternal_prim;
-  scheme_extension_table->scheme_make_closed_prim = scheme_make_closed_prim;
   scheme_extension_table->scheme_make_prim_w_arity = scheme_make_prim_w_arity;
   scheme_extension_table->scheme_make_folding_prim = scheme_make_folding_prim;
   scheme_extension_table->scheme_make_noncm_prim = scheme_make_noncm_prim;
   scheme_extension_table->scheme_make_noneternal_prim_w_arity = scheme_make_noneternal_prim_w_arity;
+  scheme_extension_table->scheme_make_prim_w_everything = scheme_make_prim_w_everything;
+  scheme_extension_table->scheme_make_prim_closure_w_arity = scheme_make_prim_closure_w_arity;
+  scheme_extension_table->scheme_make_folding_prim_closure = scheme_make_folding_prim_closure;
+  scheme_extension_table->scheme_make_closed_prim = scheme_make_closed_prim;
   scheme_extension_table->scheme_make_closed_prim_w_arity = scheme_make_closed_prim_w_arity;
   scheme_extension_table->scheme_make_folding_closed_prim = scheme_make_folding_closed_prim;
-  scheme_extension_table->scheme_make_prim_w_everything = scheme_make_prim_w_everything;
   scheme_extension_table->scheme_make_closed_prim_w_everything = scheme_make_closed_prim_w_everything;
   scheme_extension_table->scheme_prim_is_method = scheme_prim_is_method;
   scheme_extension_table->scheme_make_pair = scheme_make_pair;
diff --git a/src/mzscheme/src/schemexm.h b/src/mzscheme/src/schemexm.h
index 6ebe40508b..4cfcb31397 100644
--- a/src/mzscheme/src/schemexm.h
+++ b/src/mzscheme/src/schemexm.h
@@ -124,10 +124,10 @@
 #define scheme_eval_string (scheme_extension_table->scheme_eval_string)
 #define scheme_eval_string_multi (scheme_extension_table->scheme_eval_string_multi)
 #define scheme_eval_string_all (scheme_extension_table->scheme_eval_string_all)
-#define _scheme_apply_known_closed_prim (scheme_extension_table->_scheme_apply_known_closed_prim)
-#define _scheme_apply_known_closed_prim_multi (scheme_extension_table->_scheme_apply_known_closed_prim_multi)
-#define _scheme_apply_closed_prim (scheme_extension_table->_scheme_apply_closed_prim)
-#define _scheme_apply_closed_prim_multi (scheme_extension_table->_scheme_apply_closed_prim_multi)
+#define _scheme_apply_known_prim_closure (scheme_extension_table->_scheme_apply_known_prim_closure)
+#define _scheme_apply_known_prim_closure_multi (scheme_extension_table->_scheme_apply_known_prim_closure_multi)
+#define _scheme_apply_prim_closure (scheme_extension_table->_scheme_apply_prim_closure)
+#define _scheme_apply_prim_closure_multi (scheme_extension_table->_scheme_apply_prim_closure_multi)
 #define scheme_values (scheme_extension_table->scheme_values)
 #define scheme_check_one_value (scheme_extension_table->scheme_check_one_value)
 #define scheme_tail_apply (scheme_extension_table->scheme_tail_apply)
@@ -209,14 +209,16 @@
 #define scheme_clone_hash_table (scheme_extension_table->scheme_clone_hash_table)
 #define scheme_make_prim (scheme_extension_table->scheme_make_prim)
 #define scheme_make_noneternal_prim (scheme_extension_table->scheme_make_noneternal_prim)
-#define scheme_make_closed_prim (scheme_extension_table->scheme_make_closed_prim)
 #define scheme_make_prim_w_arity (scheme_extension_table->scheme_make_prim_w_arity)
 #define scheme_make_folding_prim (scheme_extension_table->scheme_make_folding_prim)
 #define scheme_make_noncm_prim (scheme_extension_table->scheme_make_noncm_prim)
 #define scheme_make_noneternal_prim_w_arity (scheme_extension_table->scheme_make_noneternal_prim_w_arity)
+#define scheme_make_prim_w_everything (scheme_extension_table->scheme_make_prim_w_everything)
+#define scheme_make_prim_closure_w_arity (scheme_extension_table->scheme_make_prim_closure_w_arity)
+#define scheme_make_folding_prim_closure (scheme_extension_table->scheme_make_folding_prim_closure)
+#define scheme_make_closed_prim (scheme_extension_table->scheme_make_closed_prim)
 #define scheme_make_closed_prim_w_arity (scheme_extension_table->scheme_make_closed_prim_w_arity)
 #define scheme_make_folding_closed_prim (scheme_extension_table->scheme_make_folding_closed_prim)
-#define scheme_make_prim_w_everything (scheme_extension_table->scheme_make_prim_w_everything)
 #define scheme_make_closed_prim_w_everything (scheme_extension_table->scheme_make_closed_prim_w_everything)
 #define scheme_prim_is_method (scheme_extension_table->scheme_prim_is_method)
 #define scheme_make_pair (scheme_extension_table->scheme_make_pair)
diff --git a/src/mzscheme/src/schnapp.inc b/src/mzscheme/src/schnapp.inc
index 3e6529ffd5..94f8b00ff1 100644
--- a/src/mzscheme/src/schnapp.inc
+++ b/src/mzscheme/src/schnapp.inc
@@ -5,41 +5,18 @@
 
     if (t == scheme_prim_type) {
       Scheme_Object *v;
-      Scheme_Primitive_Proc *prim;
+      GC_CAN_IGNORE Scheme_Primitive_Proc *prim;
+      GC_CAN_IGNORE Scheme_Primitive_Closure_Proc *f;
 
       prim = (Scheme_Primitive_Proc *)rator;
 
-      if (argc < prim->mina || (argc > prim->maxa && prim->maxa >= 0)) {
-	scheme_wrong_count(prim->name, prim->mina, prim->maxa, argc, argv);
+      if (argc < prim->mina || (argc > prim->mu.maxa && prim->mina >= 0)) {
+	scheme_wrong_count(prim->name, prim->mina, prim->mu.maxa, argc, argv);
 	return NULL; /* Shouldn't get here */
       }
 
-      v = prim->prim_val(argc, argv);
-
-#if PRIM_CHECK_VALUE
-      v = _scheme_force_value(v);
-#endif
-
-#if PRIM_CHECK_MULTI
-      if (v == SCHEME_MULTIPLE_VALUES) {
-	scheme_wrong_return_arity(NULL, 1, scheme_multiple_count, scheme_multiple_array, NULL);
-	return NULL; /* Shouldn't get here */
-      }
-#endif
-
-      return v;
-    } else if (t == scheme_closed_prim_type) {
-      Scheme_Object *v;
-      Scheme_Closed_Primitive_Proc *prim;
-
-      prim = (Scheme_Closed_Primitive_Proc *)rator;
-
-      if (argc < prim->mina || (argc > prim->maxa && prim->maxa >= 0)) {
-	scheme_wrong_count(prim->name, prim->mina, prim->maxa, argc, argv);
-	return NULL; /* Shouldn't get here */
-      }
-
-      v = prim->prim_val(prim->data, argc, argv);
+      f = (Scheme_Primitive_Closure_Proc *)prim->prim_val;
+      v = f(argc, argv, (Scheme_Object *)prim);
 
 #if PRIM_CHECK_VALUE
       v = _scheme_force_value(v);
diff --git a/src/mzscheme/src/schvers.h b/src/mzscheme/src/schvers.h
index cea5fc3b13..e1d5e392f8 100644
--- a/src/mzscheme/src/schvers.h
+++ b/src/mzscheme/src/schvers.h
@@ -9,6 +9,6 @@
 
 
 #define MZSCHEME_VERSION_MAJOR 301
-#define MZSCHEME_VERSION_MINOR 6
+#define MZSCHEME_VERSION_MINOR 7
 
-#define MZSCHEME_VERSION "301.6" _MZ_SPECIAL_TAG
+#define MZSCHEME_VERSION "301.7" _MZ_SPECIAL_TAG
diff --git a/src/mzscheme/src/struct.c b/src/mzscheme/src/struct.c
index 1365404586..6568bc8854 100644
--- a/src/mzscheme/src/struct.c
+++ b/src/mzscheme/src/struct.c
@@ -565,9 +565,10 @@ static Scheme_Object *current_code_inspector(int argc, Scheme_Object *argv[])
 /*                             properties                                 */
 /*========================================================================*/
 
-static Scheme_Object *prop_pred(Scheme_Object *prop, int argc, Scheme_Object **args)
+static Scheme_Object *prop_pred(int argc, Scheme_Object **args, Scheme_Object *prim)
 {
   Scheme_Struct_Type *stype;
+  Scheme_Object *prop = SCHEME_PRIM_CLOSURE_ELS(prim)[0];
 
   if (SCHEME_STRUCTP(args[0]))
     stype = ((Scheme_Structure *)args[0])->stype;
@@ -590,14 +591,14 @@ static Scheme_Object *prop_pred(Scheme_Object *prop, int argc, Scheme_Object **a
   return scheme_false;
 }
 
-static Scheme_Object *prop_accessor(Scheme_Object *prop, int argc, Scheme_Object **args)
+static Scheme_Object *do_prop_accessor(Scheme_Object *prop, Scheme_Object *arg, int error_ok)
 {
   Scheme_Struct_Type *stype;
 
-  if (SCHEME_STRUCTP(args[0]))
-    stype = ((Scheme_Structure *)args[0])->stype;
-  else if (SAME_TYPE(SCHEME_TYPE(args[0]), scheme_struct_type_type))
-    stype = (Scheme_Struct_Type *)args[0];
+  if (SCHEME_STRUCTP(arg))
+    stype = ((Scheme_Structure *)arg)->stype;
+  else if (SAME_TYPE(SCHEME_TYPE(arg), scheme_struct_type_type))
+    stype = (Scheme_Struct_Type *)arg;
   else
     stype = NULL;
 
@@ -616,13 +617,18 @@ static Scheme_Object *prop_accessor(Scheme_Object *prop, int argc, Scheme_Object
     }
   }
   
-  if (argc < 2) /* hack; see scheme_struct_type_property_ref */
+  if (error_ok) /* hack; see scheme_struct_type_property_ref */
     scheme_wrong_type("property accessor", 
 		      "struct or struct-type with property", 
-		      0, argc, args);
+		      0, 1, (Scheme_Object **)&arg);
   return NULL;
 }
 
+static Scheme_Object *prop_accessor(int argc, Scheme_Object **args, Scheme_Object *prim)
+{
+  return do_prop_accessor(SCHEME_PRIM_CLOSURE_ELS(prim)[0], args[0], 1);
+}
+
 static Scheme_Object *make_struct_type_property(int argc, Scheme_Object *argv[])
 {
   Scheme_Struct_Property *p;
@@ -652,20 +658,20 @@ static Scheme_Object *make_struct_type_property(int argc, Scheme_Object *argv[])
   name[len] = '?';
   name[len+1] = 0;
 
-  v = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)prop_pred,
-				      (void *)p,
-				      name,
-				      1, 1, 0);
+  v = scheme_make_folding_prim_closure(prop_pred,
+				       1, a,
+				       name,
+				       1, 1, 0);
   a[1] = v;
 
   name = MALLOC_N_ATOMIC(char, len + 10);
   memcpy(name, SCHEME_SYM_VAL(argv[0]), len);
   memcpy(name + len, "-accessor", 10);
 
-  v = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)prop_accessor,
-				      (void *)p,
-				      name,
-				      1, 1, 0);
+  v = scheme_make_folding_prim_closure(prop_accessor,
+				       1, a,
+				       name,
+				       1, 1, 0);
   a[2] = v;
 
   return scheme_values(3, a);
@@ -690,7 +696,7 @@ Scheme_Object *scheme_make_struct_type_property(Scheme_Object *name)
 
 Scheme_Object *scheme_struct_type_property_ref(Scheme_Object *prop, Scheme_Object *s)
 {
-  return prop_accessor(prop, 2, &s); /* 2 is a hack! */
+  return do_prop_accessor(prop, s, 0);
 }
 
 static Scheme_Object *struct_type_property_p(int argc, Scheme_Object *argv[])
@@ -978,13 +984,20 @@ scheme_make_struct_instance(Scheme_Object *_stype, int argc, Scheme_Object **arg
   return (Scheme_Object *)inst;
 }
 
-static Scheme_Object *struct_pred(Scheme_Struct_Type *stype, int argc, Scheme_Object **args)
+static Scheme_Object *
+make_struct_instance(int argc, Scheme_Object **args, Scheme_Object *prim)
 {
-  if (SCHEME_STRUCTP(args[0])
-      && STRUCT_TYPEP(stype, ((Scheme_Structure *)args[0])))
-    return scheme_true;
-  else
-    return scheme_false;
+  return scheme_make_struct_instance(SCHEME_PRIM_CLOSURE_ELS(prim)[0], argc, args);
+}
+
+static Scheme_Object *struct_pred(int argc, Scheme_Object **args, Scheme_Object *prim)
+{
+  if (SCHEME_STRUCTP(args[0])) {
+    Scheme_Struct_Type *stype = (Scheme_Struct_Type *)SCHEME_PRIM_CLOSURE_ELS(prim)[0];
+    if (STRUCT_TYPEP(stype, ((Scheme_Structure *)args[0])))
+      return scheme_true;
+  }
+  return scheme_false;
 }
 
 static int parse_pos(const char *who, Struct_Proc_Info *i, Scheme_Object **args, int argc)
@@ -1041,10 +1054,11 @@ static int parse_pos(const char *who, Struct_Proc_Info *i, Scheme_Object **args,
   return pos;
 }
 
-static Scheme_Object *struct_getter(Struct_Proc_Info *i, int argc, Scheme_Object **args)
+static Scheme_Object *struct_getter(int argc, Scheme_Object **args, Scheme_Object *prim)
 {
   Scheme_Structure *inst;
   int pos;
+  Struct_Proc_Info *i = (Struct_Proc_Info *)SCHEME_PRIM_CLOSURE_ELS(prim)[0];
 
   inst = (Scheme_Structure *)args[0];
 
@@ -1069,11 +1083,12 @@ static Scheme_Object *struct_getter(Struct_Proc_Info *i, int argc, Scheme_Object
   return inst->slots[pos];
 }
 
-static Scheme_Object *struct_setter(Struct_Proc_Info *i, int argc, Scheme_Object **args)
+static Scheme_Object *struct_setter(int argc, Scheme_Object **args, Scheme_Object *prim)
 {
   Scheme_Structure *inst;
   int pos;
   Scheme_Object *v;
+  Struct_Proc_Info *i = (Struct_Proc_Info *)SCHEME_PRIM_CLOSURE_ELS(prim)[0];
 
   if (!SCHEME_STRUCTP(args[0])) {
     scheme_wrong_type(i->func_name, 
@@ -1426,7 +1441,7 @@ int scheme_inspector_sees_part(Scheme_Object *s, Scheme_Object *insp, int pos)
 
 
 #define STRUCT_PROCP(o, t) \
-    (SCHEME_STRUCT_PROCP(o) && (((Scheme_Closed_Primitive_Proc *)o)->pp.flags & t))
+    (SCHEME_STRUCT_PROCP(o) && (((Scheme_Primitive_Proc *)o)->pp.flags & t))
 
 static Scheme_Object *
 struct_setter_p(int argc, Scheme_Object *argv[])
@@ -1469,7 +1484,7 @@ static Scheme_Object *make_struct_field_xxor(const char *who, int getter,
   if (!STRUCT_PROCP(argv[0], (getter
 			      ? SCHEME_PRIM_IS_STRUCT_GETTER
 			      : SCHEME_PRIM_IS_STRUCT_SETTER))
-      || (((Scheme_Closed_Primitive_Proc *)argv[0])->mina == (getter ? 1 : 2))) {
+      || (((Scheme_Primitive_Proc *)argv[0])->mina == (getter ? 1 : 2))) {
     scheme_wrong_type(who, (getter 
 			    ? "accessor procedure that requires a field index"
 			    : "mutator procedure that requires a field index"),
@@ -1477,7 +1492,7 @@ static Scheme_Object *make_struct_field_xxor(const char *who, int getter,
     return NULL;
   }
 
-  i = (Struct_Proc_Info *)((Scheme_Closed_Primitive_Proc *)argv[0])->data;
+  i = (Struct_Proc_Info *)SCHEME_PRIM_CLOSURE_ELS(argv[0])[0];
 
   pos = parse_pos(who, i, argv, argc);
   
@@ -1930,22 +1945,24 @@ make_struct_proc(Scheme_Struct_Type *struct_type,
 		 char *func_name, 
 		 Scheme_ProcT proc_type, int field_num)
 {
-  Scheme_Object *p;
+  Scheme_Object *p, *a[1];
   short flags = SCHEME_PRIM_IS_STRUCT_PROC;
 
   if (proc_type == SCHEME_CONSTR) {
-    p = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)scheme_make_struct_instance,
-					(void *)struct_type,
-					func_name,
-					struct_type->num_islots,
-					struct_type->num_islots,
-					0);
+    a[0] = (Scheme_Object *)struct_type;
+    p = scheme_make_folding_prim_closure(make_struct_instance,
+					 1, a,
+					 func_name,
+					 struct_type->num_islots,
+					 struct_type->num_islots,
+					 0);
     flags |= SCHEME_PRIM_IS_STRUCT_CONSTR;
   } else if (proc_type == SCHEME_PRED) {
-    p = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)struct_pred,
-					(void *)struct_type,
-					func_name,
-					1, 1, 1);
+    a[0] = (Scheme_Object *)struct_type;
+    p = scheme_make_folding_prim_closure(struct_pred,
+					 1, a,
+					 func_name,
+					 1, 1, 1);
     flags |= SCHEME_PRIM_IS_STRUCT_PRED;
   } else {
     Struct_Proc_Info *i;
@@ -1965,20 +1982,22 @@ make_struct_proc(Scheme_Struct_Type *struct_type,
     else
       need_pos = 0;
 
+    a[0] = (Scheme_Object *)i;
+
     if ((proc_type == SCHEME_GETTER) || (proc_type == SCHEME_GEN_GETTER)) {
-      p = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)struct_getter,
-					  (void *)i,
-					  func_name,
-					  1 + need_pos, 1 + need_pos, 1);
+      p = scheme_make_folding_prim_closure(struct_getter,
+					   1, a,
+					   func_name,
+					   1 + need_pos, 1 + need_pos, 1);
       flags |= SCHEME_PRIM_IS_STRUCT_GETTER;
       /* Cache the accessor only if `struct_info' is used.
 	 This avoids keep lots of useless accessors.
 	 if (need_pos) struct_type->accessor = p; */
     } else {
-      p = scheme_make_folding_closed_prim((Scheme_Closed_Prim *)struct_setter,
-					  (void *)i,
-					  func_name,
-					  2 + need_pos, 2 + need_pos, 0);
+      p = scheme_make_folding_prim_closure(struct_setter,
+					   1, a,
+					   func_name,
+					   2 + need_pos, 2 + need_pos, 0);
       flags |= SCHEME_PRIM_IS_STRUCT_SETTER;
       /* See note above:
 	 if (need_pos) struct_type->mutator = p; */
diff --git a/src/mzscheme/src/thread.c b/src/mzscheme/src/thread.c
index a33df62b81..fdc9de6550 100644
--- a/src/mzscheme/src/thread.c
+++ b/src/mzscheme/src/thread.c
@@ -5714,7 +5714,7 @@ static Scheme_Object *extend_parameterization(int argc, Scheme_Object *argv[])
       a[1] = scheme_false;
       if (SCHEME_PRIMP(argv[i])) {
 	Scheme_Prim *proc;
-	proc = ((Scheme_Primitive_Proc *)argv[i])->prim_val;
+	proc = (Scheme_Prim *)((Scheme_Primitive_Proc *)argv[i])->prim_val;
 	key = proc(2, a); /* leads to scheme_param_config to set a[1] */
       } else {
 	/* sets a[1] */
diff --git a/src/mzscheme/utils/xcglue.h b/src/mzscheme/utils/xcglue.h
index abf60f42e6..43a123d1f0 100644
--- a/src/mzscheme/utils/xcglue.h
+++ b/src/mzscheme/utils/xcglue.h
@@ -158,7 +158,7 @@ mzchar objscheme_unbundle_char(Scheme_Object *, const char *);
 #define objscheme_unbundle_long objscheme_unbundle_integer
 #define objscheme_unbundle_int objscheme_unbundle_integer
 
-#define OBJSCHEME_PRIM_METHOD(m, cf) (SCHEME_PRIMP(m) && (((Scheme_Primitive_Proc *)m)->prim_val == cf))
+#define OBJSCHEME_PRIM_METHOD(m, cf) (SCHEME_PRIMP(m) && ((Scheme_Prim *)((Scheme_Primitive_Proc *)m)->prim_val == cf))
 
 #define COPY_JMPBUF(dest, src) memcpy(&dest, &src, sizeof(mz_jmp_buf));