Index: libcfa/src/bits/containers.hfa
===================================================================
--- libcfa/src/bits/containers.hfa	(revision da7454c9ddb30bc7658a647a83559efd03c17858)
+++ libcfa/src/bits/containers.hfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
@@ -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 da7454c9ddb30bc7658a647a83559efd03c17858)
+++ libcfa/src/concurrency/coroutine.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
@@ -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 da7454c9ddb30bc7658a647a83559efd03c17858)
+++ libcfa/src/concurrency/invoke.h	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
@@ -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;