Index: benchmark/schedext/cfa1.cfa
===================================================================
--- benchmark/schedext/cfa1.cfa	(revision dc33b5b1d92624f41baf064633127a4075fec592)
+++ benchmark/schedext/cfa1.cfa	(revision b4107c815918e9d1300f3381d29c2a863abf7de8)
@@ -6,6 +6,4 @@
 #include "bench.h"
 
-int argc;
-char** argv;
 volatile int go = 0;
 
@@ -17,12 +15,7 @@
 int  __attribute__((noinline)) wait( M & mutex a1 ) {
 	go = 1;
-	BENCH(
-		for ( i; n ) {
-			waitfor(call, a1);
-		},
-		result
-	)
-
-	printf("%g\n", result);
+	for ( i; times ) {
+		waitfor(call, a1);
+	}
 	go = 0;
 	return 0;
@@ -33,10 +26,18 @@
 void main( T & ) {
 	while(go == 0) { yield(); }
-	while(go == 1) { call(m1); }
-
+	BENCH(
+		while(go == 1) { call(m1); },
+		result
+	)
+	printf( "%g\n", result );
 }
 
-int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[]) {
+int main( int argc, char * argv[] ) {
+	BENCH_START()
 	T t;
-	return wait(m1);
+	return wait( m1 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: benchmark/schedext/cfa2.cfa
===================================================================
--- benchmark/schedext/cfa2.cfa	(revision dc33b5b1d92624f41baf064633127a4075fec592)
+++ benchmark/schedext/cfa2.cfa	(revision b4107c815918e9d1300f3381d29c2a863abf7de8)
@@ -6,6 +6,4 @@
 #include "bench.h"
 
-int argc;
-char** argv;
 volatile int go = 0;
 
@@ -17,12 +15,7 @@
 int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2 ) {
 	go = 1;
-	BENCH(
-		for ( i; n ) {
-			waitfor(call, a1, a2);
-		},
-		result
-	)
-
-	printf("%g\n", result);
+	for ( i; times ) {
+		waitfor(call, a1, a2);
+	}
 	go = 0;
 	return 0;
@@ -33,10 +26,18 @@
 void main( T & ) {
 	while(go == 0) { yield(); }
-	while(go == 1) { call(m1, m2); }
-
+	BENCH(
+		while(go == 1) { call(m1, m2); },
+		result
+	)
+	printf( "%g\n", result );
 }
 
-int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[]) {
+int main( int argc, char * argv[] ) {
+	BENCH_START()
 	T t;
-	return wait(m1, m2);
+	return wait( m1, m2 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: benchmark/schedext/cfa4.cfa
===================================================================
--- benchmark/schedext/cfa4.cfa	(revision dc33b5b1d92624f41baf064633127a4075fec592)
+++ benchmark/schedext/cfa4.cfa	(revision b4107c815918e9d1300f3381d29c2a863abf7de8)
@@ -6,6 +6,4 @@
 #include "bench.h"
 
-int argc;
-char** argv;
 volatile int go = 0;
 
@@ -17,12 +15,7 @@
 int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2, M & mutex a3, M & mutex a4 ) {
 	go = 1;
-	BENCH(
-		for ( i; n ) {
-			waitfor(call, a1, a2, a3, a4);
-		},
-		result
-	)
-
-	printf("%g\n", result);
+	for ( i; times ) {
+		waitfor( call, a1, a2, a3, a4 );
+	}
 	go = 0;
 	return 0;
@@ -33,10 +26,18 @@
 void main( T & ) {
 	while(go == 0) { yield(); }
-	while(go == 1) { call(m1, m2, m3, m4); }
-
+	BENCH(
+		while(go == 1) { call(m1, m2, m3, m4); },
+		result
+	)
+	printf( "%g\n", result );
 }
 
-int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[]) {
+int main( int argc, char * argv[] ) {
+	BENCH_START()
 	T t;
-	return wait(m1, m2, m3, m4);
+	return wait( m1, m2, m3, m4 );
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //
Index: benchmark/schedext/upp.cc
===================================================================
--- benchmark/schedext/upp.cc	(revision dc33b5b1d92624f41baf064633127a4075fec592)
+++ benchmark/schedext/upp.cc	(revision b4107c815918e9d1300f3381d29c2a863abf7de8)
@@ -3,6 +3,4 @@
 #include "bench.h"
 
-int argc;
-char** argv;
 volatile int go = 0;
 
@@ -13,12 +11,7 @@
 	int __attribute__((noinline)) wait() {
 		go = 1;
-		BENCH(
-			for (size_t i = 0; i < n; i++) {
-				_Accept(call);
-			},
-			result
-		)
-
-		printf("%g\n", result);
+		for (size_t i = 0; i < times; i++) {
+			_Accept(call);
+		}
 		go = 0;
 		return 0;
@@ -31,13 +24,19 @@
 	void main() {
 		while(go == 0) { yield(); }
-		while(go == 1) { m.call(); }
-
+		BENCH(
+			while(go == 1) { m.call(); },
+			result
+		)
+		printf( "%g\n", result );
 	}
 };
 
-int main(int margc, char* margv[]) {
-	argc = margc;
-	argv = margv;
+int main( int argc, char * argv[] ) {
+	BENCH_START()
 	T t;
 	return m.wait();
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //