Index: tests/concurrency/signal/block.cfa
===================================================================
--- tests/concurrency/signal/block.cfa	(revision c26bea2aa0f87b4b070349c5801adc32fb0d4cf9)
+++ tests/concurrency/signal/block.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
@@ -51,5 +51,5 @@
 
 //------------------------------------------------------------------------------
-void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
+void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned ) {
     wait( cond, (uintptr_t)active_thread() );
 
@@ -67,5 +67,5 @@
 
 thread Waiter {};
-void main( Waiter & this ) {
+void main( Waiter & ) {
 	for( int i = 0; TEST(i < N); i++ ) {
 		wait_op( globalA, globalB, i );
@@ -100,5 +100,5 @@
 
 thread Signaller {};
-void main( Signaller & this ) {
+void main( Signaller & ) {
 	while( !done ) {
 		signal_op( globalA, globalB );
@@ -112,5 +112,5 @@
 
 thread Barger {};
-void main( Barger & this ) {
+void main( Barger & ) {
 	for( unsigned i = 0; !done; i++ ) {
 		//Choose some monitor to barge into with some irregular pattern
@@ -123,5 +123,5 @@
 //------------------------------------------------------------------------------
 
-int main(int argc, char* argv[]) {
+int main() {
 	srandom( time( NULL ) );
 	done = false;
Index: tests/concurrency/signal/disjoint.cfa
===================================================================
--- tests/concurrency/signal/disjoint.cfa	(revision c26bea2aa0f87b4b070349c5801adc32fb0d4cf9)
+++ tests/concurrency/signal/disjoint.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
@@ -65,5 +65,5 @@
 }
 
-void main( Barger & this ) {
+void main( Barger & ) {
 	while( !all_done ) {
 		barge( globals.data );
@@ -93,5 +93,5 @@
 }
 
-void main( Waiter & this ) {
+void main( Waiter & ) {
 	while( wait( globals.mut, globals.data ) ) { KICK_WATCHDOG; yield(); }
 }
@@ -122,5 +122,5 @@
 }
 
-void main( Signaller & this ) {
+void main( Signaller & ) {
 	while( !all_done ) {
 		logic( globals.mut );
@@ -131,5 +131,5 @@
 //------------------------------------------------------------------------------
 // Main loop
-int main(int argc, char* argv[]) {
+int main() {
 	srandom( time( NULL ) );
 	all_done = false;
Index: tests/concurrency/signal/wait.cfa
===================================================================
--- tests/concurrency/signal/wait.cfa	(revision c26bea2aa0f87b4b070349c5801adc32fb0d4cf9)
+++ tests/concurrency/signal/wait.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
@@ -65,5 +65,5 @@
 //----------------------------------------------------------------------------------------------------
 // Signaler
-void main( Signaler & this ) {
+void main( Signaler & ) {
 
 	while( waiter_left != 0 ) {
@@ -92,5 +92,5 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter ABC
-void main( WaiterABC & this ) {
+void main( WaiterABC & ) {
 	for( int i = 0; TEST(i < N); i++ ) {
 		wait( condABC, globalA, globalB, globalC );
@@ -103,5 +103,5 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter AB
-void main( WaiterAB & this ) {
+void main( WaiterAB & ) {
 	for( int i = 0; TEST(i < N); i++ ) {
 		wait( condAB , globalA, globalB );
@@ -114,5 +114,5 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter AC
-void main( WaiterAC & this ) {
+void main( WaiterAC & ) {
 	for( int i = 0; TEST(i < N); i++ ) {
 		wait( condAC , globalA, globalC );
@@ -125,5 +125,5 @@
 //----------------------------------------------------------------------------------------------------
 // Waiter BC
-void main( WaiterBC & this ) {
+void main( WaiterBC & ) {
 	for( int i = 0; TEST(i < N); i++ ) {
 		wait( condBC , globalB, globalC );
@@ -136,5 +136,5 @@
 //----------------------------------------------------------------------------------------------------
 // Main
-int main(int argc, char* argv[]) {
+int main() {
 	srandom( time( NULL ) );
 	waiter_left = 4;