diff --git a/src/mred/wxs/wxs.xci b/src/mred/wxs/wxs.xci
index a2368edacc..479797b3c7 100644
--- a/src/mred/wxs/wxs.xci
+++ b/src/mred/wxs/wxs.xci
@@ -20,7 +20,9 @@
 
 @MACRO CHECKOKFORDC[p.who] = if (x<p>) { if (!x<p>->Ok()) WITH_VAR_STACK(scheme_arg_mismatch(<who>, "bad bitmap: ", p[POFFSET+<p>])); if (BM_SELECTED(x<p>)) WITH_VAR_STACK(scheme_arg_mismatch(<who>, "bitmap is already installed into a bitmap-dc%: ", p[POFFSET+<p>])); if (BM_IN_USE(x<p>)) WITH_VAR_STACK(scheme_arg_mismatch(<who>, "bitmap is currently installed as a control label or pen/brush stipple: ", p[POFFSET+<p>])); }
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 @MACRO JMPDECL = mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-@MACRO SETJMP = ESCAPE_BLOCK(/*empty*/)
+@MACRO SETJMP = ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
 @MACRO SETJMPV[rv] = ESCAPE_BLOCK(<rv>)
 @MACRO RESETJMP = { thread = scheme_get_current_thread(); thread->error_buf = savebuf; }
diff --git a/src/mred/wxs/wxs_bmap.cxx b/src/mred/wxs/wxs_bmap.cxx
index 62723f565a..2e809477dc 100644
--- a/src/mred/wxs/wxs_bmap.cxx
+++ b/src/mred/wxs/wxs_bmap.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_bmap.h"
diff --git a/src/mred/wxs/wxs_butn.cxx b/src/mred/wxs/wxs_butn.cxx
index 5135e6b212..12af49764b 100644
--- a/src/mred/wxs/wxs_butn.cxx
+++ b/src/mred/wxs/wxs_butn.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_butn.h"
@@ -193,7 +195,7 @@ void os_wxButton::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -349,7 +351,7 @@ void os_wxButton::OnSetFocus()
     READY_TO_RETURN; ASSELF wxButton::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -383,7 +385,7 @@ void os_wxButton::OnKillFocus()
     READY_TO_RETURN; ASSELF wxButton::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_chce.cxx b/src/mred/wxs/wxs_chce.cxx
index c35bbee46a..227a37a41c 100644
--- a/src/mred/wxs/wxs_chce.cxx
+++ b/src/mred/wxs/wxs_chce.cxx
@@ -31,6 +31,8 @@ void wxSetComboBoxFont(wxFont *f)
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_chce.h"
@@ -316,7 +318,7 @@ void os_wxChoice::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -472,7 +474,7 @@ void os_wxChoice::OnSetFocus()
     READY_TO_RETURN; ASSELF wxChoice::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -506,7 +508,7 @@ void os_wxChoice::OnKillFocus()
     READY_TO_RETURN; ASSELF wxChoice::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_ckbx.cxx b/src/mred/wxs/wxs_ckbx.cxx
index 163099543c..e0923fea68 100644
--- a/src/mred/wxs/wxs_ckbx.cxx
+++ b/src/mred/wxs/wxs_ckbx.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_ckbx.h"
@@ -197,7 +199,7 @@ void os_wxCheckBox::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -353,7 +355,7 @@ void os_wxCheckBox::OnSetFocus()
     READY_TO_RETURN; ASSELF wxCheckBox::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -387,7 +389,7 @@ void os_wxCheckBox::OnKillFocus()
     READY_TO_RETURN; ASSELF wxCheckBox::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_cnvs.cxx b/src/mred/wxs/wxs_cnvs.cxx
