Index: libcfa/src/collections/string_res.cfa
===================================================================
--- libcfa/src/collections/string_res.cfa	(revision 38951c316de3e4ae1583d45726880474bcdeba7c)
+++ libcfa/src/collections/string_res.cfa	(revision 06280adaadd325290fe5bd8958152ae76cb84100)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan  2 13:20:27 2024
-// Update Count     : 34
+// Last Modified On : Tue Jan 16 22:19:27 2024
+// Update Count     : 35
 //
 
@@ -180,5 +180,5 @@
 
 size_t DEBUG_string_bytes_avail_until_gc( VbyteHeap * heap ) {
-    return ((char*)heap->ExtVbyte) - heap->EndVbyte;
+    return ((char *)heap->ExtVbyte) - heap->EndVbyte;
 }
 
@@ -229,5 +229,5 @@
 
         // rest of heap is available to read into
-        int lenReadable = (char*)temp.Handle.ulink->ExtVbyte - temp.Handle.ulink->EndVbyte;
+        int lenReadable = (char *)temp.Handle.ulink->ExtVbyte - temp.Handle.ulink->EndVbyte;
         assert (lenReadable >= 2);
 
@@ -315,5 +315,5 @@
 }
 
-static void eagerCopyCtorHelper(string_res & s, const char* rhs, size_t rhslnth) with(s) {
+static void eagerCopyCtorHelper(string_res & s, const char * rhs, size_t rhslnth) with(s) {
     if( ambient_string_sharectx->activeHeap ) {
         (Handle){ * ambient_string_sharectx->activeHeap };
@@ -331,10 +331,10 @@
 
 // Constructor from a raw buffer and size
-void ?{}(string_res & s, const char* rhs, size_t rhslnth) with(s) {
+void ?{}(string_res & s, const char * rhs, size_t rhslnth) with(s) {
     eagerCopyCtorHelper(s, rhs, rhslnth);
 }
 
 // private ctor (not in header): use specified heap (ignore ambient) and copy chars in
-void ?{}( string_res & s, VbyteHeap & heap, const char* rhs, size_t rhslnth ) with(s) {
+void ?{}( string_res & s, VbyteHeap & heap, const char * rhs, size_t rhslnth ) with(s) {
     (Handle){ heap };
     Handle.s = VbyteAlloc(*Handle.ulink, rhslnth);
@@ -479,5 +479,5 @@
 }
 
-static string_res & assign_(string_res & s, const char* buffer, size_t bsize, const string_res & valSrc) {
+static string_res & assign_(string_res & s, const char * buffer, size_t bsize, const string_res & valSrc) {
 
     string_res * shareEditSetStartPeer;
@@ -563,5 +563,5 @@
 }
 
-string_res & assign(string_res & s, const char* buffer, size_t bsize) {
+string_res & assign(string_res & s, const char * buffer, size_t bsize) {
     return assign_(s, buffer, bsize, *0p);
 }
@@ -668,27 +668,27 @@
 bool ?<? (const string_res & s1, const string_res & s2) { return strcmp(s1, s2) <  0; }
 
-int strcmp (const string_res & s1, const char* s2) {
+int strcmp (const string_res & s1, const char * s2) {
     string_res s2x = s2;
     return strcmp(s1, s2x);
 }
 
-bool ?==?(const string_res & s1, const char* s2) { return strcmp(s1, s2) == 0; }
-bool ?!=?(const string_res & s1, const char* s2) { return strcmp(s1, s2) != 0; }
-bool ?>? (const string_res & s1, const char* s2) { return strcmp(s1, s2) >  0; }
-bool ?>=?(const string_res & s1, const char* s2) { return strcmp(s1, s2) >= 0; }
-bool ?<=?(const string_res & s1, const char* s2) { return strcmp(s1, s2) <= 0; }
-bool ?<? (const string_res & s1, const char* s2) { return strcmp(s1, s2) <  0; }
-
-int strcmp (const char* s1, const string_res & s2) {
+bool ?==?(const string_res & s1, const char * s2) { return strcmp(s1, s2) == 0; }
+bool ?!=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) != 0; }
+bool ?>? (const string_res & s1, const char * s2) { return strcmp(s1, s2) >  0; }
+bool ?>=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) >= 0; }
+bool ?<=?(const string_res & s1, const char * s2) { return strcmp(s1, s2) <= 0; }
+bool ?<? (const string_res & s1, const char * s2) { return strcmp(s1, s2) <  0; }
+
+int strcmp (const char * s1, const string_res & s2) {
     string_res s1x = s1;
     return strcmp(s1x, s2);
 }
 
-bool ?==?(const char* s1, const string_res & s2) { return strcmp(s1, s2) == 0; }
-bool ?!=?(const char* s1, const string_res & s2) { return strcmp(s1, s2) != 0; }
-bool ?>? (const char* s1, const string_res & s2) { return strcmp(s1, s2) >  0; }
-bool ?>=?(const char* s1, const string_res & s2) { return strcmp(s1, s2) >= 0; }
-bool ?<=?(const char* s1, const string_res & s2) { return strcmp(s1, s2) <= 0; }
-bool ?<? (const char* s1, const string_res & s2) { return strcmp(s1, s2) <  0; }
+bool ?==?(const char * s1, const string_res & s2) { return strcmp(s1, s2) == 0; }
+bool ?!=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) != 0; }
+bool ?>? (const char * s1, const string_res & s2) { return strcmp(s1, s2) >  0; }
+bool ?>=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) >= 0; }
+bool ?<=?(const char * s1, const string_res & s2) { return strcmp(s1, s2) <= 0; }
+bool ?<? (const char * s1, const string_res & s2) { return strcmp(s1, s2) <  0; }
 
 
@@ -727,16 +727,16 @@
 }
 
