Index: src/tests/concurrent/examples/datingService.c
===================================================================
--- src/tests/concurrent/examples/datingService.c	(revision 971d9f249718f6c7c8e1c2e69360467dab69c8ab)
+++ src/tests/concurrent/examples/datingService.c	(revision 5e1adb5cd4646216dbea029a925fcba958df0bc6)
@@ -1,3 +1,2 @@
-//                               -*- Mode: C -*-
 //
 // The contents of this file are covered under the licence agreement in the
@@ -9,6 +8,6 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  5 23:06:40 2017
-// Update Count     : 18
+// Last Modified On : Wed Dec  6 12:19:19 2017
+// Update Count     : 21
 //
 
@@ -27,10 +26,10 @@
 
 unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
-	if ( is_empty( Boys[ccode] ) ) {
-		wait( Girls[ccode] );
-		GirlPhoneNo = PhoneNo;
+	if ( is_empty( Boys[ccode] ) ) {					// no compatible boy ?
+		wait( Girls[ccode] );							// wait for boy
+		GirlPhoneNo = PhoneNo;							// make phone number available
 	} else {
-		GirlPhoneNo = PhoneNo;
-		signal_block( Boys[ccode] );
+		GirlPhoneNo = PhoneNo;							// make phone number available
+		signal_block( Boys[ccode] );					// restart boy to set phone number
 	} // if
 	return BoyPhoneNo;
@@ -38,10 +37,10 @@
 
 unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
-	if ( is_empty( Girls[ccode] ) ) {
-		wait( Boys[ccode] );
-		BoyPhoneNo = PhoneNo;
+	if ( is_empty( Girls[ccode] ) ) {					// no compatible girl ?
+		wait( Boys[ccode] );							// wait for girl
+		BoyPhoneNo = PhoneNo;							// make phone number available
 	} else {
-		BoyPhoneNo = PhoneNo;
-		signal_block( Girls[ccode] );
+		BoyPhoneNo = PhoneNo;							// make phone number available
+		signal_block( Girls[ccode] );					// restart girl to set phone number
 	} // if
 	return GirlPhoneNo;
@@ -56,9 +55,9 @@
 }; // Girl
 
-void main( Girl & g ) {
+void main( Girl & g ) with( g ) {
 	yield( random( 100 ) );								// don't all start at the same time
-	unsigned int partner = girl( g.TheExchange, g.id, g.ccode );
-	sout | "Girl:" | g.id | "is dating Boy at" | partner | "with ccode" | g.ccode | endl;
-	girlck[g.id] = partner;
+	unsigned int partner = girl( TheExchange, id, ccode );
+	sout | "Girl:" | id | "is dating Boy at" | partner | "with ccode" | ccode | endl;
+	girlck[id] = partner;
 } // Girl main
 
@@ -74,9 +73,9 @@
 }; // Boy
 
-void main( Boy & b ) {
+void main( Boy & b ) with( b ) {
 	yield( random( 100 ) );								// don't all start at the same time
-	unsigned int partner = boy( b.TheExchange, b.id, b.ccode );
-	sout | " Boy:" | b.id | "is dating Girl" | partner | "with ccode" | b.ccode | endl;
-	boyck[b.id] = partner;
+	unsigned int partner = boy( TheExchange, id, ccode );
+	sout | " Boy:" | id | "is dating Girl" | partner | "with ccode" | ccode | endl;
+	boyck[id] = partner;
 } // Boy main