Index: src/tests/concurrent/examples/.expect/boundedBufferEXT.txt
===================================================================
--- src/tests/concurrent/examples/.expect/boundedBufferEXT.txt	(revision 58caf1508228aec266374a43ea9e58f4f5a3f33a)
+++ src/tests/concurrent/examples/.expect/boundedBufferEXT.txt	(revision 552775975b142e0bb26e33a21d776351992df048)
@@ -1,79 +1,1 @@
-concurrent/examples/boundedBufferEXT.c:39:1 error: No alternatives for function in call to waitfor
-/u/pabuhr/software/cfa-cc/include/cfa/bits/containers.h:170:1 error: candidate function not viable: no mutex parameters
-forall
-  _6573_20_T: sized object type
-  ... with assertions
-    get_next: pointer to function
-    ... with parameters
-      reference to instance of type _6573_20_T (not function type) 
-    ... returning 
-      _retval_get_next: reference to pointer to instance of type _6573_20_T (not function type) 
-      ... with attributes: 
-        Attribute with name: unused
-
-
-
-  lvalue function
-... with parameters
-  this: reference to instance of struct __queue with body 1 
-  ... with parameters
-    instance of type _6573_20_T (not function type) 
-
-  it: pointer to pointer to instance of type _6573_20_T (not function type) 
-... returning 
-  _retval_remove: pointer to instance of type _6573_20_T (not function type) 
-  ... with attributes: 
-    Attribute with name: unused
-
-
-/usr/include/stdio.h:178:1 error: candidate function not viable: no mutex parameters
-lvalue function
-... with parameters
-  __filename: C pointer to const char
-... returning 
-  _retval_remove: signed int
-  ... with attributes: 
-    Attribute with name: unused
-
-
-concurrent/examples/boundedBufferEXT.c:47:1 error: No alternatives for function in call to waitfor
-concurrent/examples/boundedBufferEXT.c:37:1 error: candidate function not viable: too few mutex arguments
-forall
-  _6578_20_T: sized object type
-  ... with assertions
-    ?=?: pointer to function
-    ... with parameters
-      reference to instance of type _6578_20_T (not function type) 
-      instance of type _6578_20_T (not function type) 
-    ... returning 
-      _retval__operator_assign: instance of type _6578_20_T (not function type) 
-      ... with attributes: 
-        Attribute with name: unused
-
-
-    ?{}: pointer to function
-    ... with parameters
-      reference to instance of type _6578_20_T (not function type) 
-    ... returning nothing 
-
-    ?{}: pointer to function
-    ... with parameters
-      reference to instance of type _6578_20_T (not function type) 
-      instance of type _6578_20_T (not function type) 
-    ... returning nothing 
-
-    ^?{}: pointer to function
-    ... with parameters
-      reference to instance of type _6578_20_T (not function type) 
-    ... returning nothing 
-
-
-  lvalue function
-... with parameters
-  buffer: mutex reference to instance of struct Buffer with body 1 
-  ... with parameters
-    instance of type _6578_20_T (not function type) 
-
-  elem: instance of type _6578_20_T (not function type) 
-... returning nothing 
-
+total:400000
Index: src/tests/concurrent/examples/boundedBufferEXT.c
===================================================================
--- src/tests/concurrent/examples/boundedBufferEXT.c	(revision 58caf1508228aec266374a43ea9e58f4f5a3f33a)
+++ src/tests/concurrent/examples/boundedBufferEXT.c	(revision 552775975b142e0bb26e33a21d776351992df048)
@@ -1,8 +1,8 @@
-// 
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// boundedBufferEXT.c -- 
-// 
+//
+// boundedBufferEXT.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Apr 18 22:52:12 2018
@@ -10,5 +10,5 @@
 // Last Modified On : Fri Apr 20 22:25:14 2018
 // Update Count     : 6
-// 
+//
 
 #include <stdlib>										// random
@@ -39,5 +39,5 @@
 forall( otype T )
 void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-	if ( count == BufferSize ) waitfor( remove );
+	if ( count == BufferSize ) waitfor( remove, buffer );
 	elements[back] = elem;
 	back = ( back + 1 ) % BufferSize;
@@ -47,5 +47,5 @@
 forall( otype T )
 T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-	if ( count == 0 ) waitfor( insert );
+	if ( count == 0 ) waitfor( insert, buffer );
 	T elem = elements[front];
 	front = ( front + 1 ) % BufferSize;