Index: libcfa/src/bits/containers.hfa
===================================================================
--- libcfa/src/bits/containers.hfa	(revision 64dc36ed2ecb7e642eb4675791fbbcad90b42e5a)
+++ libcfa/src/bits/containers.hfa	(revision 285643823801603b4d8a46ac537556bd45ced9df)
@@ -78,5 +78,5 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-	forall(dtype TYPE | is_node(TYPE))
+	forall(dtype TYPE)
 	#define T TYPE
 #else
@@ -95,5 +95,5 @@
 
 #ifdef __cforall
-	forall(dtype T | is_node(T))
+	forall(dtype T)
 	static inline void ?{}( __stack(T) & this ) {
 		(this.top){ NULL };
@@ -122,5 +122,5 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-	forall(dtype TYPE | is_node(TYPE))
+	forall(dtype TYPE)
 	#define T TYPE
 #else
@@ -141,5 +141,5 @@
 #ifdef __cforall
 
-	forall(dtype T | is_node(T))
+	forall(dtype T)
 	static inline void ?{}( __queue(T) & this ) with( this ) {
 		head{ NULL };
Index: libcfa/src/concurrency/coroutine.cfa
===================================================================
--- libcfa/src/concurrency/coroutine.cfa	(revision 64dc36ed2ecb7e642eb4675791fbbcad90b42e5a)
+++ libcfa/src/concurrency/coroutine.cfa	(revision 285643823801603b4d8a46ac537556bd45ced9df)
@@ -98,5 +98,5 @@
 
 void ^?{}(coroutine_desc& this) {
-	if(this.state != Halted && this.state != Start) {
+	if(this.state != Halted && this.state != Start && this.state != Primed) {
 		coroutine_desc * src = TL_GET( this_thread )->curr_cor;
 		coroutine_desc * dst = &this;
Index: libcfa/src/concurrency/invoke.h
===================================================================
--- libcfa/src/concurrency/invoke.h	(revision 64dc36ed2ecb7e642eb4675791fbbcad90b42e5a)
+++ libcfa/src/concurrency/invoke.h	(revision 285643823801603b4d8a46ac537556bd45ced9df)
@@ -46,7 +46,4 @@
 	#ifdef __cforall
 	extern "Cforall" {
-		static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-		static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
 		extern thread_local struct KernelThreadData {
 			struct thread_desc    * volatile this_thread;
Index: src/main.cc
===================================================================
--- src/main.cc	(revision 64dc36ed2ecb7e642eb4675791fbbcad90b42e5a)
+++ src/main.cc	(revision 285643823801603b4d8a46ac537556bd45ced9df)
@@ -454,23 +454,24 @@
 	const char * descript;
 } printopts[] = {
-	{ "altexpr", expraltp, true, "alternatives for expressions" },
-	{ "ascodegen", codegenp, true, "as codegen rather than AST" },
-	{ "ast", astp, true, "AST after parsing" },
-	{ "astdecl", validp, true, "AST after declaration validation pass" },
-	{ "asterr", errorp, true, "AST on error" },
-	{ "astexpr", exprp, true, "AST after expression analysis" },
-	{ "astgen", genericsp, true, "AST after instantiate generics" },
-	{ "box", bboxp, true, "before box step" },
-	{ "ctordtor", ctorinitp, true, "after ctor/dtor are replaced" },
-	{ "codegen", bcodegenp, true, "before code generation" },
+	{ "ascodegen", codegenp, true, "print AST as codegen rather than AST" },
+	{ "asterr", errorp, true, "print AST on error" },
 	{ "declstats", declstatsp, true, "code property statistics" },
 	{ "parse", yydebug, true, "yacc (parsing) debug information" },
 	{ "pretty", prettycodegenp, true, "prettyprint for ascodegen flag" },
-	{ "resolver", bresolvep, true, "before resolver step" },
 	{ "rproto", resolvprotop, true, "resolver-proto instance" },
-	{ "rsteps", resolvep, true, "resolver steps" },
-	{ "symevt", symtabp, true, "symbol table events" },
-	{ "tree", parsep, true, "parse tree" },
-	{ "tuple", tuplep, true, "after tuple expansion" },
+	{ "rsteps", resolvep, true, "print resolver steps" },
+	{ "tree", parsep, true, "print parse tree" },
+	// code dumps
+	{ "ast", astp, true, "print AST after parsing" },
+	{ "symevt", symtabp, true, "print AST after symbol table events" },
+	{ "altexpr", expraltp, true, "print alternatives for expressions" },
+	{ "astdecl", validp, true, "print AST after declaration validation pass" },
+	{ "resolver", bresolvep, true, "print AST before resolver step" },
+	{ "astexpr", exprp, true, "print AST after expression analysis" },
+	{ "ctordtor", ctorinitp, true, "print AST after ctor/dtor are replaced" },
+	{ "tuple", tuplep, true, "print AST after tuple expansion" },
+	{ "astgen", genericsp, true, "print AST after instantiate generics" },
+	{ "box", bboxp, true, "print AST before box step" },
+	{ "codegen", bcodegenp, true, "print AST before code generation" },
 };
 enum { printoptsSize = sizeof( printopts ) / sizeof( printopts[0] ) };