Index: src/libcfa/bits/containers.h
===================================================================
--- src/libcfa/bits/containers.h	(revision 490d99729cba8af56a1a5d642351adb4bdf5e6d6)
+++ src/libcfa/bits/containers.h	(revision f792cb8b86c581d70e5ef5363e56f8cec6130951)
@@ -140,15 +140,16 @@
 
 #ifdef __cforall
+
 	forall(dtype T | is_node(T))
-	static inline void ?{}( __queue(T) & this ) {
-		(this.head){ NULL };
-		(this.tail){ &this.head };
+	static inline void ?{}( __queue(T) & this ) with( this ) {
+		head{ NULL };
+		tail{ &head };
 	}
 
 	forall(dtype T | is_node(T) | sized(T))
-	static inline void append( __queue(T) & this, T * val ) {
-		verify(this.tail != NULL);
-		*this.tail = val;
-		this.tail = &get_next( *val );
+	static inline void append( __queue(T) & this, T * val ) with( this ) {
+		verify(tail != NULL);
+		*tail = val;
+		tail = &get_next( *val );
 	}
 
@@ -167,5 +168,5 @@
 
 	forall(dtype T | is_node(T) | sized(T))
-	static inline T * remove( __queue(T) & this, T ** it ) {
+	static inline T * remove( __queue(T) & this, T ** it ) with( this ) {
 		T * val = *it;
 		verify( val );
@@ -173,13 +174,20 @@
 		(*it) = get_next( *val );
 
-		if( this.tail == &get_next( *val ) ) {
-			this.tail = it;
+		if( tail == &get_next( *val ) ) {
+			tail = it;
 		}
 
 		get_next( *val ) = NULL;
 
-		verify( (this.head == NULL) == (&this.head == this.tail) );
-		verify( *this.tail == NULL );
+		verify( (head == NULL) == (&head == tail) );
+		verify( *tail == NULL );
 		return val;
 	}
 #endif
+
+//-----------------------------------------------------------------------------
+// Tools
+//-----------------------------------------------------------------------------
+#ifdef __cforall
+
+#endif