index 94dae84abe..ceb6de052a 100644
--- a/src/mred/wxs/wxs_cnvs.cxx
+++ b/src/mred/wxs/wxs_cnvs.cxx
@@ -27,6 +27,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_cnvs.h"
@@ -267,7 +269,7 @@ void os_wxCanvas::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -423,7 +425,7 @@ void os_wxCanvas::OnSetFocus()
     READY_TO_RETURN; ASSELF wxCanvas::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -457,7 +459,7 @@ void os_wxCanvas::OnKillFocus()
     READY_TO_RETURN; ASSELF wxCanvas::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -493,7 +495,7 @@ void os_wxCanvas::OnScroll(class wxScrollEvent* x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_wxScrollEvent(x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -529,7 +531,7 @@ void os_wxCanvas::OnChar(class wxKeyEvent* x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_wxKeyEvent(x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -565,7 +567,7 @@ void os_wxCanvas::OnEvent(class wxMouseEvent* x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_wxMouseEvent(x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -599,7 +601,7 @@ void os_wxCanvas::OnPaint()
     READY_TO_RETURN; ASSELF wxCanvas::OnPaint();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_dc.cxx b/src/mred/wxs/wxs_dc.cxx
index 34ee5b5d0d..808f707f41 100644
--- a/src/mred/wxs/wxs_dc.cxx
+++ b/src/mred/wxs/wxs_dc.cxx
@@ -66,6 +66,8 @@ void wxGL::ThisContextCurrent(void) { }
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_dc.h"
diff --git a/src/mred/wxs/wxs_evnt.cxx b/src/mred/wxs/wxs_evnt.cxx
index 77df5d0fe7..4d6336c096 100644
--- a/src/mred/wxs/wxs_evnt.cxx
+++ b/src/mred/wxs/wxs_evnt.cxx
@@ -96,6 +96,8 @@ wxMouseEvent_ext::wxMouseEvent_ext(int et, int ld, int mdd, int rd, int xv, int
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_evnt.h"
diff --git a/src/mred/wxs/wxs_fram.cxx b/src/mred/wxs/wxs_fram.cxx
index bc66fef37e..749f4b4b6c 100644
--- a/src/mred/wxs/wxs_fram.cxx
+++ b/src/mred/wxs/wxs_fram.cxx
@@ -26,6 +26,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_fram.h"
@@ -258,7 +260,7 @@ void os_wxFrame::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -414,7 +416,7 @@ void os_wxFrame::OnSetFocus()
     READY_TO_RETURN; ASSELF wxFrame::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -448,7 +450,7 @@ void os_wxFrame::OnKillFocus()
     READY_TO_RETURN; ASSELF wxFrame::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -660,7 +662,7 @@ void os_wxFrame::OnActivate(Bool x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = (x0 ? scheme_true : scheme_false);
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
diff --git a/src/mred/wxs/wxs_gage.cxx b/src/mred/wxs/wxs_gage.cxx
index c81a4da365..7cc9541ebf 100644
--- a/src/mred/wxs/wxs_gage.cxx
+++ b/src/mred/wxs/wxs_gage.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_gage.h"
@@ -203,7 +205,7 @@ void os_wxsGauge::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -359,7 +361,7 @@ void os_wxsGauge::OnSetFocus()
     READY_TO_RETURN; ASSELF wxsGauge::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -393,7 +395,7 @@ void os_wxsGauge::OnKillFocus()
     READY_TO_RETURN; ASSELF wxsGauge::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_gdi.cxx b/src/mred/wxs/wxs_gdi.cxx
index ee08e3efa9..b9acb128cd 100644
--- a/src/mred/wxs/wxs_gdi.cxx
+++ b/src/mred/wxs/wxs_gdi.cxx
@@ -31,6 +31,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_gdi.h"
diff --git a/src/mred/wxs/wxs_glob.cxx b/src/mred/wxs/wxs_glob.cxx
index 247cefdb77..59b34487db 100644
--- a/src/mred/wxs/wxs_glob.cxx
+++ b/src/mred/wxs/wxs_glob.cxx
@@ -34,6 +34,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_glob.h"
diff --git a/src/mred/wxs/wxs_item.cxx b/src/mred/wxs/wxs_item.cxx
index 93cd19cb85..be6c864219 100644
--- a/src/mred/wxs/wxs_item.cxx
+++ b/src/mred/wxs/wxs_item.cxx
@@ -26,6 +26,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_item.h"
@@ -397,7 +399,7 @@ void os_wxMessage::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -553,7 +555,7 @@ void os_wxMessage::OnSetFocus()
     READY_TO_RETURN; ASSELF wxMessage::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -587,7 +589,7 @@ void os_wxMessage::OnKillFocus()
     READY_TO_RETURN; ASSELF wxMessage::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_lbox.cxx b/src/mred/wxs/wxs_lbox.cxx
index 822552f62f..9b407808c6 100644
--- a/src/mred/wxs/wxs_lbox.cxx
+++ b/src/mred/wxs/wxs_lbox.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_lbox.h"
@@ -354,7 +356,7 @@ void os_wxListBox::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -510,7 +512,7 @@ void os_wxListBox::OnSetFocus()
     READY_TO_RETURN; ASSELF wxListBox::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -544,7 +546,7 @@ void os_wxListBox::OnKillFocus()
     READY_TO_RETURN; ASSELF wxListBox::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_madm.cxx b/src/mred/wxs/wxs_madm.cxx
index eafa31f257..a3cdb4a7c7 100644
--- a/src/mred/wxs/wxs_madm.cxx
+++ b/src/mred/wxs/wxs_madm.cxx
@@ -27,6 +27,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_madm.h"
@@ -309,7 +311,7 @@ void os_wxMediaCanvas::OnChar(class wxKeyEvent* x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_wxKeyEvent(x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -345,7 +347,7 @@ void os_wxMediaCanvas::OnEvent(class wxMouseEvent* x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_wxMouseEvent(x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -379,7 +381,7 @@ void os_wxMediaCanvas::OnPaint()
     READY_TO_RETURN; ASSELF wxMediaCanvas::OnPaint();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -415,7 +417,7 @@ void os_wxMediaCanvas::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -571,7 +573,7 @@ void os_wxMediaCanvas::OnSetFocus()
     READY_TO_RETURN; ASSELF wxMediaCanvas::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -605,7 +607,7 @@ void os_wxMediaCanvas::OnKillFocus()
     READY_TO_RETURN; ASSELF wxMediaCanvas::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_mede.cxx b/src/mred/wxs/wxs_mede.cxx
index 51f050ff84..18c4dff967 100644
--- a/src/mred/wxs/wxs_mede.cxx
+++ b/src/mred/wxs/wxs_mede.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_mede.h"
diff --git a/src/mred/wxs/wxs_medi.cxx b/src/mred/wxs/wxs_medi.cxx
index 0567f211c6..04ed059ec0 100644
--- a/src/mred/wxs/wxs_medi.cxx
+++ b/src/mred/wxs/wxs_medi.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_medi.h"
diff --git a/src/mred/wxs/wxs_menu.cxx b/src/mred/wxs/wxs_menu.cxx
index 0ff01f3ca1..cb0a50fbdb 100644
--- a/src/mred/wxs/wxs_menu.cxx
+++ b/src/mred/wxs/wxs_menu.cxx
@@ -32,6 +32,8 @@ START_XFORM_SKIP;
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #ifdef wx_mac
 # define MAC_UNUSED(x) /**/
diff --git a/src/mred/wxs/wxs_mio.cxx b/src/mred/wxs/wxs_mio.cxx
index 2655de7082..fc75ec6cbe 100644
--- a/src/mred/wxs/wxs_mio.cxx
+++ b/src/mred/wxs/wxs_mio.cxx
@@ -26,6 +26,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_mio.h"
diff --git a/src/mred/wxs/wxs_misc.cxx b/src/mred/wxs/wxs_misc.cxx
index 32f3537b95..8999f7cc4a 100644
--- a/src/mred/wxs/wxs_misc.cxx
+++ b/src/mred/wxs/wxs_misc.cxx
@@ -32,6 +32,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_misc.h"
diff --git a/src/mred/wxs/wxs_mpb.cxx b/src/mred/wxs/wxs_mpb.cxx
index 43dd70d390..fb729fa307 100644
--- a/src/mred/wxs/wxs_mpb.cxx
+++ b/src/mred/wxs/wxs_mpb.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_mpb.h"
diff --git a/src/mred/wxs/wxs_obj.cxx b/src/mred/wxs/wxs_obj.cxx
index 944088c2ef..30c017bc63 100644
--- a/src/mred/wxs/wxs_obj.cxx
+++ b/src/mred/wxs/wxs_obj.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_obj.h"
diff --git a/src/mred/wxs/wxs_panl.cxx b/src/mred/wxs/wxs_panl.cxx
index bf0302dcc4..77036e070c 100644
--- a/src/mred/wxs/wxs_panl.cxx
+++ b/src/mred/wxs/wxs_panl.cxx
@@ -27,6 +27,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_panl.h"
@@ -225,7 +227,7 @@ void os_wxPanel::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -381,7 +383,7 @@ void os_wxPanel::OnSetFocus()
     READY_TO_RETURN; ASSELF wxPanel::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -415,7 +417,7 @@ void os_wxPanel::OnKillFocus()
     READY_TO_RETURN; ASSELF wxPanel::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -1159,7 +1161,7 @@ void os_wxDialogBox::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -1315,7 +1317,7 @@ void os_wxDialogBox::OnSetFocus()
     READY_TO_RETURN; ASSELF wxDialogBox::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -1349,7 +1351,7 @@ void os_wxDialogBox::OnKillFocus()
     READY_TO_RETURN; ASSELF wxDialogBox::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -1423,7 +1425,7 @@ void os_wxDialogBox::OnActivate(Bool x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = (x0 ? scheme_true : scheme_false);
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
diff --git a/src/mred/wxs/wxs_rado.cxx b/src/mred/wxs/wxs_rado.cxx
index 51b4ca672d..10816ea348 100644
--- a/src/mred/wxs/wxs_rado.cxx
+++ b/src/mred/wxs/wxs_rado.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_rado.h"
@@ -420,7 +422,7 @@ void os_wxRadioBox::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -576,7 +578,7 @@ void os_wxRadioBox::OnSetFocus()
     READY_TO_RETURN; ASSELF wxRadioBox::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -610,7 +612,7 @@ void os_wxRadioBox::OnKillFocus()
     READY_TO_RETURN; ASSELF wxRadioBox::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_slid.cxx b/src/mred/wxs/wxs_slid.cxx
index 6111a71fcb..2db54b1116 100644
--- a/src/mred/wxs/wxs_slid.cxx
+++ b/src/mred/wxs/wxs_slid.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_slid.h"
@@ -191,7 +193,7 @@ void os_wxSlider::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -347,7 +349,7 @@ void os_wxSlider::OnSetFocus()
     READY_TO_RETURN; ASSELF wxSlider::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -381,7 +383,7 @@ void os_wxSlider::OnKillFocus()
     READY_TO_RETURN; ASSELF wxSlider::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_snip.cxx b/src/mred/wxs/wxs_snip.cxx
index f3fd6e9f95..96a7b568fd 100644
--- a/src/mred/wxs/wxs_snip.cxx
+++ b/src/mred/wxs/wxs_snip.cxx
@@ -25,6 +25,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_snip.h"
diff --git a/src/mred/wxs/wxs_styl.cxx b/src/mred/wxs/wxs_styl.cxx
index 7e3ccca333..48a628d13b 100644
--- a/src/mred/wxs/wxs_styl.cxx
+++ b/src/mred/wxs/wxs_styl.cxx
@@ -26,6 +26,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_styl.h"
diff --git a/src/mred/wxs/wxs_tabc.cxx b/src/mred/wxs/wxs_tabc.cxx
index f7d1e78d36..497bf18388 100644
--- a/src/mred/wxs/wxs_tabc.cxx
+++ b/src/mred/wxs/wxs_tabc.cxx
@@ -28,6 +28,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #ifdef wx_xt
 /* This calls won't be instantiated, but it must compile. */
@@ -339,7 +341,7 @@ void os_wxTabChoice::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -495,7 +497,7 @@ void os_wxTabChoice::OnSetFocus()
     READY_TO_RETURN; ASSELF wxTabChoice::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -529,7 +531,7 @@ void os_wxTabChoice::OnKillFocus()
     READY_TO_RETURN; ASSELF wxTabChoice::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -1188,7 +1190,7 @@ void os_wxGroupBox::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -1344,7 +1346,7 @@ void os_wxGroupBox::OnSetFocus()
     READY_TO_RETURN; ASSELF wxGroupBox::OnSetFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -1378,7 +1380,7 @@ void os_wxGroupBox::OnKillFocus()
     READY_TO_RETURN; ASSELF wxGroupBox::OnKillFocus();
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
diff --git a/src/mred/wxs/wxs_win.cxx b/src/mred/wxs/wxs_win.cxx
index 19dabaad20..329ba7a0d0 100644
--- a/src/mred/wxs/wxs_win.cxx
+++ b/src/mred/wxs/wxs_win.cxx
@@ -27,6 +27,8 @@
 
 
 
+#define ESCAPE_NO_RET_VAL /*empty*/
+
 
 #include "wxscheme.h"
 #include "wxs_win.h"
@@ -255,7 +257,7 @@ void os_wxWindow::OnDropFile(epathname x0)
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
   p[POFFSET+0] = WITH_VAR_STACK(objscheme_bundle_pathname((char *)x0));
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+1, p));
@@ -411,7 +413,7 @@ void os_wxWindow::OnSetFocus()
     { READY_TO_RETURN; return; }
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));
@@ -445,7 +447,7 @@ void os_wxWindow::OnKillFocus()
     { READY_TO_RETURN; return; }
   } else {
   mz_jmp_buf *savebuf, newbuf; Scheme_Thread *thread;
-  ESCAPE_BLOCK(/*empty*/)
+  ESCAPE_BLOCK(ESCAPE_NO_RET_VAL)
   p[0] = (Scheme_Object *) ASSELF __gc_external;
 
   v = WITH_VAR_STACK(scheme_apply(method, POFFSET+0, p));