-int find(const string_res & s, const char* search) {
+int find(const string_res & s, const char * search) {
     return findFrom(s, 0, search);
 }
-int findFrom(const string_res & s, size_t fromPos, const char* search) {
+int findFrom(const string_res & s, size_t fromPos, const char * search) {
     return findFrom(s, fromPos, search, strlen(search));
 }
 
-int find(const string_res & s, const char* search, size_t searchsize) {
+int find(const string_res & s, const char * search, size_t searchsize) {
     return findFrom(s, 0, search, searchsize);
 }
 
-int findFrom(const string_res & s, size_t fromPos, const char* search, size_t searchsize) {
+int findFrom(const string_res & s, size_t fromPos, const char * search, size_t searchsize) {
 
     /* Remaining implementations essentially ported from Sunjay's work */
@@ -779,9 +779,9 @@
 }
 
-bool includes(const string_res & s, const char* search) {
+bool includes(const string_res & s, const char * search) {
     return includes(s, search, strlen(search));
 }
 
-bool includes(const string_res & s, const char* search, size_t searchsize) {
+bool includes(const string_res & s, const char * search, size_t searchsize) {
     return find(s, search, searchsize) < s.Handle.lnth;
 }
@@ -791,9 +791,9 @@
 }
 
-bool startsWith(const string_res & s, const char* prefix) {
+bool startsWith(const string_res & s, const char * prefix) {
     return startsWith(s, prefix, strlen(prefix));
 }
 
-bool startsWith(const string_res & s, const char* prefix, size_t prefixsize) {
+bool startsWith(const string_res & s, const char * prefix, size_t prefixsize) {
     if (s.Handle.lnth < prefixsize) {
         return false;
@@ -806,9 +806,9 @@
 }
 
-bool endsWith(const string_res & s, const char* suffix) {
+bool endsWith(const string_res & s, const char * suffix) {
     return endsWith(s, suffix, strlen(suffix));
 }
 
-bool endsWith(const string_res & s, const char* suffix, size_t suffixsize) {
+bool endsWith(const string_res & s, const char * suffix, size_t suffixsize) {
     if (s.Handle.lnth < suffixsize) {
         return false;