Index: tests/heap.cfa
===================================================================
--- tests/heap.cfa	(revision ff3690754311ae604ca0a7348c0165ba78d2b4ab)
+++ tests/heap.cfa	(revision dbedd71eec11b42a0fc8dee56304dfcd8c0dc084)
@@ -10,6 +10,6 @@
 // Created On       : Tue Nov  6 17:54:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 15 12:11:51 2020
-// Update Count     : 79
+// Last Modified On : Wed Aug 10 09:57:01 2022
+// Update Count     : 86
 // 
 
@@ -26,12 +26,4 @@
 // 	return __CFA_DEFAULT_PREEMPTION__;
 // }
-
-size_t default_heap_expansion() {
-	return 10 * 1024 * 1024;
-} // default_heap_expansion
-
-size_t default_mmap_start() {
-	return 512 * 1024 + 1;
-} // default_mmap_start
 
 thread Worker {
@@ -66,5 +58,5 @@
 			for ( k; i ) locns[i][k] = '\345';
 		} // for
-		for ( i; NoOfAllocs - 1 -~= 0 ) {
+		for ( i; -~= NoOfAllocs - 1 ) {
 			//sout | (void *)locns[i];
 			for ( k; i ) if ( locns[i][k] != '\345' ) abort( "new/delete corrupt storage2" );
@@ -99,5 +91,5 @@
 
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		char * area = (char *)malloc( s );
 		area[0] = '\345'; area[s - 1] = '\345';			// fill first/last
@@ -107,5 +99,5 @@
 
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		locns[i] = (char *)malloc( s );
 		locns[i][0] = '\345'; locns[i][s - 1] = '\345';	// fill first/last
@@ -113,5 +105,5 @@
 	} // for
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
 			 locns[i][malloc_usable_size( locns[i] ) - 1] != '\345' ) abort( "malloc/free corrupt storage" );
@@ -151,5 +143,5 @@
 
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		char * area = (char *)calloc( 1, s );
 		if ( area[0] != '\0' || area[s - 1] != '\0' ) abort( "calloc/free corrupt storage4.1" );
@@ -162,5 +154,5 @@
 
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		locns[i] = (char *)calloc( 1, s );
 		if ( locns[i][0] != '\0' || locns[i][s - 1] != '\0' ||
@@ -171,5 +163,5 @@
 	} // for
 	for ( i; NoOfMmaps ) {
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		if ( locns[i][0] != '\345' || locns[i][s - 1] != '\345' ||
 			 locns[i][malloc_usable_size( locns[i] ) - 1] != '\345' ) abort( "calloc/free corrupt storage6" );
@@ -198,5 +190,5 @@
 		//sout | alignments[a];
 		for ( i; 1 ~ NoOfMmaps ) {
-			size_t s = i + default_mmap_start();		// cross over point
+			size_t s = i + malloc_mmap_start();		// cross over point
 			char * area = (char *)memalign( a, s );
 			//sout | i | area;
@@ -232,5 +224,5 @@
 	for ( i; 2 ~ NoOfAllocs ~ 12 ) {
 		// initial N byte allocation
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		char * area = (char *)malloc( s );
 		area[0] = '\345'; area[s - 1] = '\345';			// fill first/penultimate byte
@@ -269,5 +261,5 @@
 	for ( i; 2 ~ NoOfAllocs ~ 12 ) {
 		// initial N byte allocation
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		char * area = (char *)malloc( s );
 		area[0] = '\345'; area[s - 1] = '\345';			// fill first/penultimate byte
@@ -307,5 +299,5 @@
 	for ( i; 1 ~ 10_000 ~ 12 ) {
 		// initial N byte allocation
-		size_t s = i + default_mmap_start();			// cross over point
+		size_t s = i + malloc_mmap_start();			// cross over point
 		char * area = (char *)calloc( 1, s );
 		if ( area[0] != '\0' || area[s - 1] != '\0' ||
@@ -481,5 +473,5 @@
 
 int main() {
-	const unsigned int NoOfWorkers = 4;
+	enum { NoOfWorkers = 4 };
 	{
 		processor processors[NoOfWorkers - 1] __attribute__(( unused )); // more than one processor