Index: libcfa/src/bits/collection.hfa
===================================================================
--- libcfa/src/bits/collection.hfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ libcfa/src/bits/collection.hfa	(revision b1f225e5f4826e36c0f6269f224ed145c0a85624)
@@ -26,11 +26,11 @@
 	// PUBLIC
 
-	void ?{}( Colable & co ) with( co ) {
-		next = 0p;
+	void ?{}( Colable & co ) {
+		co.next = 0p;
 	} // post: ! listed()
 
 	// return true iff *this is an element of a collection
-	bool listed( Colable & co ) with( co ) {			// pre: this != 0
-		return next != 0p;
+	bool listed( Colable & co ) {						// pre: this != 0
+		return co.next != 0p;
 	}
 
Index: libcfa/src/bits/queue.hfa
===================================================================
--- libcfa/src/bits/queue.hfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ libcfa/src/bits/queue.hfa	(revision b1f225e5f4826e36c0f6269f224ed145c0a85624)
@@ -24,11 +24,11 @@
 		Queue(T) & ?=?( const Queue(T) & ) = void;		// no assignment
 
-		void ?{}( Queue(T) & q ) with( q ) {
+		void ?{}( Queue(T) & q ) {
 			((Collection &)q){};
-			last = 0p;
+			q.last = 0p;
 		} // post: empty()
 
-		T & tail( Queue(T) & q ) with( q ) {
-			return *last;
+		T & tail( Queue(T) & q ) {
+			return *q.last;
 		}
 
@@ -46,5 +46,5 @@
 			if ( listed( &n ) ) abort( "(Queue &)%p.addHead( %p ) : Node is already on another list.", &q, &n );
 			#endif // __CFA_DEBUG__
-			if ( last ) {
+			if ( q.last ) {
 				Next( &n ) = &head( q );
 				q.root = &n;
@@ -60,5 +60,5 @@
 			if ( listed( &n ) ) abort( "(Queue &)%p.addTail( %p ) : Node is already on another list.", &q, &n );
 			#endif // __CFA_DEBUG__
-			if ( last ) Next( last ) = &n;
+			if ( q.last ) Next( last ) = &n;
 			else root = &n;
 			last = &n;