diff --git a/collects/scheme/private/class-internal.ss b/collects/scheme/private/class-internal.ss
index 7b7dae0821..0abfac5260 100644
--- a/collects/scheme/private/class-internal.ss
+++ b/collects/scheme/private/class-internal.ss
@@ -3681,20 +3681,25 @@
                  (for-class (class-name cls))))))
 
 (define-values (make-class-field-accessor make-class-field-mutator)
-  (let ([mk (λ (who which)
-              (λ (class name)
-                (unless (class? class)
-                  (raise-type-error who "class" class))
-                (unless (symbol? name)
-                  (raise-type-error who "symbol" name))
-                (let ([p (hash-ref (class-field-ht class) name
-                                   (lambda ()
-                                     (obj-error who "no such field: ~a~a"
-                                                name
-                                                (for-class (class-name class)))))])
-                  (vector-ref (which class) p))))])
-    (values (mk 'class-field-accessor class-ext-field-refs)
-            (mk 'class-field-mutator class-ext-field-sets))))
+  (let ([check-and-get-index
+         (λ (who class name)
+           (unless (class? class)
+             (raise-type-error who "class" class))
+           (unless (symbol? name)
+             (raise-type-error who "symbol" name))
+           (hash-ref (class-field-ht class) name
+                     (lambda ()
+                       (obj-error who "no such field: ~a~a"
+                                  name
+                                  (for-class (class-name class))))))])
+    (values (λ (class name)
+              (let* ([p (check-and-get-index 'class-field-accessor class name)]
+                     [ref (vector-ref (class-ext-field-refs class) p)])
+                (λ (o) (ref ((object-unwrapper o) o)))))
+            (λ (class name)
+              (let* ([p (check-and-get-index 'class-field-mutator class name)]
+                     [set (vector-ref (class-ext-field-sets class) p)])
+                (λ (o v) (set ((object-unwrapper o) o) v)))))))
 
 (define-struct generic (name applicable))
 
diff --git a/src/mred/wxs/wxs_bmap.cxx b/src/mred/wxs/wxs_bmap.cxx
index 5f768261a1..ec4b17e2bf 100644
--- a/src/mred/wxs/wxs_bmap.cxx
+++ b/src/mred/wxs/wxs_bmap.cxx
@@ -234,6 +234,7 @@ static Scheme_Object *os_wxBitmapwxGetARGBPixels(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-argb-pixels in bitmap%", n, p);
   double x0;
   double x1;
@@ -271,6 +272,7 @@ static Scheme_Object *os_wxBitmapGetGLConfig(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxGLConfig* r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-gl-config in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -291,6 +293,7 @@ static Scheme_Object *os_wxBitmapSetGLConfig(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "set-gl-config in bitmap%", n, p);
   class wxGLConfig* x0 INIT_NULLED_OUT;
 
@@ -314,6 +317,7 @@ static Scheme_Object *os_wxBitmapSetMask(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "set-loaded-mask in bitmap%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
 
@@ -338,6 +342,7 @@ static Scheme_Object *os_wxBitmapGetMask(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBitmap* r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-loaded-mask in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -359,6 +364,7 @@ static Scheme_Object *os_wxBitmapSaveFile(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "save-file in bitmap%", n, p);
   wpathname x0 INIT_NULLED_OUT;
   int x1;
@@ -390,6 +396,7 @@ static Scheme_Object *os_wxBitmapLoadFile(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "load-file in bitmap%", n, p);
   pathname x0 INIT_NULLED_OUT;
   int x1;
@@ -425,6 +432,7 @@ static Scheme_Object *os_wxBitmapIsColor(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "is-color? in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -446,6 +454,7 @@ static Scheme_Object *os_wxBitmapOk(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "ok? in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -467,6 +476,7 @@ static Scheme_Object *os_wxBitmapGetWidth(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-width in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -488,6 +498,7 @@ static Scheme_Object *os_wxBitmapGetHeight(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-height in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -509,6 +520,7 @@ static Scheme_Object *os_wxBitmapGetDepth(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxBitmap_class);
   objscheme_check_valid(os_wxBitmap_class, "get-depth in bitmap%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_butn.cxx b/src/mred/wxs/wxs_butn.cxx
index 4381a4cb82..c712537869 100644
--- a/src/mred/wxs/wxs_butn.cxx
+++ b/src/mred/wxs/wxs_butn.cxx
@@ -399,6 +399,7 @@ static Scheme_Object *os_wxButtonButtonSetBorder(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "set-border in button%", n, p);
   Bool x0;
 
@@ -423,6 +424,7 @@ static Scheme_Object *os_wxButtonSetLabel(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "set-label in button%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxBitmap(p[POFFSET+0], NULL, 0))) {
     class wxBitmap* x0 INIT_NULLED_OUT;
@@ -469,6 +471,7 @@ static Scheme_Object *os_wxButtonOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "on-drop-file in button%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -496,6 +499,7 @@ static Scheme_Object *os_wxButtonPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "pre-on-event in button%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -526,6 +530,7 @@ static Scheme_Object *os_wxButtonPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "pre-on-char in button%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -555,6 +560,7 @@ static Scheme_Object *os_wxButtonOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "on-size in button%", n, p);
   int x0;
   int x1;
@@ -582,6 +588,7 @@ static Scheme_Object *os_wxButtonOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "on-set-focus in button%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -605,6 +612,7 @@ static Scheme_Object *os_wxButtonOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxButton_class);
   objscheme_check_valid(os_wxButton_class, "on-kill-focus in button%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_chce.cxx b/src/mred/wxs/wxs_chce.cxx
index 51b0d790e0..c8676800d5 100644
--- a/src/mred/wxs/wxs_chce.cxx
+++ b/src/mred/wxs/wxs_chce.cxx
@@ -523,6 +523,7 @@ static Scheme_Object *os_wxChoiceSetSelection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "set-selection in choice%", n, p);
   int x0;
 
@@ -546,6 +547,7 @@ static Scheme_Object *os_wxChoiceGetSelection(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "get-selection in choice%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -567,6 +569,7 @@ static Scheme_Object *os_wxChoiceNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "number in choice%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -587,6 +590,7 @@ static Scheme_Object *os_wxChoiceClear(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "clear in choice%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -607,6 +611,7 @@ static Scheme_Object *os_wxChoiceAppend(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "append in choice%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -630,6 +635,7 @@ static Scheme_Object *os_wxChoiceOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "on-drop-file in choice%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -657,6 +663,7 @@ static Scheme_Object *os_wxChoicePreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "pre-on-event in choice%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -687,6 +694,7 @@ static Scheme_Object *os_wxChoicePreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "pre-on-char in choice%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -716,6 +724,7 @@ static Scheme_Object *os_wxChoiceOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "on-size in choice%", n, p);
   int x0;
   int x1;
@@ -743,6 +752,7 @@ static Scheme_Object *os_wxChoiceOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "on-set-focus in choice%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -766,6 +776,7 @@ static Scheme_Object *os_wxChoiceOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxChoice_class);
   objscheme_check_valid(os_wxChoice_class, "on-kill-focus in choice%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_ckbx.cxx b/src/mred/wxs/wxs_ckbx.cxx
index 0e6f50dc7b..55ced7750a 100644
--- a/src/mred/wxs/wxs_ckbx.cxx
+++ b/src/mred/wxs/wxs_ckbx.cxx
@@ -405,6 +405,7 @@ static Scheme_Object *os_wxCheckBoxSetLabel(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "set-label in check-box%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxBitmap(p[POFFSET+0], NULL, 0))) {
     class wxBitmap* x0 INIT_NULLED_OUT;
@@ -451,6 +452,7 @@ static Scheme_Object *os_wxCheckBoxSetValue(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "set-value in check-box%", n, p);
   Bool x0;
 
@@ -474,6 +476,7 @@ static Scheme_Object *os_wxCheckBoxGetValue(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "get-value in check-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -494,6 +497,7 @@ static Scheme_Object *os_wxCheckBoxOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "on-drop-file in check-box%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -521,6 +525,7 @@ static Scheme_Object *os_wxCheckBoxPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "pre-on-event in check-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -551,6 +556,7 @@ static Scheme_Object *os_wxCheckBoxPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "pre-on-char in check-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -580,6 +586,7 @@ static Scheme_Object *os_wxCheckBoxOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "on-size in check-box%", n, p);
   int x0;
   int x1;
@@ -607,6 +614,7 @@ static Scheme_Object *os_wxCheckBoxOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "on-set-focus in check-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -630,6 +638,7 @@ static Scheme_Object *os_wxCheckBoxOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCheckBox_class);
   objscheme_check_valid(os_wxCheckBox_class, "on-kill-focus in check-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_cnvs.cxx b/src/mred/wxs/wxs_cnvs.cxx
index 0eae07105f..d1971b9d24 100644
--- a/src/mred/wxs/wxs_cnvs.cxx
+++ b/src/mred/wxs/wxs_cnvs.cxx
@@ -615,6 +615,7 @@ static Scheme_Object *os_wxCanvasOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-drop-file in canvas%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -642,6 +643,7 @@ static Scheme_Object *os_wxCanvasPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "pre-on-event in canvas%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -672,6 +674,7 @@ static Scheme_Object *os_wxCanvasPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "pre-on-char in canvas%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -701,6 +704,7 @@ static Scheme_Object *os_wxCanvasOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-size in canvas%", n, p);
   int x0;
   int x1;
@@ -728,6 +732,7 @@ static Scheme_Object *os_wxCanvasOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-set-focus in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -751,6 +756,7 @@ static Scheme_Object *os_wxCanvasOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-kill-focus in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -775,6 +781,7 @@ static Scheme_Object *os_wxCanvasGetCanvasBackground(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-canvas-background in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -795,6 +802,7 @@ static Scheme_Object *os_wxCanvasSetCanvasBackground(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-canvas-background in canvas%", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
 
@@ -819,6 +827,7 @@ static Scheme_Object *os_wxCanvaswxSetBackgroundToGray(int n,  Scheme_Object *p[
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-background-to-gray in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -839,6 +848,7 @@ static Scheme_Object *os_wxCanvasOnScroll(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-scroll in canvas%", n, p);
   class wxScrollEvent* x0 INIT_NULLED_OUT;
 
@@ -865,6 +875,7 @@ static Scheme_Object *os_wxCanvasSetScrollPage(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-scroll-page in canvas%", n, p);
   int x0;
   int x1;
@@ -889,6 +900,7 @@ static Scheme_Object *os_wxCanvasSetScrollRange(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-scroll-range in canvas%", n, p);
   int x0;
   int x1;
@@ -913,6 +925,7 @@ static Scheme_Object *os_wxCanvasSetScrollPos(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-scroll-pos in canvas%", n, p);
   int x0;
   int x1;
@@ -938,6 +951,7 @@ static Scheme_Object *os_wxCanvasGetScrollPage(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-scroll-page in canvas%", n, p);
   int x0;
 
@@ -961,6 +975,7 @@ static Scheme_Object *os_wxCanvasGetScrollRange(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-scroll-range in canvas%", n, p);
   int x0;
 
@@ -984,6 +999,7 @@ static Scheme_Object *os_wxCanvasGetScrollPos(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-scroll-pos in canvas%", n, p);
   int x0;
 
@@ -1006,6 +1022,7 @@ static Scheme_Object *os_wxCanvasScrollPercent(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "scroll in canvas%", n, p);
   double x0;
   double x1;
@@ -1030,6 +1047,7 @@ static Scheme_Object *os_wxCanvasWarpPointer(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "warp-pointer in canvas%", n, p);
   int x0;
   int x1;
@@ -1054,6 +1072,7 @@ static Scheme_Object *os_wxCanvasViewStart(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "view-start in canvas%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1085,6 +1104,7 @@ static Scheme_Object *os_wxCanvaswxSetResizeCorner(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-resize-corner in canvas%", n, p);
   Bool x0;
 
@@ -1107,6 +1127,7 @@ static Scheme_Object *os_wxCanvasEnableScrolling(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "show-scrollbars in canvas%", n, p);
   Bool x0;
   Bool x1;
@@ -1131,6 +1152,7 @@ static Scheme_Object *os_wxCanvasSetScrollbars(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "set-scrollbars in canvas%", n, p);
   int x0;
   int x1;
@@ -1178,6 +1200,7 @@ static Scheme_Object *os_wxCanvasGetVirtualSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-virtual-size in canvas%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1210,6 +1233,7 @@ static Scheme_Object *os_wxCanvasGetDC(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxDC* r;
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "get-dc in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1230,6 +1254,7 @@ static Scheme_Object *os_wxCanvasOnChar(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-char in canvas%", n, p);
   class wxKeyEvent* x0 INIT_NULLED_OUT;
 
@@ -1256,6 +1281,7 @@ static Scheme_Object *os_wxCanvasOnEvent(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-event in canvas%", n, p);
   class wxMouseEvent* x0 INIT_NULLED_OUT;
 
@@ -1282,6 +1308,7 @@ static Scheme_Object *os_wxCanvasOnPaint(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxCanvas_class);
   objscheme_check_valid(os_wxCanvas_class, "on-paint in canvas%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_dc.cxx b/src/mred/wxs/wxs_dc.cxx
index 9f21d5f238..08398c45ce 100644
--- a/src/mred/wxs/wxs_dc.cxx
+++ b/src/mred/wxs/wxs_dc.cxx
@@ -1156,6 +1156,7 @@ static Scheme_Object *os_wxDCCacheFontMetricsKey(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "cache-font-metrics-key in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1177,6 +1178,7 @@ static Scheme_Object *os_wxDCGetAlpha(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   double r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-alpha in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1197,6 +1199,7 @@ static Scheme_Object *os_wxDCSetAlpha(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-alpha in dc<%>", n, p);
   double x0;
 
@@ -1220,6 +1223,7 @@ static Scheme_Object *os_wxDCGlyphAvailable(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "glyph-exists? in dc<%>", n, p);
   mzchar x0;
   class wxFont* x1 INIT_NULLED_OUT;
@@ -1248,6 +1252,7 @@ static Scheme_Object *os_wxDCEndPage(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "end-page in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1268,6 +1273,7 @@ static Scheme_Object *os_wxDCEndDoc(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "end-doc in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1288,6 +1294,7 @@ static Scheme_Object *os_wxDCStartPage(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "start-page in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1309,6 +1316,7 @@ static Scheme_Object *os_wxDCStartDoc(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "start-doc in dc<%>", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1333,6 +1341,7 @@ static Scheme_Object *os_wxDCOk(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "ok? in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1354,6 +1363,7 @@ static Scheme_Object *os_wxDC_GetGL(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxGL* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-gl-context in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1375,6 +1385,7 @@ static Scheme_Object *os_wxDCMyGetSize(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-size in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1396,6 +1407,7 @@ static Scheme_Object *os_wxDCdcGetTextForeground(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-text-foreground in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1417,6 +1429,7 @@ static Scheme_Object *os_wxDCdcGetTextBackground(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-text-background in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1438,6 +1451,7 @@ static Scheme_Object *os_wxDCGetPen(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxPen* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-pen in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1459,6 +1473,7 @@ static Scheme_Object *os_wxDCGetFont(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxFont* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-font in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1480,6 +1495,7 @@ static Scheme_Object *os_wxDCGetBrush(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBrush* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-brush in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1501,6 +1517,7 @@ static Scheme_Object *os_wxDCGetBackgroundMode(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-text-mode in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1522,6 +1539,7 @@ static Scheme_Object *os_wxDCGetBackground(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-background in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1543,6 +1561,7 @@ static Scheme_Object *os_wxDCMyGetOrigin(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-origin in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1564,6 +1583,7 @@ static Scheme_Object *os_wxDCMyGetScale(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-scale in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1584,6 +1604,7 @@ static Scheme_Object *os_wxDCSetDeviceOrigin(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-origin in dc<%>", n, p);
   double x0;
   double x1;
@@ -1608,6 +1629,7 @@ static Scheme_Object *os_wxDCSetUserScale(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-scale in dc<%>", n, p);
   nndouble x0;
   nndouble x1;
@@ -1632,6 +1654,7 @@ static Scheme_Object *os_wxDCSetBackgroundMode(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-text-mode in dc<%>", n, p);
   int x0;
 
@@ -1654,6 +1677,7 @@ static Scheme_Object *os_wxDCTryColour(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "try-color in dc<%>", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
   class wxColour* x1 INIT_NULLED_OUT;
@@ -1681,6 +1705,7 @@ static Scheme_Object *os_wxDCDrawBitmap(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-bitmap in dc<%>", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
   double x1;
@@ -1726,6 +1751,7 @@ static Scheme_Object *os_wxDCDrawBitmapRegion(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-bitmap-section in dc<%>", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
   double x1;
@@ -1779,6 +1805,7 @@ static Scheme_Object *os_wxDCGetCharWidth(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   double r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-char-width in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1800,6 +1827,7 @@ static Scheme_Object *os_wxDCGetCharHeight(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   double r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-char-height in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1821,6 +1849,7 @@ static Scheme_Object *os_wxDCMyTextExtent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-text-extent in dc<%>", n, p);
   mzstring x0 INIT_NULLED_OUT;
   class wxFont* x1 INIT_NULLED_OUT;
@@ -1861,6 +1890,7 @@ static Scheme_Object *os_wxDCGetAntiAlias(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-smoothing in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1881,6 +1911,7 @@ static Scheme_Object *os_wxDCSetAntiAlias(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-smoothing in dc<%>", n, p);
   int x0;
 
@@ -1903,6 +1934,7 @@ static Scheme_Object *os_wxDCSetTextForeground(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-text-foreground in dc<%>", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
 
@@ -1926,6 +1958,7 @@ static Scheme_Object *os_wxDCSetTextBackground(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-text-background in dc<%>", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
 
@@ -1951,6 +1984,7 @@ static Scheme_Object *os_wxDCSetBrush(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-brush in dc<%>", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxBrush(p[POFFSET+0], NULL, 0))) {
     class wxBrush* x0 INIT_NULLED_OUT;
@@ -2021,6 +2055,7 @@ static Scheme_Object *os_wxDCSetPen(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-pen in dc<%>", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxPen(p[POFFSET+0], NULL, 0))) {
     class wxPen* x0 INIT_NULLED_OUT;
@@ -2093,6 +2128,7 @@ static Scheme_Object *os_wxDCSetFont(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-font in dc<%>", n, p);
   class wxFont* x0 INIT_NULLED_OUT;
 
@@ -2116,6 +2152,7 @@ static Scheme_Object *os_wxDCSetBackground(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-background in dc<%>", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
 
@@ -2140,6 +2177,7 @@ static Scheme_Object *os_wxDCGetClippingRegion(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxRegion* r;
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "get-clipping-region in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2160,6 +2198,7 @@ static Scheme_Object *os_wxDCSetClippingRegion(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-clipping-region in dc<%>", n, p);
   class wxRegion* x0 INIT_NULLED_OUT;
 
@@ -2183,6 +2222,7 @@ static Scheme_Object *os_wxDCSetClippingRect(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "set-clipping-rect in dc<%>", n, p);
   double x0;
   double x1;
@@ -2211,6 +2251,7 @@ static Scheme_Object *os_wxDCDrawPolygon(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-polygon in dc<%>", n, p);
   int x0;
   class wxPoint* x1 INIT_NULLED_OUT;
@@ -2250,6 +2291,7 @@ static Scheme_Object *os_wxDCDrawLines(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-lines in dc<%>", n, p);
   int x0;
   class wxPoint* x1 INIT_NULLED_OUT;
@@ -2284,6 +2326,7 @@ static Scheme_Object *os_wxDCDrawPath(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-path in dc<%>", n, p);
   class wxPath* x0 INIT_NULLED_OUT;
   double x1;
@@ -2322,6 +2365,7 @@ static Scheme_Object *os_wxDCDrawEllipse(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-ellipse in dc<%>", n, p);
   double x0;
   double x1;
@@ -2350,6 +2394,7 @@ static Scheme_Object *os_wxDCDrawArc(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-arc in dc<%>", n, p);
   double x0;
   double x1;
@@ -2382,6 +2427,7 @@ static Scheme_Object *os_wxDCDrawText(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-text in dc<%>", n, p);
   mzxstring x0 INIT_NULLED_OUT;
   double x1;
@@ -2425,6 +2471,7 @@ static Scheme_Object *os_wxDCDrawSpline(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-spline in dc<%>", n, p);
   double x0;
   double x1;
@@ -2457,6 +2504,7 @@ static Scheme_Object *os_wxDCDrawRoundedRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-rounded-rectangle in dc<%>", n, p);
   double x0;
   double x1;
@@ -2490,6 +2538,7 @@ static Scheme_Object *os_wxDCDrawRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-rectangle in dc<%>", n, p);
   double x0;
   double x1;
@@ -2518,6 +2567,7 @@ static Scheme_Object *os_wxDCDrawPoint(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-point in dc<%>", n, p);
   double x0;
   double x1;
@@ -2542,6 +2592,7 @@ static Scheme_Object *os_wxDCDrawLine(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "draw-line in dc<%>", n, p);
   double x0;
   double x1;
@@ -2570,6 +2621,7 @@ static Scheme_Object *os_wxDCClear(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDC_class);
   objscheme_check_valid(os_wxDC_class, "clear in dc<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2846,6 +2898,7 @@ static Scheme_Object *os_wxMemoryDCGetObject(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBitmap* r;
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "get-bitmap in bitmap-dc%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2866,6 +2919,7 @@ static Scheme_Object *os_wxMemoryDCSelectObject(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "set-bitmap in bitmap-dc%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
 
@@ -2889,6 +2943,7 @@ static Scheme_Object *os_wxMemoryDCScaleSection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "draw-bitmap-section-smooth in bitmap-dc%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
   double x1;
@@ -2934,6 +2989,7 @@ static Scheme_Object *os_wxMemoryDCdcSetARGBPixels(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "set-argb-pixels in bitmap-dc%", n, p);
   double x0;
   double x1;
@@ -2970,6 +3026,7 @@ static Scheme_Object *os_wxMemoryDCdcGetARGBPixels(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "get-argb-pixels in bitmap-dc%", n, p);
   double x0;
   double x1;
@@ -3006,6 +3063,7 @@ static Scheme_Object *os_wxMemoryDCSetPixel(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "set-pixel in bitmap-dc%", n, p);
   double x0;
   double x1;
@@ -3034,6 +3092,7 @@ static Scheme_Object *os_wxMemoryDCGetPixel(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMemoryDC_class);
   objscheme_check_valid(os_wxMemoryDC_class, "get-pixel in bitmap-dc%", n, p);
   double x0;
   double x1;
@@ -3572,6 +3631,7 @@ static Scheme_Object *os_wxGLWithContext(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxGL_class);
   objscheme_check_valid(os_wxGL_class, "call-as-current in gl-context<%>", n, p);
   void* x0 INIT_NULLED_OUT;
   void* x1 INIT_NULLED_OUT;
@@ -3606,6 +3666,7 @@ static Scheme_Object *os_wxGLSwapBuffers(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxGL_class);
   objscheme_check_valid(os_wxGL_class, "swap-buffers in gl-context<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3627,6 +3688,7 @@ static Scheme_Object *os_wxGLOk(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxGL_class);
   objscheme_check_valid(os_wxGL_class, "ok? in gl-context<%>", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3768,6 +3830,7 @@ static Scheme_Object *objscheme_wxGLConfig_GetdoubleBuffered(int n,  Scheme_Obje
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-double-buffered in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-double-buffered in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3781,7 +3844,7 @@ static Scheme_Object *objscheme_wxGLConfig_GetdoubleBuffered(int n,  Scheme_Obje
 
 static Scheme_Object *objscheme_wxGLConfig_SetdoubleBuffered(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -3802,6 +3865,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getstereo(int n,  Scheme_Object *p[])
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-stereo in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-stereo in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3815,7 +3879,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getstereo(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxGLConfig_Setstereo(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -3836,6 +3900,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getstencil(int n,  Scheme_Object *p[]
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-stencil-size in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-stencil-size in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3849,7 +3914,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getstencil(int n,  Scheme_Object *p[]
 
 static Scheme_Object *objscheme_wxGLConfig_Setstencil(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -3870,6 +3935,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getaccum(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-accum-size in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-accum-size in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3883,7 +3949,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getaccum(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxGLConfig_Setaccum(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -3904,6 +3970,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getdepth(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-depth-size in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-depth-size in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3917,7 +3984,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getdepth(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxGLConfig_Setdepth(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -3938,6 +4005,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getmultisample(int n,  Scheme_Object
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxGLConfig_class);
   objscheme_check_valid(os_wxGLConfig_class, "get-multisample-size in gl-config%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-multisample-size in gl-config%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -3951,7 +4019,7 @@ static Scheme_Object *objscheme_wxGLConfig_Getmultisample(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxGLConfig_Setmultisample(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxGLConfig_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
diff --git a/src/mred/wxs/wxs_evnt.cxx b/src/mred/wxs/wxs_evnt.cxx
index 019fd2d8f6..b8bb1c9c00 100644
--- a/src/mred/wxs/wxs_evnt.cxx
+++ b/src/mred/wxs/wxs_evnt.cxx
@@ -147,6 +147,7 @@ static Scheme_Object *objscheme_wxEvent_GettimeStamp(int n,  Scheme_Object *p[])
   ExactLong v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxEvent_class);
   objscheme_check_valid(os_wxEvent_class, "get-time-stamp in event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-time-stamp in event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -160,7 +161,7 @@ static Scheme_Object *objscheme_wxEvent_GettimeStamp(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxEvent_SettimeStamp(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxEvent_class);
   ExactLong v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -415,6 +416,7 @@ static Scheme_Object *objscheme_wxCommandEvent_GeteventType(int n,  Scheme_Objec
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxCommandEvent_class);
   objscheme_check_valid(os_wxCommandEvent_class, "get-event-type in control-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-event-type in control-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -428,7 +430,7 @@ static Scheme_Object *objscheme_wxCommandEvent_GeteventType(int n,  Scheme_Objec
 
 static Scheme_Object *objscheme_wxCommandEvent_SeteventType(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxCommandEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -601,6 +603,7 @@ static Scheme_Object *objscheme_wxPopupEvent_GetmenuId(int n,  Scheme_Object *p[
   ExactLong v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxPopupEvent_class);
   objscheme_check_valid(os_wxPopupEvent_class, "get-menu-id in popup-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-menu-id in popup-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -614,7 +617,7 @@ static Scheme_Object *objscheme_wxPopupEvent_GetmenuId(int n,  Scheme_Object *p[
 
 static Scheme_Object *objscheme_wxPopupEvent_SetmenuId(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxPopupEvent_class);
   ExactLong v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -869,6 +872,7 @@ static Scheme_Object *objscheme_wxScrollEvent_GetmoveType(int n,  Scheme_Object
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxScrollEvent_class);
   objscheme_check_valid(os_wxScrollEvent_class, "get-event-type in scroll-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-event-type in scroll-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -882,7 +886,7 @@ static Scheme_Object *objscheme_wxScrollEvent_GetmoveType(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxScrollEvent_SetmoveType(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxScrollEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -903,6 +907,7 @@ static Scheme_Object *objscheme_wxScrollEvent_Getdirection(int n,  Scheme_Object
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxScrollEvent_class);
   objscheme_check_valid(os_wxScrollEvent_class, "get-direction in scroll-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-direction in scroll-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -916,7 +921,7 @@ static Scheme_Object *objscheme_wxScrollEvent_Getdirection(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxScrollEvent_Setdirection(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxScrollEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -937,6 +942,7 @@ static Scheme_Object *objscheme_wxScrollEvent_Getpos(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxScrollEvent_class);
   objscheme_check_valid(os_wxScrollEvent_class, "get-position in scroll-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-position in scroll-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -950,7 +956,7 @@ static Scheme_Object *objscheme_wxScrollEvent_Getpos(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxScrollEvent_Setpos(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxScrollEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1520,6 +1526,7 @@ static Scheme_Object *os_wxKeyEventSetCapsKey(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "set-other-caps-key-code in key-event%", n, p);
   long x0 INIT_NULLED_OUT;
 
@@ -1544,6 +1551,7 @@ static Scheme_Object *os_wxKeyEventGetCapsKey(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   long r;
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-other-caps-key-code in key-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1564,6 +1572,7 @@ static Scheme_Object *os_wxKeyEventSetOtherAltKey(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "set-other-shift-altgr-key-code in key-event%", n, p);
   long x0 INIT_NULLED_OUT;
 
@@ -1588,6 +1597,7 @@ static Scheme_Object *os_wxKeyEventGetOtherAltKey(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   long r;
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-other-shift-altgr-key-code in key-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1608,6 +1618,7 @@ static Scheme_Object *os_wxKeyEventSetAltKey(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "set-other-altgr-key-code in key-event%", n, p);
   long x0 INIT_NULLED_OUT;
 
@@ -1632,6 +1643,7 @@ static Scheme_Object *os_wxKeyEventGetAltKey(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   long r;
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-other-altgr-key-code in key-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1652,6 +1664,7 @@ static Scheme_Object *os_wxKeyEventSetOtherKey(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "set-other-shift-key-code in key-event%", n, p);
   long x0 INIT_NULLED_OUT;
 
@@ -1676,6 +1689,7 @@ static Scheme_Object *os_wxKeyEventGetOtherKey(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   long r;
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-other-shift-key-code in key-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1698,6 +1712,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetkeyCode(int n,  Scheme_Object *p[]
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-key-code in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-key-code in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1711,7 +1726,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetkeyCode(int n,  Scheme_Object *p[]
 
 static Scheme_Object *objscheme_wxKeyEvent_SetkeyCode(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1732,6 +1747,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetkeyUpCode(int n,  Scheme_Object *p
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-key-release-code in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-key-release-code in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1745,7 +1761,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetkeyUpCode(int n,  Scheme_Object *p
 
 static Scheme_Object *objscheme_wxKeyEvent_SetkeyUpCode(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1766,6 +1782,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetshiftDown(int n,  Scheme_Object *p
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-shift-down in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-shift-down in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1779,7 +1796,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetshiftDown(int n,  Scheme_Object *p
 
 static Scheme_Object *objscheme_wxKeyEvent_SetshiftDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1800,6 +1817,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetcontrolDown(int n,  Scheme_Object
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-control-down in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-control-down in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1813,7 +1831,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetcontrolDown(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxKeyEvent_SetcontrolDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1834,6 +1852,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetmetaDown(int n,  Scheme_Object *p[
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-meta-down in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-meta-down in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1847,7 +1866,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetmetaDown(int n,  Scheme_Object *p[
 
 static Scheme_Object *objscheme_wxKeyEvent_SetmetaDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1868,6 +1887,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetaltDown(int n,  Scheme_Object *p[]
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-alt-down in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-alt-down in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1881,7 +1901,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetaltDown(int n,  Scheme_Object *p[]
 
 static Scheme_Object *objscheme_wxKeyEvent_SetaltDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1902,6 +1922,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetcapsDown(int n,  Scheme_Object *p[
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-caps-down in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-caps-down in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1915,7 +1936,7 @@ static Scheme_Object *objscheme_wxKeyEvent_GetcapsDown(int n,  Scheme_Object *p[
 
 static Scheme_Object *objscheme_wxKeyEvent_SetcapsDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1936,6 +1957,7 @@ static Scheme_Object *objscheme_wxKeyEvent_Getx(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-x in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-x in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1949,7 +1971,7 @@ static Scheme_Object *objscheme_wxKeyEvent_Getx(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxKeyEvent_Setx(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1970,6 +1992,7 @@ static Scheme_Object *objscheme_wxKeyEvent_Gety(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxKeyEvent_class);
   objscheme_check_valid(os_wxKeyEvent_class, "get-y in key-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-y in key-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1983,7 +2006,7 @@ static Scheme_Object *objscheme_wxKeyEvent_Gety(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxKeyEvent_Sety(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxKeyEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2352,6 +2375,7 @@ static Scheme_Object *os_wxMouseEventMoving(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "moving? in mouse-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2373,6 +2397,7 @@ static Scheme_Object *os_wxMouseEventLeaving(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "leaving? in mouse-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2394,6 +2419,7 @@ static Scheme_Object *os_wxMouseEventEntering(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "entering? in mouse-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2415,6 +2441,7 @@ static Scheme_Object *os_wxMouseEventDragging(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "dragging? in mouse-event%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2436,6 +2463,7 @@ static Scheme_Object *os_wxMouseEventButtonUp(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "button-up? in mouse-event%", n, p);
   int x0;
 
@@ -2462,6 +2490,7 @@ static Scheme_Object *os_wxMouseEventButtonDown(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "button-down? in mouse-event%", n, p);
   int x0;
 
@@ -2488,6 +2517,7 @@ static Scheme_Object *os_wxMouseEventButton(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "button-changed? in mouse-event%", n, p);
   int x0;
 
@@ -2515,6 +2545,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GeteventType(int n,  Scheme_Object
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-event-type in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-event-type in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2528,7 +2559,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GeteventType(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxMouseEvent_SeteventType(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2549,6 +2580,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetleftDown(int n,  Scheme_Object *
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-left-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-left-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2562,7 +2594,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetleftDown(int n,  Scheme_Object *
 
 static Scheme_Object *objscheme_wxMouseEvent_SetleftDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2583,6 +2615,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetmiddleDown(int n,  Scheme_Object
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-middle-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-middle-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2596,7 +2629,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetmiddleDown(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxMouseEvent_SetmiddleDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2617,6 +2650,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetrightDown(int n,  Scheme_Object
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-right-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-right-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2630,7 +2664,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetrightDown(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxMouseEvent_SetrightDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2651,6 +2685,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetshiftDown(int n,  Scheme_Object
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-shift-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-shift-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2664,7 +2699,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetshiftDown(int n,  Scheme_Object
 
 static Scheme_Object *objscheme_wxMouseEvent_SetshiftDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2685,6 +2720,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetcontrolDown(int n,  Scheme_Objec
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-control-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-control-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2698,7 +2734,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetcontrolDown(int n,  Scheme_Objec
 
 static Scheme_Object *objscheme_wxMouseEvent_SetcontrolDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2719,6 +2755,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetmetaDown(int n,  Scheme_Object *
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-meta-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-meta-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2732,7 +2769,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetmetaDown(int n,  Scheme_Object *
 
 static Scheme_Object *objscheme_wxMouseEvent_SetmetaDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2753,6 +2790,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetaltDown(int n,  Scheme_Object *p
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-alt-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-alt-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2766,7 +2804,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetaltDown(int n,  Scheme_Object *p
 
 static Scheme_Object *objscheme_wxMouseEvent_SetaltDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2787,6 +2825,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetcapsDown(int n,  Scheme_Object *
   Bool v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-caps-down in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-caps-down in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2800,7 +2839,7 @@ static Scheme_Object *objscheme_wxMouseEvent_GetcapsDown(int n,  Scheme_Object *
 
 static Scheme_Object *objscheme_wxMouseEvent_SetcapsDown(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   Bool v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2821,6 +2860,7 @@ static Scheme_Object *objscheme_wxMouseEvent_Getx(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-x in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-x in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2834,7 +2874,7 @@ static Scheme_Object *objscheme_wxMouseEvent_Getx(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxMouseEvent_Setx(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -2855,6 +2895,7 @@ static Scheme_Object *objscheme_wxMouseEvent_Gety(int n,  Scheme_Object *p[])
   int v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxMouseEvent_class);
   objscheme_check_valid(os_wxMouseEvent_class, "get-y in mouse-event%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-y in mouse-event%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -2868,7 +2909,7 @@ static Scheme_Object *objscheme_wxMouseEvent_Gety(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxMouseEvent_Sety(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxMouseEvent_class);
   int v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
diff --git a/src/mred/wxs/wxs_fram.cxx b/src/mred/wxs/wxs_fram.cxx
index 5a62c2e802..16e1e93ab7 100644
--- a/src/mred/wxs/wxs_fram.cxx
+++ b/src/mred/wxs/wxs_fram.cxx
@@ -676,6 +676,7 @@ static Scheme_Object *os_wxFrameOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-drop-file in frame%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -703,6 +704,7 @@ static Scheme_Object *os_wxFramePreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "pre-on-event in frame%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -733,6 +735,7 @@ static Scheme_Object *os_wxFramePreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "pre-on-char in frame%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -762,6 +765,7 @@ static Scheme_Object *os_wxFrameOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-size in frame%", n, p);
   int x0;
   int x1;
@@ -789,6 +793,7 @@ static Scheme_Object *os_wxFrameOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-set-focus in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -812,6 +817,7 @@ static Scheme_Object *os_wxFrameOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-kill-focus in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -835,6 +841,7 @@ static Scheme_Object *os_wxFrameOnToolbarButton(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-toolbar-click in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -858,6 +865,7 @@ static Scheme_Object *os_wxFrameOnMenuClick(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-menu-click in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -881,6 +889,7 @@ static Scheme_Object *os_wxFrameOnMenuCommand(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-menu-command in frame%", n, p);
   ExactLong x0;
 
@@ -906,6 +915,7 @@ static Scheme_Object *os_wxFrameOnMDIActivate(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-mdi-activate in frame%", n, p);
   Bool x0;
 
@@ -931,6 +941,7 @@ static Scheme_Object *os_wxFrameEnforceSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "enforce-size in frame%", n, p);
   int x0;
   int x1;
@@ -964,6 +975,7 @@ static Scheme_Object *os_wxFrameOnClose(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-close in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -987,6 +999,7 @@ static Scheme_Object *os_wxFrameOnActivate(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "on-activate in frame%", n, p);
   Bool x0;
 
@@ -1012,6 +1025,7 @@ static Scheme_Object *os_wxFrameDesignateRootFrame(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "designate-root-frame in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1032,6 +1046,7 @@ static Scheme_Object *os_wxFrameframeMenu(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "system-menu in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1052,6 +1067,7 @@ static Scheme_Object *os_wxFrameSetFrameModified(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "set-modified in frame%", n, p);
   Bool x0;
 
@@ -1074,6 +1090,7 @@ static Scheme_Object *os_wxFrameCreateStatusLine(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "create-status-line in frame%", n, p);
   int x0;
   string x1 INIT_NULLED_OUT;
@@ -1106,6 +1123,7 @@ static Scheme_Object *os_wxFrameIsMaximized(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "is-maximized? in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1126,6 +1144,7 @@ static Scheme_Object *os_wxFrameMaximize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "maximize in frame%", n, p);
   Bool x0;
 
@@ -1149,6 +1168,7 @@ static Scheme_Object *os_wxFrameStatusLineExists(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "status-line-exists? in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1170,6 +1190,7 @@ static Scheme_Object *os_wxFrameIconized(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "iconized? in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1190,6 +1211,7 @@ static Scheme_Object *os_wxFrameSetStatusText(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "set-status-text in frame%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1214,6 +1236,7 @@ static Scheme_Object *os_wxFrameGetTheMenuBar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxMenuBar* r;
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "get-menu-bar in frame%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1234,6 +1257,7 @@ static Scheme_Object *os_wxFrameSetMenuBar(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "set-menu-bar in frame%", n, p);
   class wxMenuBar* x0 INIT_NULLED_OUT;
 
@@ -1257,6 +1281,7 @@ static Scheme_Object *os_wxFrameSetIcon(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "set-icon in frame%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
   class wxBitmap* x1 INIT_NULLED_OUT;
@@ -1291,6 +1316,7 @@ static Scheme_Object *os_wxFrameIconize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "iconize in frame%", n, p);
   Bool x0;
 
@@ -1313,6 +1339,7 @@ static Scheme_Object *os_wxFrameSetTitle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFrame_class);
   objscheme_check_valid(os_wxFrame_class, "set-title in frame%", n, p);
   string x0 INIT_NULLED_OUT;
 
diff --git a/src/mred/wxs/wxs_gage.cxx b/src/mred/wxs/wxs_gage.cxx
index ae194545c9..6c50886946 100644
--- a/src/mred/wxs/wxs_gage.cxx
+++ b/src/mred/wxs/wxs_gage.cxx
@@ -410,6 +410,7 @@ static Scheme_Object *os_wxsGaugeGetValue(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "get-value in gauge%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -430,6 +431,7 @@ static Scheme_Object *os_wxsGaugeSetValue(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "set-value in gauge%", n, p);
   int x0;
 
@@ -453,6 +455,7 @@ static Scheme_Object *os_wxsGaugeGetRange(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "get-range in gauge%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -473,6 +476,7 @@ static Scheme_Object *os_wxsGaugeSetRange(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "set-range in gauge%", n, p);
   int x0;
 
@@ -495,6 +499,7 @@ static Scheme_Object *os_wxsGaugeOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "on-drop-file in gauge%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -522,6 +527,7 @@ static Scheme_Object *os_wxsGaugePreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "pre-on-event in gauge%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -552,6 +558,7 @@ static Scheme_Object *os_wxsGaugePreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "pre-on-char in gauge%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -581,6 +588,7 @@ static Scheme_Object *os_wxsGaugeOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "on-size in gauge%", n, p);
   int x0;
   int x1;
@@ -608,6 +616,7 @@ static Scheme_Object *os_wxsGaugeOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "on-set-focus in gauge%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -631,6 +640,7 @@ static Scheme_Object *os_wxsGaugeOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxsGauge_class);
   objscheme_check_valid(os_wxsGauge_class, "on-kill-focus in gauge%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_gdi.cxx b/src/mred/wxs/wxs_gdi.cxx
index 2658e9f731..3d9d6205de 100644
--- a/src/mred/wxs/wxs_gdi.cxx
+++ b/src/mred/wxs/wxs_gdi.cxx
@@ -311,6 +311,7 @@ static Scheme_Object *os_wxFontScreenGlyphAvailable(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "screen-glyph-exists? in font%", n, p);
   mzchar x0;
   Bool x1;
@@ -339,6 +340,7 @@ static Scheme_Object *os_wxFontGetFontId(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-font-id in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -360,6 +362,7 @@ static Scheme_Object *os_wxFontGetSizeInPixels(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-size-in-pixels in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -381,6 +384,7 @@ static Scheme_Object *os_wxFontGetUnderlined(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-underlined in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -402,6 +406,7 @@ static Scheme_Object *os_wxFontGetSmoothing(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-smoothing in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -423,6 +428,7 @@ static Scheme_Object *os_wxFontGetWeight(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-weight in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -444,6 +450,7 @@ static Scheme_Object *os_wxFontGetPointSize(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-point-size in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -465,6 +472,7 @@ static Scheme_Object *os_wxFontGetStyle(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-style in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -486,6 +494,7 @@ static Scheme_Object *os_wxFontGetFaceString(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-face in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -507,6 +516,7 @@ static Scheme_Object *os_wxFontGetFamily(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFont_class);
   objscheme_check_valid(os_wxFont_class, "get-family in font%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -783,6 +793,7 @@ static Scheme_Object *os_wxFontListFindOrCreateFont(int n,  Scheme_Object *p[])
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
   class wxFont* r INIT_NULLED_OUT;
+  p[0] = objscheme_unwrap(p[0], os_wxFontList_class);
   objscheme_check_valid(os_wxFontList_class, "find-or-create-font in font-list%", n, p);
   if ((n >= (POFFSET+2)) && WITH_REMEMBERED_STACK(objscheme_istype_number(p[POFFSET+0], NULL)) && WITH_REMEMBERED_STACK(istype_symset_family(p[POFFSET+1], NULL))) {
     int x0;
@@ -1062,6 +1073,7 @@ static Scheme_Object *os_wxColourBlue(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   ubyte r;
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "blue in color%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1083,6 +1095,7 @@ static Scheme_Object *os_wxColourGreen(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   ubyte r;
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "green in color%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1104,6 +1117,7 @@ static Scheme_Object *os_wxColourRed(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   ubyte r;
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "red in color%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1124,6 +1138,7 @@ static Scheme_Object *os_wxColourSet(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "set in color%", n, p);
   ubyte x0;
   ubyte x1;
@@ -1151,6 +1166,7 @@ static Scheme_Object *os_wxColourOk(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "ok? in color%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1172,6 +1188,7 @@ static Scheme_Object *os_wxColourCopyFrom(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxColour_class);
   objscheme_check_valid(os_wxColour_class, "copy-from in color%", n, p);
   class wxColour* x0 INIT_NULLED_OUT;
 
@@ -1416,6 +1433,7 @@ static Scheme_Object *os_wxColourDatabaseFindColour(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxColourDatabase_class);
   objscheme_check_valid(os_wxColourDatabase_class, "find-color in color-database<%>", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1568,6 +1586,7 @@ static Scheme_Object *objscheme_wxPoint_Getx(int n,  Scheme_Object *p[])
   double v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxPoint_class);
   objscheme_check_valid(os_wxPoint_class, "get-x in point%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-x in point%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1581,7 +1600,7 @@ static Scheme_Object *objscheme_wxPoint_Getx(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxPoint_Setx(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxPoint_class);
   double v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1602,6 +1621,7 @@ static Scheme_Object *objscheme_wxPoint_Gety(int n,  Scheme_Object *p[])
   double v;
   REMEMBER_VAR_STACK();
 
+  p[0] = objscheme_unwrap(p[0], os_wxPoint_class);
   objscheme_check_valid(os_wxPoint_class, "get-y in point%", n, p);
   if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m("get-y in point%", POFFSET, POFFSET, n, p, 1));
   cobj = (Scheme_Class_Object *)p[0];
@@ -1615,7 +1635,7 @@ static Scheme_Object *objscheme_wxPoint_Gety(int n,  Scheme_Object *p[])
 
 static Scheme_Object *objscheme_wxPoint_Sety(int n,  Scheme_Object *p[])
 {
-  Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];
+  Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], os_wxPoint_class);
   double v;
   SETUP_VAR_STACK(1);
   VAR_STACK_PUSH(0, cobj);
@@ -1993,6 +2013,7 @@ static Scheme_Object *os_wxBrushSetStyle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "set-style in brush%", n, p);
   int x0;
 
@@ -2016,6 +2037,7 @@ static Scheme_Object *os_wxBrushGetStyle(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "get-style in brush%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2036,6 +2058,7 @@ static Scheme_Object *os_wxBrushSetStipple(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "set-stipple in brush%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
 
@@ -2060,6 +2083,7 @@ static Scheme_Object *os_wxBrushGetStipple(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBitmap* r;
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "get-stipple in brush%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2082,6 +2106,7 @@ static Scheme_Object *os_wxBrushSetColour(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "set-color in brush%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxColour(p[POFFSET+0], NULL, 0))) {
     class wxColour* x0 INIT_NULLED_OUT;
@@ -2150,6 +2175,7 @@ static Scheme_Object *os_wxBrushGetColour(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxBrush_class);
   objscheme_check_valid(os_wxBrush_class, "get-color in brush%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2371,6 +2397,7 @@ static Scheme_Object *os_wxBrushListFindOrCreateBrush(int n,  Scheme_Object *p[]
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
   class wxBrush* r INIT_NULLED_OUT;
+  p[0] = objscheme_unwrap(p[0], os_wxBrushList_class);
   objscheme_check_valid(os_wxBrushList_class, "find-or-create-brush in brush-list%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxColour(p[POFFSET+0], NULL, 0))) {
     class wxColour* x0 INIT_NULLED_OUT;
@@ -2665,6 +2692,7 @@ static Scheme_Object *os_wxPenSetStyle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-style in pen%", n, p);
   int x0;
 
@@ -2688,6 +2716,7 @@ static Scheme_Object *os_wxPenGetStyle(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-style in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2708,6 +2737,7 @@ static Scheme_Object *os_wxPenSetStipple(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-stipple in pen%", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
 
@@ -2732,6 +2762,7 @@ static Scheme_Object *os_wxPenGetStipple(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBitmap* r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-stipple in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2754,6 +2785,7 @@ static Scheme_Object *os_wxPenSetColour(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-color in pen%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxColour(p[POFFSET+0], NULL, 0))) {
     class wxColour* x0 INIT_NULLED_OUT;
@@ -2822,6 +2854,7 @@ static Scheme_Object *os_wxPenGetColour(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxColour* r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-color in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2842,6 +2875,7 @@ static Scheme_Object *os_wxPenSetJoin(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-join in pen%", n, p);
   int x0;
 
@@ -2865,6 +2899,7 @@ static Scheme_Object *os_wxPenGetJoin(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-join in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2885,6 +2920,7 @@ static Scheme_Object *os_wxPenSetCap(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-cap in pen%", n, p);
   int x0;
 
@@ -2908,6 +2944,7 @@ static Scheme_Object *os_wxPenGetCap(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-cap in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -2928,6 +2965,7 @@ static Scheme_Object *os_wxPenSetWidth(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "set-width in pen%", n, p);
   double x0;
 
@@ -2951,6 +2989,7 @@ static Scheme_Object *os_wxPenGetWidthF(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   double r;
+  p[0] = objscheme_unwrap(p[0], os_wxPen_class);
   objscheme_check_valid(os_wxPen_class, "get-width in pen%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3183,6 +3222,7 @@ static Scheme_Object *os_wxPenListFindOrCreatePen(int n,  Scheme_Object *p[])
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
   class wxPen* r INIT_NULLED_OUT;
+  p[0] = objscheme_unwrap(p[0], os_wxPenList_class);
   objscheme_check_valid(os_wxPenList_class, "find-or-create-pen in pen-list%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxColour(p[POFFSET+0], NULL, 0))) {
     class wxColour* x0 INIT_NULLED_OUT;
@@ -3492,6 +3532,7 @@ static Scheme_Object *os_wxCursorOk(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxCursor_class);
   objscheme_check_valid(os_wxCursor_class, "ok? in cursor%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3893,6 +3934,7 @@ static Scheme_Object *os_wxRegionIsInRegion(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "in-region? in region%", n, p);
   double x0;
   double x1;
@@ -3918,6 +3960,7 @@ static Scheme_Object *os_wxRegionEmpty(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "is-empty? in region%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3939,6 +3982,7 @@ static Scheme_Object *os_wxRegionRgnBoundingBox(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "get-bounding-box in region%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -3959,6 +4003,7 @@ static Scheme_Object *os_wxRegionXor(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "xor in region%", n, p);
   class wxRegion* x0 INIT_NULLED_OUT;
 
@@ -3982,6 +4027,7 @@ static Scheme_Object *os_wxRegionSubtract(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "subtract in region%", n, p);
   class wxRegion* x0 INIT_NULLED_OUT;
 
@@ -4005,6 +4051,7 @@ static Scheme_Object *os_wxRegionIntersect(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "intersect in region%", n, p);
   class wxRegion* x0 INIT_NULLED_OUT;
 
@@ -4028,6 +4075,7 @@ static Scheme_Object *os_wxRegionUnion(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "union in region%", n, p);
   class wxRegion* x0 INIT_NULLED_OUT;
 
@@ -4051,6 +4099,7 @@ static Scheme_Object *os_wxRegionSetPath(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-path in region%", n, p);
   class wxPath* x0 INIT_NULLED_OUT;
   double x1;
@@ -4089,6 +4138,7 @@ static Scheme_Object *os_wxRegionSetArc(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-arc in region%", n, p);
   double x0;
   double x1;
@@ -4121,6 +4171,7 @@ static Scheme_Object *os_wxRegionSetPolygon(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-polygon in region%", n, p);
   int x0;
   class wxPoint* x1 INIT_NULLED_OUT;
@@ -4160,6 +4211,7 @@ static Scheme_Object *os_wxRegionSetEllipse(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-ellipse in region%", n, p);
   double x0;
   double x1;
@@ -4188,6 +4240,7 @@ static Scheme_Object *os_wxRegionSetRoundedRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-rounded-rectangle in region%", n, p);
   double x0;
   double x1;
@@ -4221,6 +4274,7 @@ static Scheme_Object *os_wxRegionSetRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "set-rectangle in region%", n, p);
   double x0;
   double x1;
@@ -4250,6 +4304,7 @@ static Scheme_Object *os_wxRegionGetDC(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxDC* r;
+  p[0] = objscheme_unwrap(p[0], os_wxRegion_class);
   objscheme_check_valid(os_wxRegion_class, "get-dc in region%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -4455,6 +4510,7 @@ static Scheme_Object *os_wxPathPathBoundingBox(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   void* r;
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "get-bounding-box in dc-path%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -4475,6 +4531,7 @@ static Scheme_Object *os_wxPathAddPath(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "append in dc-path%", n, p);
   class wxPath* x0 INIT_NULLED_OUT;
 
@@ -4498,6 +4555,7 @@ static Scheme_Object *os_wxPathReverse(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "reverse in dc-path%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -4518,6 +4576,7 @@ static Scheme_Object *os_wxPathRotate(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "rotate in dc-path%", n, p);
   double x0;
 
@@ -4540,6 +4599,7 @@ static Scheme_Object *os_wxPathScale(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "scale in dc-path%", n, p);
   double x0;
   double x1;
@@ -4564,6 +4624,7 @@ static Scheme_Object *os_wxPathTranslate(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "translate in dc-path%", n, p);
   double x0;
   double x1;
@@ -4588,6 +4649,7 @@ static Scheme_Object *os_wxPathLines(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "lines in dc-path%", n, p);
   int x0;
   class wxPoint* x1 INIT_NULLED_OUT;
@@ -4622,6 +4684,7 @@ static Scheme_Object *os_wxPathEllipse(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "ellipse in dc-path%", n, p);
   double x0;
   double x1;
@@ -4650,6 +4713,7 @@ static Scheme_Object *os_wxPathRoundedRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "rounded-rectangle in dc-path%", n, p);
   double x0;
   double x1;
@@ -4683,6 +4747,7 @@ static Scheme_Object *os_wxPathRectangle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "rectangle in dc-path%", n, p);
   double x0;
   double x1;
@@ -4711,6 +4776,7 @@ static Scheme_Object *os_wxPathCurveTo(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "curve-to in dc-path%", n, p);
   double x0;
   double x1;
@@ -4743,6 +4809,7 @@ static Scheme_Object *os_wxPathArc(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "arc in dc-path%", n, p);
   double x0;
   double x1;
@@ -4780,6 +4847,7 @@ static Scheme_Object *os_wxPathLineTo(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "line-to in dc-path%", n, p);
   double x0;
   double x1;
@@ -4804,6 +4872,7 @@ static Scheme_Object *os_wxPathMoveTo(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "move-to in dc-path%", n, p);
   double x0;
   double x1;
@@ -4829,6 +4898,7 @@ static Scheme_Object *os_wxPathIsOpen(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "open? in dc-path%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -4849,6 +4919,7 @@ static Scheme_Object *os_wxPathClose(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "close in dc-path%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -4869,6 +4940,7 @@ static Scheme_Object *os_wxPathReset(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPath_class);
   objscheme_check_valid(os_wxPath_class, "reset in dc-path%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -5051,6 +5123,7 @@ static Scheme_Object *os_wxFontNameDirectoryIdentity(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "find-family-default-font-id in font-name-directory<%>", n, p);
   int x0;
 
@@ -5074,6 +5147,7 @@ static Scheme_Object *os_wxFontNameDirectoryFindOrCreateFontId(int n,  Scheme_Ob
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "find-or-create-font-id in font-name-directory<%>", n, p);
   cstring x0 INIT_NULLED_OUT;
   int x1;
@@ -5100,6 +5174,7 @@ static Scheme_Object *os_wxFontNameDirectoryGetFamily(int n,  Scheme_Object *p[]
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "get-family in font-name-directory<%>", n, p);
   int x0;
 
@@ -5123,6 +5198,7 @@ static Scheme_Object *os_wxFontNameDirectoryGetFontName(int n,  Scheme_Object *p
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "get-face-name in font-name-directory<%>", n, p);
   int x0;
 
@@ -5146,6 +5222,7 @@ static Scheme_Object *os_wxFontNameDirectoryGetFontId(int n,  Scheme_Object *p[]
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "get-font-id in font-name-directory<%>", n, p);
   string x0 INIT_NULLED_OUT;
   int x1;
@@ -5171,6 +5248,7 @@ static Scheme_Object *os_wxFontNameDirectorySetPostScriptName(int n,  Scheme_Obj
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "set-post-script-name in font-name-directory<%>", n, p);
   int x0;
   int x1;
@@ -5200,6 +5278,7 @@ static Scheme_Object *os_wxFontNameDirectorySetScreenName(int n,  Scheme_Object
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "set-screen-name in font-name-directory<%>", n, p);
   int x0;
   int x1;
@@ -5230,6 +5309,7 @@ static Scheme_Object *os_wxFontNameDirectoryGetPostScriptName(int n,  Scheme_Obj
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "get-post-script-name in font-name-directory<%>", n, p);
   int x0;
   int x1;
@@ -5257,6 +5337,7 @@ static Scheme_Object *os_wxFontNameDirectoryGetScreenName(int n,  Scheme_Object
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxFontNameDirectory_class);
   objscheme_check_valid(os_wxFontNameDirectory_class, "get-screen-name in font-name-directory<%>", n, p);
   int x0;
   int x1;
diff --git a/src/mred/wxs/wxs_item.cxx b/src/mred/wxs/wxs_item.cxx
index dae74d1af9..0f814b725e 100644
--- a/src/mred/wxs/wxs_item.cxx
+++ b/src/mred/wxs/wxs_item.cxx
@@ -76,6 +76,7 @@ static Scheme_Object *os_wxItemSetLabel(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxItem_class);
   objscheme_check_valid(os_wxItem_class, "set-label in item%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -100,6 +101,7 @@ static Scheme_Object *os_wxItemGetLabel(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxItem_class);
   objscheme_check_valid(os_wxItem_class, "get-label in item%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -120,6 +122,7 @@ static Scheme_Object *os_wxItemCommand(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxItem_class);
   objscheme_check_valid(os_wxItem_class, "command in item%", n, p);
   class wxCommandEvent* x0 INIT_NULLED_OUT;
 
@@ -606,6 +609,7 @@ static Scheme_Object *os_wxMessageGetFont(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxFont* r;
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "get-font in message%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -628,6 +632,7 @@ static Scheme_Object *os_wxMessageSetLabel(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "set-label in message%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_wxBitmap(p[POFFSET+0], NULL, 0))) {
     class wxBitmap* x0 INIT_NULLED_OUT;
@@ -674,6 +679,7 @@ static Scheme_Object *os_wxMessageOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "on-drop-file in message%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -701,6 +707,7 @@ static Scheme_Object *os_wxMessagePreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "pre-on-event in message%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -731,6 +738,7 @@ static Scheme_Object *os_wxMessagePreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "pre-on-char in message%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -760,6 +768,7 @@ static Scheme_Object *os_wxMessageOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "on-size in message%", n, p);
   int x0;
   int x1;
@@ -787,6 +796,7 @@ static Scheme_Object *os_wxMessageOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "on-set-focus in message%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -810,6 +820,7 @@ static Scheme_Object *os_wxMessageOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMessage_class);
   objscheme_check_valid(os_wxMessage_class, "on-kill-focus in message%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_lbox.cxx b/src/mred/wxs/wxs_lbox.cxx
index 1763247f2f..bde8042230 100644
--- a/src/mred/wxs/wxs_lbox.cxx
+++ b/src/mred/wxs/wxs_lbox.cxx
@@ -562,6 +562,7 @@ static Scheme_Object *os_wxListBoxGetLabelFont(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxFont* r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "get-label-font in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -582,6 +583,7 @@ static Scheme_Object *os_wxListBoxSetString(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "set-string in list-box%", n, p);
   int x0;
   string x1 INIT_NULLED_OUT;
@@ -607,6 +609,7 @@ static Scheme_Object *os_wxListBoxSetFirstItem(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "set-first-visible-item in list-box%", n, p);
   int x0;
 
@@ -629,6 +632,7 @@ static Scheme_Object *os_wxListBoxSet(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "set in list-box%", n, p);
   int x0;
   string* x1 INIT_NULLED_OUT;
@@ -654,6 +658,7 @@ static Scheme_Object *os_wxListBoxGetSelectionList(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Scheme_Object* r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "get-selections in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -675,6 +680,7 @@ static Scheme_Object *os_wxListBoxGetFirstItem(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "get-first-item in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -696,6 +702,7 @@ static Scheme_Object *os_wxListBoxNumberOfVisibleItems(int n,  Scheme_Object *p[
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "number-of-visible-items in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -717,6 +724,7 @@ static Scheme_Object *os_wxListBoxNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "number in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -738,6 +746,7 @@ static Scheme_Object *os_wxListBoxGetSelection(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "get-selection in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -758,6 +767,7 @@ static Scheme_Object *os_wxListBoxSetClientData(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "set-data in list-box%", n, p);
   int x0;
   string x1 INIT_NULLED_OUT;
@@ -784,6 +794,7 @@ static Scheme_Object *os_wxListBoxGetClientData(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "get-data in list-box%", n, p);
   int x0;
 
@@ -807,6 +818,7 @@ static Scheme_Object *os_wxListBoxSelected(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "selected? in list-box%", n, p);
   int x0;
 
@@ -829,6 +841,7 @@ static Scheme_Object *os_wxListBoxSetOneSelection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "set-selection in list-box%", n, p);
   int x0;
 
@@ -851,6 +864,7 @@ static Scheme_Object *os_wxListBoxSetSelection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "select in list-box%", n, p);
   int x0;
   Bool x1;
@@ -878,6 +892,7 @@ static Scheme_Object *os_wxListBoxDelete(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "delete in list-box%", n, p);
   int x0;
 
@@ -900,6 +915,7 @@ static Scheme_Object *os_wxListBoxClear(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "clear in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -922,6 +938,7 @@ static Scheme_Object *os_wxListBoxAppend(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "append in list-box%", n, p);
   if ((n >= (POFFSET+2)) && WITH_REMEMBERED_STACK(objscheme_istype_string(p[POFFSET+0], NULL)) && 1) {
     string x0 INIT_NULLED_OUT;
@@ -971,6 +988,7 @@ static Scheme_Object *os_wxListBoxOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "on-drop-file in list-box%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -998,6 +1016,7 @@ static Scheme_Object *os_wxListBoxPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "pre-on-event in list-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -1028,6 +1047,7 @@ static Scheme_Object *os_wxListBoxPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "pre-on-char in list-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -1057,6 +1077,7 @@ static Scheme_Object *os_wxListBoxOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "on-size in list-box%", n, p);
   int x0;
   int x1;
@@ -1084,6 +1105,7 @@ static Scheme_Object *os_wxListBoxOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "on-set-focus in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1107,6 +1129,7 @@ static Scheme_Object *os_wxListBoxOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxListBox_class);
   objscheme_check_valid(os_wxListBox_class, "on-kill-focus in list-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_menu.cxx b/src/mred/wxs/wxs_menu.cxx
index 47801030de..1ffa0254b8 100644
--- a/src/mred/wxs/wxs_menu.cxx
+++ b/src/mred/wxs/wxs_menu.cxx
@@ -139,6 +139,7 @@ static Scheme_Object *os_wxMenumenuSelect(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "select in menu%", n, p);
   class wxMenuBar* x0 INIT_NULLED_OUT;
 
@@ -163,6 +164,7 @@ static Scheme_Object *os_wxMenuGetFont(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxFont* r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "get-font in menu%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -183,6 +185,7 @@ static Scheme_Object *os_wxMenuSetWidth(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "set-width in menu%", n, p);
   int x0;
 
@@ -205,6 +208,7 @@ static Scheme_Object *os_wxMenuSetTitle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "set-title in menu%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -228,6 +232,7 @@ static Scheme_Object *os_wxMenuSetLabel(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "set-label in menu%", n, p);
   ExactLong x0;
   string x1 INIT_NULLED_OUT;
@@ -253,6 +258,7 @@ static Scheme_Object *os_wxMenuSetHelpString(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "set-help-string in menu%", n, p);
   ExactLong x0;
   nstring x1 INIT_NULLED_OUT;
@@ -279,6 +285,7 @@ static Scheme_Object *os_wxMenuNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "number in menu%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -299,6 +306,7 @@ static Scheme_Object *os_wxMenuEnable(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "enable in menu%", n, p);
   ExactLong x0;
   Bool x1;
@@ -323,6 +331,7 @@ static Scheme_Object *os_wxMenuCheck(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "check in menu%", n, p);
   ExactLong x0;
   Bool x1;
@@ -348,6 +357,7 @@ static Scheme_Object *os_wxMenuChecked(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "checked? in menu%", n, p);
   ExactLong x0;
 
@@ -370,6 +380,7 @@ static Scheme_Object *os_wxMenuAppendSeparator(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "append-separator in menu%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -391,6 +402,7 @@ static Scheme_Object *os_wxMenuDeleteByPosition(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "delete-by-position in menu%", n, p);
   int x0;
 
@@ -414,6 +426,7 @@ static Scheme_Object *os_wxMenuDelete(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "delete in menu%", n, p);
   ExactLong x0;
 
@@ -438,6 +451,7 @@ static Scheme_Object *os_wxMenuAppend(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenu_class);
   objscheme_check_valid(os_wxMenu_class, "append in menu%", n, p);
   if ((n >= (POFFSET+3)) && WITH_REMEMBERED_STACK(objscheme_istype_ExactLong(p[POFFSET+0], NULL)) && WITH_REMEMBERED_STACK(objscheme_istype_string(p[POFFSET+1], NULL)) && WITH_REMEMBERED_STACK(objscheme_istype_wxMenu(p[POFFSET+2], NULL, 0))) {
     ExactLong x0;
@@ -722,6 +736,7 @@ static Scheme_Object *os_wxMenuBarSetLabelTop(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenuBar_class);
   objscheme_check_valid(os_wxMenuBar_class, "set-label-top in menu-bar%", n, p);
   int x0;
   string x1 INIT_NULLED_OUT;
@@ -748,6 +763,7 @@ static Scheme_Object *os_wxMenuBarNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenuBar_class);
   objscheme_check_valid(os_wxMenuBar_class, "number in menu-bar%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -768,6 +784,7 @@ static Scheme_Object *os_wxMenuBarEnableTop(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenuBar_class);
   objscheme_check_valid(os_wxMenuBar_class, "enable-top in menu-bar%", n, p);
   int x0;
   Bool x1;
@@ -793,6 +810,7 @@ static Scheme_Object *os_wxMenuBarDelete(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxMenuBar_class);
   objscheme_check_valid(os_wxMenuBar_class, "delete in menu-bar%", n, p);
   class wxMenu* x0 INIT_NULLED_OUT;
   int x1;
@@ -821,6 +839,7 @@ static Scheme_Object *os_wxMenuBarAppend(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxMenuBar_class);
   objscheme_check_valid(os_wxMenuBar_class, "append in menu-bar%", n, p);
   class wxMenu* x0 INIT_NULLED_OUT;
   string x1 INIT_NULLED_OUT;
@@ -1051,6 +1070,7 @@ static Scheme_Object *os_wxsMenuItemId(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   ExactLong r;
+  p[0] = objscheme_unwrap(p[0], os_wxsMenuItem_class);
   objscheme_check_valid(os_wxsMenuItem_class, "id in menu-item%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_misc.cxx b/src/mred/wxs/wxs_misc.cxx
index 9ad9f425c3..20fc34343a 100644
--- a/src/mred/wxs/wxs_misc.cxx
+++ b/src/mred/wxs/wxs_misc.cxx
@@ -126,6 +126,7 @@ static Scheme_Object *os_wxTimerStop(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTimer_class);
   objscheme_check_valid(os_wxTimer_class, "stop in timer%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -146,6 +147,7 @@ static Scheme_Object *os_wxTimerStart(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTimer_class);
   objscheme_check_valid(os_wxTimer_class, "start in timer%", n, p);
   int x0;
   Bool x1;
@@ -173,6 +175,7 @@ static Scheme_Object *os_wxTimerNotify(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTimer_class);
   objscheme_check_valid(os_wxTimer_class, "notify in timer%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -197,6 +200,7 @@ static Scheme_Object *os_wxTimerInterval(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxTimer_class);
   objscheme_check_valid(os_wxTimer_class, "interval in timer%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -408,6 +412,7 @@ static Scheme_Object *os_wxClipboardSameClipboardClient(int n,  Scheme_Object *p
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "same-clipboard-client? in clipboard<%>", n, p);
   class wxClipboardClient* x0 INIT_NULLED_OUT;
 
@@ -432,6 +437,7 @@ static Scheme_Object *os_wxClipboardGetClipboardBitmap(int n,  Scheme_Object *p[
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxBitmap* r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "get-clipboard-bitmap in clipboard<%>", n, p);
   ExactLong x0;
 
@@ -454,6 +460,7 @@ static Scheme_Object *os_wxClipboardSetClipboardBitmap(int n,  Scheme_Object *p[
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "set-clipboard-bitmap in clipboard<%>", n, p);
   class wxBitmap* x0 INIT_NULLED_OUT;
   ExactLong x1;
@@ -480,6 +487,7 @@ static Scheme_Object *os_wxClipboardGetClipboardData(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nbstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "get-clipboard-data in clipboard<%>", n, p);
   string x0 INIT_NULLED_OUT;
   long _x1;
@@ -508,6 +516,7 @@ static Scheme_Object *os_wxClipboardGetClipboardString(int n,  Scheme_Object *p[
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "get-clipboard-string in clipboard<%>", n, p);
   ExactLong x0;
 
@@ -530,6 +539,7 @@ static Scheme_Object *os_wxClipboardSetClipboardString(int n,  Scheme_Object *p[
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "set-clipboard-string in clipboard<%>", n, p);
   string x0 INIT_NULLED_OUT;
   ExactLong x1;
@@ -555,6 +565,7 @@ static Scheme_Object *os_wxClipboardSetClipboardClient(int n,  Scheme_Object *p[
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxClipboard_class);
   objscheme_check_valid(os_wxClipboard_class, "set-clipboard-client in clipboard<%>", n, p);
   class wxClipboardClient* x0 INIT_NULLED_OUT;
   ExactLong x1;
@@ -851,6 +862,7 @@ static Scheme_Object *os_wxClipboardClientSameClipboardClientEventspace(int n,
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboardClient_class);
   objscheme_check_valid(os_wxClipboardClient_class, "same-eventspace? in clipboard-client%", n, p);
   Scheme_Object_Ptr x0 INIT_NULLED_OUT;
 
@@ -875,6 +887,7 @@ static Scheme_Object *os_wxClipboardClientGetTypes(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Scheme_Object* r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboardClient_class);
   objscheme_check_valid(os_wxClipboardClient_class, "get-types in clipboard-client%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -895,6 +908,7 @@ static Scheme_Object *os_wxClipboardClientAddType(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxClipboardClient_class);
   objscheme_check_valid(os_wxClipboardClient_class, "add-type in clipboard-client%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -919,6 +933,7 @@ static Scheme_Object *os_wxClipboardClientGetData(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nbstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxClipboardClient_class);
   objscheme_check_valid(os_wxClipboardClient_class, "get-data in clipboard-client%", n, p);
   string x0 INIT_NULLED_OUT;
   long _x1;
@@ -947,6 +962,7 @@ static Scheme_Object *os_wxClipboardClientBeingReplaced(int n,  Scheme_Object *p
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxClipboardClient_class);
   objscheme_check_valid(os_wxClipboardClient_class, "on-replaced in clipboard-client%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1208,6 +1224,7 @@ static Scheme_Object *os_wxPrintSetupDatacopy(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "copy-from in ps-setup%", n, p);
   class wxPrintSetupData* x0 INIT_NULLED_OUT;
 
@@ -1231,6 +1248,7 @@ static Scheme_Object *os_wxPrintSetupDataSetMargin(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-margin in ps-setup%", n, p);
   nndouble x0;
   nndouble x1;
@@ -1255,6 +1273,7 @@ static Scheme_Object *os_wxPrintSetupDataSetEditorMargin(int n,  Scheme_Object *
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-editor-margin in ps-setup%", n, p);
   nnlong x0;
   nnlong x1;
@@ -1279,6 +1298,7 @@ static Scheme_Object *os_wxPrintSetupDataSetLevel2(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-level-2 in ps-setup%", n, p);
   Bool x0;
 
@@ -1301,6 +1321,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPaperName(int n,  Scheme_Object *p[]
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-paper-name in ps-setup%", n, p);
   nstring x0 INIT_NULLED_OUT;
 
@@ -1324,6 +1345,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterTranslation(int n,  Scheme_Ob
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-translation in ps-setup%", n, p);
   double x0;
   double x1;
@@ -1348,6 +1370,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterScaling(int n,  Scheme_Object
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-scaling in ps-setup%", n, p);
   nndouble x0;
   nndouble x1;
@@ -1372,6 +1395,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterOrientation(int n,  Scheme_Ob
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-orientation in ps-setup%", n, p);
   int x0;
 
@@ -1394,6 +1418,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterMode(int n,  Scheme_Object *p
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-mode in ps-setup%", n, p);
   int x0;
 
@@ -1416,6 +1441,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrintPreviewCommand(int n,  Scheme_O
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-preview-command in ps-setup%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1439,6 +1465,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterFile(int n,  Scheme_Object *p
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-file in ps-setup%", n, p);
   npathname x0 INIT_NULLED_OUT;
 
@@ -1462,6 +1489,7 @@ static Scheme_Object *os_wxPrintSetupDataSetPrinterCommand(int n,  Scheme_Object
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "set-command in ps-setup%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1485,6 +1513,7 @@ static Scheme_Object *os_wxPrintSetupDataGetMargin(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-margin in ps-setup%", n, p);
   nndouble _x0;
   nndouble* x0 = &_x0;
@@ -1516,6 +1545,7 @@ static Scheme_Object *os_wxPrintSetupDataGetEditorMargin(int n,  Scheme_Object *
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-editor-margin in ps-setup%", n, p);
   nnlong _x0;
   nnlong* x0 = &_x0;
@@ -1548,6 +1578,7 @@ static Scheme_Object *os_wxPrintSetupDataGetLevel2(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-level-2 in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1569,6 +1600,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPaperName(int n,  Scheme_Object *p[]
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   nstring r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-paper-name in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1589,6 +1621,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterTranslation(int n,  Scheme_Ob
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-translation in ps-setup%", n, p);
   double _x0;
   double* x0 = &_x0;
@@ -1620,6 +1653,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterScaling(int n,  Scheme_Object
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-scaling in ps-setup%", n, p);
   nndouble _x0;
   nndouble* x0 = &_x0;
@@ -1652,6 +1686,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterOrientation(int n,  Scheme_Ob
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-orientation in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1673,6 +1708,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterMode(int n,  Scheme_Object *p
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-mode in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1694,6 +1730,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrintPreviewCommand(int n,  Scheme_O
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   string r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-preview-command in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1715,6 +1752,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterFile(int n,  Scheme_Object *p
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   npathname r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-file in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1736,6 +1774,7 @@ static Scheme_Object *os_wxPrintSetupDataGetPrinterCommand(int n,  Scheme_Object
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   string r;
+  p[0] = objscheme_unwrap(p[0], os_wxPrintSetupData_class);
   objscheme_check_valid(os_wxPrintSetupData_class, "get-command in ps-setup%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_panl.cxx b/src/mred/wxs/wxs_panl.cxx
index 96b6d92572..0402168da1 100644
--- a/src/mred/wxs/wxs_panl.cxx
+++ b/src/mred/wxs/wxs_panl.cxx
@@ -432,6 +432,7 @@ static Scheme_Object *os_wxPanelGetLabelPosition(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "get-label-position in panel%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -452,6 +453,7 @@ static Scheme_Object *os_wxPanelSetLabelPosition(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "set-label-position in panel%", n, p);
   int x0;
 
@@ -474,6 +476,7 @@ static Scheme_Object *os_wxPanelOnChar(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-char in panel%", n, p);
   class wxKeyEvent* x0 INIT_NULLED_OUT;
 
@@ -497,6 +500,7 @@ static Scheme_Object *os_wxPanelOnEvent(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-event in panel%", n, p);
   class wxMouseEvent* x0 INIT_NULLED_OUT;
 
@@ -520,6 +524,7 @@ static Scheme_Object *os_wxPanelOnPaint(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-paint in panel%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -540,6 +545,7 @@ static Scheme_Object *os_wxPanelOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-drop-file in panel%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -567,6 +573,7 @@ static Scheme_Object *os_wxPanelPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "pre-on-event in panel%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -597,6 +604,7 @@ static Scheme_Object *os_wxPanelPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "pre-on-char in panel%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -626,6 +634,7 @@ static Scheme_Object *os_wxPanelOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-size in panel%", n, p);
   int x0;
   int x1;
@@ -653,6 +662,7 @@ static Scheme_Object *os_wxPanelOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-set-focus in panel%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -676,6 +686,7 @@ static Scheme_Object *os_wxPanelOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "on-kill-focus in panel%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -699,6 +710,7 @@ static Scheme_Object *os_wxPanelSetItemCursor(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "set-item-cursor in panel%", n, p);
   int x0;
   int x1;
@@ -723,6 +735,7 @@ static Scheme_Object *os_wxPanelGetCursor(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxPanel_class);
   objscheme_check_valid(os_wxPanel_class, "get-item-cursor in panel%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1441,6 +1454,7 @@ static Scheme_Object *os_wxDialogBoxdialogMenu(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "system-menu in dialog%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1461,6 +1475,7 @@ static Scheme_Object *os_wxDialogBoxSetTitle(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "set-title in dialog%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -1484,6 +1499,7 @@ static Scheme_Object *os_wxDialogBoxOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-drop-file in dialog%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -1511,6 +1527,7 @@ static Scheme_Object *os_wxDialogBoxPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "pre-on-event in dialog%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -1541,6 +1558,7 @@ static Scheme_Object *os_wxDialogBoxPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "pre-on-char in dialog%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -1570,6 +1588,7 @@ static Scheme_Object *os_wxDialogBoxOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-size in dialog%", n, p);
   int x0;
   int x1;
@@ -1597,6 +1616,7 @@ static Scheme_Object *os_wxDialogBoxOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-set-focus in dialog%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1620,6 +1640,7 @@ static Scheme_Object *os_wxDialogBoxOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-kill-focus in dialog%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1643,6 +1664,7 @@ static Scheme_Object *os_wxDialogBoxEnforceSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "enforce-size in dialog%", n, p);
   int x0;
   int x1;
@@ -1676,6 +1698,7 @@ static Scheme_Object *os_wxDialogBoxOnClose(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-close in dialog%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1699,6 +1722,7 @@ static Scheme_Object *os_wxDialogBoxOnActivate(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxDialogBox_class);
   objscheme_check_valid(os_wxDialogBox_class, "on-activate in dialog%", n, p);
   Bool x0;
 
diff --git a/src/mred/wxs/wxs_rado.cxx b/src/mred/wxs/wxs_rado.cxx
index 7dbbaf189c..760e12856f 100644
--- a/src/mred/wxs/wxs_rado.cxx
+++ b/src/mred/wxs/wxs_rado.cxx
@@ -628,6 +628,7 @@ static Scheme_Object *os_wxRadioBoxButtonFocus(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "button-focus in radio-box%", n, p);
   int x0;
 
@@ -652,6 +653,7 @@ static Scheme_Object *os_wxRadioBoxEnable(int n,  Scheme_Object *p[])
   SETUP_PRE_VAR_STACK(1);
   PRE_VAR_STACK_PUSH(0, p);
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "enable in radio-box%", n, p);
   if ((n >= (POFFSET+1)) && WITH_REMEMBERED_STACK(objscheme_istype_number(p[POFFSET+0], NULL))) {
     int x0;
@@ -698,6 +700,7 @@ static Scheme_Object *os_wxRadioBoxSetSelection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "set-selection in radio-box%", n, p);
   int x0;
 
@@ -721,6 +724,7 @@ static Scheme_Object *os_wxRadioBoxNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "number in radio-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -742,6 +746,7 @@ static Scheme_Object *os_wxRadioBoxGetSelection(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "get-selection in radio-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -762,6 +767,7 @@ static Scheme_Object *os_wxRadioBoxOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "on-drop-file in radio-box%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -789,6 +795,7 @@ static Scheme_Object *os_wxRadioBoxPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "pre-on-event in radio-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -819,6 +826,7 @@ static Scheme_Object *os_wxRadioBoxPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "pre-on-char in radio-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -848,6 +856,7 @@ static Scheme_Object *os_wxRadioBoxOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "on-size in radio-box%", n, p);
   int x0;
   int x1;
@@ -875,6 +884,7 @@ static Scheme_Object *os_wxRadioBoxOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "on-set-focus in radio-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -898,6 +908,7 @@ static Scheme_Object *os_wxRadioBoxOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxRadioBox_class);
   objscheme_check_valid(os_wxRadioBox_class, "on-kill-focus in radio-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_slid.cxx b/src/mred/wxs/wxs_slid.cxx
index 55c51ae100..e7c5283704 100644
--- a/src/mred/wxs/wxs_slid.cxx
+++ b/src/mred/wxs/wxs_slid.cxx
@@ -397,6 +397,7 @@ static Scheme_Object *os_wxSliderSetValue(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "set-value in slider%", n, p);
   int x0;
 
@@ -420,6 +421,7 @@ static Scheme_Object *os_wxSliderGetValue(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "get-value in slider%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -440,6 +442,7 @@ static Scheme_Object *os_wxSliderOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "on-drop-file in slider%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -467,6 +470,7 @@ static Scheme_Object *os_wxSliderPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "pre-on-event in slider%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -497,6 +501,7 @@ static Scheme_Object *os_wxSliderPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "pre-on-char in slider%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -526,6 +531,7 @@ static Scheme_Object *os_wxSliderOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "on-size in slider%", n, p);
   int x0;
   int x1;
@@ -553,6 +559,7 @@ static Scheme_Object *os_wxSliderOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "on-set-focus in slider%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -576,6 +583,7 @@ static Scheme_Object *os_wxSliderOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxSlider_class);
   objscheme_check_valid(os_wxSlider_class, "on-kill-focus in slider%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_tabc.cxx b/src/mred/wxs/wxs_tabc.cxx
index 5a48e075c1..89b33dd930 100644
--- a/src/mred/wxs/wxs_tabc.cxx
+++ b/src/mred/wxs/wxs_tabc.cxx
@@ -547,6 +547,7 @@ static Scheme_Object *os_wxTabChoiceButtonFocus(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "button-focus in tab-group%", n, p);
   int x0;
 
@@ -569,6 +570,7 @@ static Scheme_Object *os_wxTabChoiceSet(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "set in tab-group%", n, p);
   int x0;
   string* x1 INIT_NULLED_OUT;
@@ -596,6 +598,7 @@ static Scheme_Object *os_wxTabChoiceSetLabel(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "set-label in tab-group%", n, p);
   int x0;
   string x1 INIT_NULLED_OUT;
@@ -621,6 +624,7 @@ static Scheme_Object *os_wxTabChoiceDelete(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "delete in tab-group%", n, p);
   int x0;
 
@@ -643,6 +647,7 @@ static Scheme_Object *os_wxTabChoiceAppend(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "append in tab-group%", n, p);
   string x0 INIT_NULLED_OUT;
 
@@ -666,6 +671,7 @@ static Scheme_Object *os_wxTabChoiceEnable(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "enable in tab-group%", n, p);
   Bool x0;
 
@@ -688,6 +694,7 @@ static Scheme_Object *os_wxTabChoiceSetSelection(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "set-selection in tab-group%", n, p);
   int x0;
 
@@ -711,6 +718,7 @@ static Scheme_Object *os_wxTabChoiceNumber(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "number in tab-group%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -732,6 +740,7 @@ static Scheme_Object *os_wxTabChoiceGetSelection(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "get-selection in tab-group%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -752,6 +761,7 @@ static Scheme_Object *os_wxTabChoiceOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "on-drop-file in tab-group%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -779,6 +789,7 @@ static Scheme_Object *os_wxTabChoicePreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "pre-on-event in tab-group%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -809,6 +820,7 @@ static Scheme_Object *os_wxTabChoicePreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "pre-on-char in tab-group%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -838,6 +850,7 @@ static Scheme_Object *os_wxTabChoiceOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "on-size in tab-group%", n, p);
   int x0;
   int x1;
@@ -865,6 +878,7 @@ static Scheme_Object *os_wxTabChoiceOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "on-set-focus in tab-group%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -888,6 +902,7 @@ static Scheme_Object *os_wxTabChoiceOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxTabChoice_class);
   objscheme_check_valid(os_wxTabChoice_class, "on-kill-focus in tab-group%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1397,6 +1412,7 @@ static Scheme_Object *os_wxGroupBoxOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "on-drop-file in group-box%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -1424,6 +1440,7 @@ static Scheme_Object *os_wxGroupBoxPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "pre-on-event in group-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -1454,6 +1471,7 @@ static Scheme_Object *os_wxGroupBoxPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "pre-on-char in group-box%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -1483,6 +1501,7 @@ static Scheme_Object *os_wxGroupBoxOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "on-size in group-box%", n, p);
   int x0;
   int x1;
@@ -1510,6 +1529,7 @@ static Scheme_Object *os_wxGroupBoxOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "on-set-focus in group-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1533,6 +1553,7 @@ static Scheme_Object *os_wxGroupBoxOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxGroupBox_class);
   objscheme_check_valid(os_wxGroupBox_class, "on-kill-focus in group-box%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
diff --git a/src/mred/wxs/wxs_win.cxx b/src/mred/wxs/wxs_win.cxx
index 0a84d26456..101cf5feb8 100644
--- a/src/mred/wxs/wxs_win.cxx
+++ b/src/mred/wxs/wxs_win.cxx
@@ -461,6 +461,7 @@ static Scheme_Object *os_wxWindowOnDropFile(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "on-drop-file in window%", n, p);
   epathname x0 INIT_NULLED_OUT;
 
@@ -488,6 +489,7 @@ static Scheme_Object *os_wxWindowPreOnEvent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "pre-on-event in window%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxMouseEvent* x1 INIT_NULLED_OUT;
@@ -518,6 +520,7 @@ static Scheme_Object *os_wxWindowPreOnChar(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "pre-on-char in window%", n, p);
   class wxWindow* x0 INIT_NULLED_OUT;
   class wxKeyEvent* x1 INIT_NULLED_OUT;
@@ -547,6 +550,7 @@ static Scheme_Object *os_wxWindowOnSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "on-size in window%", n, p);
   int x0;
   int x1;
@@ -574,6 +578,7 @@ static Scheme_Object *os_wxWindowOnSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "on-set-focus in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -597,6 +602,7 @@ static Scheme_Object *os_wxWindowOnKillFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "on-kill-focus in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -621,6 +627,7 @@ static Scheme_Object *os_wxWindowwxWindowGetHandle(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   ExactLong r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-handle in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -642,6 +649,7 @@ static Scheme_Object *os_wxWindowwxIsEnabledToRoot(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "is-enabled-to-root? in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -663,6 +671,7 @@ static Scheme_Object *os_wxWindowwxIsShownToRoot(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "is-shown-to-root? in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -683,6 +692,7 @@ static Scheme_Object *os_wxWindowwxSetPhantomSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "set-phantom-size in window%", n, p);
   int x0;
   int x1;
@@ -708,6 +718,7 @@ static Scheme_Object *os_wxWindowwxSchemeWindowGetY(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-y in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -729,6 +740,7 @@ static Scheme_Object *os_wxWindowwxSchemeWindowGetX(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-x in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -750,6 +762,7 @@ static Scheme_Object *os_wxWindowwxSchemeWindowGetWidth(int n,  Scheme_Object *p
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-width in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -771,6 +784,7 @@ static Scheme_Object *os_wxWindowwxSchemeWindowGetHeight(int n,  Scheme_Object *
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   int r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-height in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -791,6 +805,7 @@ static Scheme_Object *os_wxWindowPopupMenu(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "popup-menu in window%", n, p);
   class wxMenu* x0 INIT_NULLED_OUT;
   int x1;
@@ -818,6 +833,7 @@ static Scheme_Object *os_wxWindowCenterWParent(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "center in window%", n, p);
   int x0;
   class wxWindow* x1 INIT_NULLED_OUT;
@@ -849,6 +865,7 @@ static Scheme_Object *os_wxWindowGetTextExtent(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-text-extent in window%", n, p);
   string x0 INIT_NULLED_OUT;
   double _x1;
@@ -917,6 +934,7 @@ static Scheme_Object *os_wxWindowGetParent(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxWindow* r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-parent in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -937,6 +955,7 @@ static Scheme_Object *os_wxWindowRefresh(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "refresh in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -957,6 +976,7 @@ static Scheme_Object *os_wxWindowScreenToClient(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "screen-to-client in window%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -988,6 +1008,7 @@ static Scheme_Object *os_wxWindowClientToScreen(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "client-to-screen in window%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1019,6 +1040,7 @@ static Scheme_Object *os_wxWindowDragAcceptFiles(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "drag-accept-files in window%", n, p);
   Bool x0;
 
@@ -1041,6 +1063,7 @@ static Scheme_Object *os_wxWindowEnable(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "enable in window%", n, p);
   Bool x0;
 
@@ -1063,6 +1086,7 @@ static Scheme_Object *os_wxWindowGetPosition(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-position in window%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1094,6 +1118,7 @@ static Scheme_Object *os_wxWindowGetClientSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-client-size in window%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1125,6 +1150,7 @@ static Scheme_Object *os_wxWindowGetSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "get-size in window%", n, p);
   int _x0;
   int* x0 = &_x0;
@@ -1156,6 +1182,7 @@ static Scheme_Object *os_wxWindowFit(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "fit in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1177,6 +1204,7 @@ static Scheme_Object *os_wxWindowIsShown(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "is-shown? in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1197,6 +1225,7 @@ static Scheme_Object *os_wxWindowShow(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "show in window%", n, p);
   Bool x0;
 
@@ -1220,6 +1249,7 @@ static Scheme_Object *os_wxWindowSetCursor(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   class wxCursor* r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "set-cursor in window%", n, p);
   class wxCursor* x0 INIT_NULLED_OUT;
 
@@ -1243,6 +1273,7 @@ static Scheme_Object *os_wxWindowMove(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "move in window%", n, p);
   int x0;
   int x1;
@@ -1267,6 +1298,7 @@ static Scheme_Object *os_wxWindowSetSize(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "set-size in window%", n, p);
   int x0;
   int x1;
@@ -1300,6 +1332,7 @@ static Scheme_Object *os_wxWindowSetFocus(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "set-focus in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1321,6 +1354,7 @@ static Scheme_Object *os_wxWindowGetsFocus(int n,  Scheme_Object *p[])
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
   Bool r;
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "gets-focus? in window%", n, p);
 
   SETUP_VAR_STACK_REMEMBERED(1);
@@ -1341,6 +1375,7 @@ static Scheme_Object *os_wxWindowCentre(int n,  Scheme_Object *p[])
 {
   WXS_USE_ARGUMENT(n) WXS_USE_ARGUMENT(p)
   REMEMBER_VAR_STACK();
+  p[0] = objscheme_unwrap(p[0], os_wxWindow_class);
   objscheme_check_valid(os_wxWindow_class, "centre in window%", n, p);
   int x0;
 
diff --git a/src/mzscheme/utils/xctocc b/src/mzscheme/utils/xctocc
index e7245e8971..07382407b4 100755
--- a/src/mzscheme/utils/xctocc
+++ b/src/mzscheme/utils/xctocc
@@ -938,6 +938,7 @@ sub DoPrintClass
 	print &NormalType($ivartype, 1) . " v";
 	print ";\n";
 	print "  REMEMBER_VAR_STACK();\n\n";
+        print "  p[0] = objscheme_unwrap(p[0], ${newclass}_class);\n";
 	print "  objscheme_check_valid(${newclass}_class, $longgetname, n, p);\n";
 	print "  if (n > POFFSET) WITH_REMEMBERED_STACK(scheme_wrong_count_m($longgetname, POFFSET, POFFSET, n, p, 1));\n";
 	print "  cobj = (Scheme_Class_Object *)p[0];\n";
@@ -957,7 +958,7 @@ sub DoPrintClass
 	    print "\nstatic Scheme_Object *objscheme_${oldclass}_Set${ivarname}(";
 	    print $scheme_args;
 	    print ")\n{\n  ";
-	    print "Scheme_Class_Object *cobj = (Scheme_Class_Object *)p[0];\n  ";
+	    print "Scheme_Class_Object *cobj = (Scheme_Class_Object *)objscheme_unwrap(p[0], ${newclass}_class);\n  ";
 	    print &NormalType($ivartype, 1) . " v";
 	    print ";\n";
 	    print "  SETUP_VAR_STACK(1);\n  VAR_STACK_PUSH(0, cobj);\n\n";
@@ -1736,6 +1737,7 @@ sub PrintFunction
 	}
 
 	if (!$global) {
+            print "  p[0] = objscheme_unwrap(p[0], ${newclass}_class);\n";
 	    print "  objscheme_check_valid(${newclass}_class, $method, n, p);\n";
 	}
     }