Index: src/benchmark/CorCtxSwitch.c
===================================================================
--- src/benchmark/CorCtxSwitch.c	(revision a933dcf4f76c961f7d549e1d12cb5c25c204c120)
+++ src/benchmark/CorCtxSwitch.c	(revision b510ac21094653b18e29c3b67620782c3b61acb3)
@@ -23,9 +23,5 @@
 } // Time
 
-struct GreatSuspender {
-	coroutine_desc __cor;
-};
-
-DECL_COROUTINE(GreatSuspender);
+coroutine GreatSuspender {};
 
 void ?{}( GreatSuspender * this ) {
Index: src/benchmark/bench.c
===================================================================
--- src/benchmark/bench.c	(revision a933dcf4f76c961f7d549e1d12cb5c25c204c120)
+++ src/benchmark/bench.c	(revision b510ac21094653b18e29c3b67620782c3b61acb3)
@@ -86,6 +86,5 @@
 //=======================================
 
-struct CoroutineDummy { coroutine_desc __cor; };
-DECL_COROUTINE(CoroutineDummy);
+coroutine CoroutineDummy {};
 void main(CoroutineDummy * this) {}
 
@@ -117,10 +116,7 @@
 }
 
-struct CoroutineResume {
+coroutine CoroutineResume {
     int N;
-    coroutine_desc __cor;
 };
-
-DECL_COROUTINE(CoroutineResume);
 
 void ?{}(CoroutineResume* this, int N) {
@@ -150,6 +146,5 @@
 //=======================================
 
-struct ThreadDummy { thread_desc __thrd; };
-DECL_THREAD(ThreadDummy);
+thread ThreadDummy {};
 void main(ThreadDummy * this) {}
 
@@ -177,11 +172,8 @@
 }
 
-struct ContextSwitch {
+thread ContextSwitch {
     int N;
     long long result;
-    thread_desc __thrd;
 };
-
-DECL_THREAD(ContextSwitch);
 
 void main(ContextSwitch * this) {    
@@ -241,5 +233,5 @@
 	DynamicTaskCreateDelete( NoOfTimes );
 	{
-		scoped(ContextSwitch) dummy = { (int)NoOfTimes };		// context switch
+		ContextSwitch dummy = { (int)NoOfTimes };		// context switch
 	}
 	sout | "\t" | endl;
Index: src/benchmark/csv-data.c
===================================================================
--- src/benchmark/csv-data.c	(revision a933dcf4f76c961f7d549e1d12cb5c25c204c120)
+++ src/benchmark/csv-data.c	(revision b510ac21094653b18e29c3b67620782c3b61acb3)
@@ -25,9 +25,5 @@
 } // Time
 
-struct GreatSuspender {
-	coroutine_desc __cor;
-};
-
-DECL_COROUTINE(GreatSuspender);
+coroutine GreatSuspender {};
 
 void ?{}( GreatSuspender * this ) {