Index: tests/exceptions/pingpong_nonlocal.cfa
===================================================================
--- tests/exceptions/pingpong_nonlocal.cfa	(revision d829c6dd7604997eb490d631335c27505c6d749c)
+++ tests/exceptions/pingpong_nonlocal.cfa	(revision bdbb448db74f30e04bb20f65e21f65932c69a824)
@@ -3,5 +3,4 @@
 #include <fstream.hfa>
 #include <mutex_stmt.hfa>
-#include <locks.hfa>
 
 exception num_ping_pongs { int num; };
@@ -15,6 +14,4 @@
 };
 
-semaphore sync{0};
-
 void ?{}( Ping_Pong & this, char * name ) with( this ) {
 	this.name = name;
@@ -23,12 +20,11 @@
 }
 
-int numtimes = 100;
+void main( Ping_Pong & this ) with( this ) {
+	enum { numtimes = 100 };
 
-void main( Ping_Pong & this ) with( this ) {
 	void inc_resume_at( int value ) {
 		except.num = value + 1;
 		resumeAt( partner, except );
 	}
-	// mutex( sout ) sout | name | "start"; // removed to get rid of output race
 	try {
 		for () {
@@ -45,5 +41,4 @@
 		}
 	}
-	// mutex( sout ) sout | name | "end"; // removed to get rid of output race
 }