Index: libcfa/src/bits/containers.hfa
===================================================================
--- libcfa/src/bits/containers.hfa	(revision a78c3ff302ed8743ba3d0a600fbf31010e04a554)
+++ libcfa/src/bits/containers.hfa	(revision 6855d1455be4d89a0b6e1d93e0e84c54347ccc42)
@@ -17,5 +17,5 @@
 #include "bits/align.hfa"
 #include "bits/defs.hfa"
-
+#include <stdio.h>
 //-----------------------------------------------------------------------------
 // Array
@@ -146,23 +146,23 @@
 	static inline forall( dtype T | is_node(T) ) {
 		void ?{}( __queue(T) & this ) with( this ) {
-			head{ 1p };
-			tail{ &head };
-			verify(*tail == 1p);
+			(this.head){ 1p };
+			(this.tail){ &this.head };
+			verify(*this.tail == 1p);
 		}
 
 		void append( __queue(T) & this, T * val ) with( this ) {
-			verify(tail != 0p);
-			verify(*tail == 1p);
-			*tail = val;
-			tail = &get_next( *val );
-			*tail = 1p;
+			verify(this.tail != 0p);
+			verify(*this.tail == 1p);
+			*this.tail = val;
+			this.tail = &get_next( *val );
+			*this.tail = 1p;
 		}
 
 		T * peek( __queue(T) & this ) {
 			verify(*this.tail == 1p);
-			T * head = this.head;
-			if( head != 1p ) {
+			T * front = this.head;
+			if( front != 1p ) {
 				verify(*this.tail == 1p);
-				return head;
+				return front;
 			}
 			verify(*this.tail == 1p);
@@ -172,14 +172,14 @@
 		T * pop_head( __queue(T) & this ) {
 			verify(*this.tail == 1p);
-			T * head = this.head;
-			if( head != 1p ) {
-				this.head = get_next( *head );
-				if( get_next( *head ) == 1p ) {
+			T * _head = this.head;
+			if( _head != 1p ) {
+				this.head = get_next( *_head );
+				if( get_next( *_head ) == 1p ) {
 					this.tail = &this.head;
 				}
-				get_next( *head ) = 0p;
+				get_next( *_head ) = 0p;
 				verify(*this.tail == 1p);
-				verify( get_next(*head) == 0p );
-				return head;
+				verify( get_next(*_head) == 0p );
+				return _head;
 			}
 			verify(*this.tail == 1p);
@@ -193,12 +193,12 @@
 			(*it) = get_next( *val );
 
-			if( tail == &get_next( *val ) ) {
-				tail = it;
+			if( this.tail == &get_next( *val ) ) {
+				this.tail = it;
 			}
 
 			get_next( *val ) = 0p;
 
-			verify( (head == 1p) == (&head == tail) );
-			verify( *tail == 1p );
+			verify( (this.head == 1p) == (&this.head == this.tail) );
+			verify( *this.tail == 1p );
 			return val;
 		}
@@ -239,5 +239,5 @@
 	forall(dtype T )
 	static inline [void] ?{}( __dllist(T) & this, * [T * & next, T * & prev] ( T & ) __get ) {
-		this.head{ 0p };
+		(this.head){ 0p };
 		this.__get = __get;
 	}
@@ -248,11 +248,11 @@
 		void push_front( __dllist(T) & this, T & node ) with( this ) {
 			verify(__get);
-			if ( head ) {
-				__get( node ).next = head;
-				__get( node ).prev = __get( *head ).prev;
+			if ( this.head ) {
+				__get( node ).next = this.head;
+				__get( node ).prev = __get( *this.head ).prev;
 				// inserted node must be consistent before it is seen
 				// prevent code movement across barrier
 				asm( "" : : : "memory" );
-				__get( *head ).prev = &node;
+				__get( *this.head ).prev = &node;
 				T & _prev = *__get( node ).prev;
 				__get( _prev ).next = &node;
@@ -264,14 +264,14 @@
 			// prevent code movement across barrier
 			asm( "" : : : "memory" );
-			head = &node;
+			this.head = &node;
 		}
 
 		void remove( __dllist(T) & this, T & node ) with( this ) {
 			verify(__get);
-			if ( &node == head ) {
-				if ( __get( *head ).next == head ) {
-					head = 0p;
+			if ( &node == this.head ) {
+				if ( __get( *this.head ).next == this.head ) {
+					this.head = 0p;
 				} else {
-					head = __get( *head ).next;
+					this.head = __get( *this.head ).next;
 				}
 			}