Index: src/tests/concurrent/examples/boundedBufferEXT.c
===================================================================
--- src/tests/concurrent/examples/boundedBufferEXT.c	(revision b9f383f02133e2fd12cbee9fc0753d823a608d5e)
+++ src/tests/concurrent/examples/boundedBufferEXT.c	(revision 68e9ace1ce267a16e6490d178a053859919e1241)
@@ -8,6 +8,6 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:25:14 2018
-// Update Count     : 6
+// Last Modified On : Wed May  2 16:12:58 2018
+// Update Count     : 7
 //
 
@@ -22,34 +22,30 @@
 enum { BufferSize = 50 };
 
-forall( otype T )
-monitor Buffer {
-	int front, back, count;
-	T elements[BufferSize];
-};
+forall( otype T ) {
+	monitor Buffer {
+		int front, back, count;
+		T elements[BufferSize];
+	}; // Buffer
 
-forall( otype T )
-void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
+	void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
 
-forall( otype T )
-int query( Buffer(T) & buffer ) { return buffer.count; }
+	int query( Buffer(T) & buffer ) { return buffer.count; } // read-only, no mutual exclusion
 
-forall( otype T )										// forward
-T remove( Buffer(T) & mutex buffer );
+	T remove( Buffer(T) & mutex buffer );				// forward
 
-forall( otype T )
-void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-	if ( count == BufferSize ) waitfor( remove, buffer );
-	elements[back] = elem;
-	back = ( back + 1 ) % BufferSize;
-	count += 1;
-}
+	void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
+		if ( count == BufferSize ) waitfor( remove, buffer );
+		elements[back] = elem;
+		back = ( back + 1 ) % BufferSize;
+		count += 1;
+	} // insert
 
-forall( otype T )
-T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-	if ( count == 0 ) waitfor( insert, buffer );
-	T elem = elements[front];
-	front = ( front + 1 ) % BufferSize;
-	count -= 1;
-	return elem;
+	T remove( Buffer(T) & mutex buffer ) with( buffer ) {
+		if ( count == 0 ) waitfor( insert, buffer );
+		T elem = elements[front];
+		front = ( front + 1 ) % BufferSize;
+		count -= 1;
+		return elem;
+	} // remove
 }
 
Index: src/tests/concurrent/examples/boundedBufferINT.c
===================================================================
--- src/tests/concurrent/examples/boundedBufferINT.c	(revision b9f383f02133e2fd12cbee9fc0753d823a608d5e)
+++ src/tests/concurrent/examples/boundedBufferINT.c	(revision 68e9ace1ce267a16e6490d178a053859919e1241)
@@ -8,6 +8,6 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:18:18 2018
-// Update Count     : 78
+// Last Modified On : Thu Apr 26 23:08:17 2018
+// Update Count     : 82
 //
 
@@ -22,34 +22,31 @@
 enum { BufferSize = 50 };
 
-forall( otype T )
-monitor Buffer {
-	condition full, empty;
-	int front, back, count;
-	T elements[BufferSize];
-};
+forall( otype T ) {
+	monitor Buffer {
+		condition full, empty;
+		int front, back, count;
+		T elements[BufferSize];
+	}; // Buffer
 
-forall( otype T )
-void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
+	void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
 
-forall( otype T )
-int query( Buffer(T) & buffer ) { return buffer.count; }
+	int query( Buffer(T) & buffer ) { return buffer.count; } // read-only, no mutual exclusion
 
-forall( otype T )
-void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-	if ( count == BufferSize ) wait( empty );
-	elements[back] = elem;
-	back = ( back + 1 ) % BufferSize;
-	count += 1;
-	signal( full );
-}
+	void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
+		if ( count == BufferSize ) wait( empty );
+		elements[back] = elem;
+		back = ( back + 1 ) % BufferSize;
+		count += 1;
+		signal( full );
+	} // insert
 
-forall( otype T )
-T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-	if ( count == 0 ) wait( full );
-	T elem = elements[front];
-	front = ( front + 1 ) % BufferSize;
-	count -= 1;
-	signal( empty );
-	return elem;
+	T remove( Buffer(T) & mutex buffer ) with( buffer ) {
+		if ( count == 0 ) wait( full );
+		T elem = elements[front];
+		front = ( front + 1 ) % BufferSize;
+		count -= 1;
+		signal( empty );
+		return elem;
+	} // remove
 }