Index: libcfa/src/collections/string.cfa
===================================================================
--- libcfa/src/collections/string.cfa	(revision d8a2f988fbdaa37173653d0e459271591e6afdd0)
+++ libcfa/src/collections/string.cfa	(revision 2f1656963c856b0273be7b573bf11a9e411e68a4)
@@ -10,6 +10,6 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May  4 21:50:03 2026
-// Update Count     : 400
+// Last Modified On : Fri May  8 07:41:00 2026
+// Update Count     : 409
 //
 
@@ -67,10 +67,10 @@
 }
 
-void ?{}( string & s, signed long int rhs ) {
+void ?{}( string & s, size_t rhs ) {
 	(s.inner) { malloc() };
 	?{}( *s.inner, rhs );
 }
 
-void ?{}( string & s, size_t rhs ) {
+void ?{}( string & s, ssize_t rhs ) {
 	(s.inner) { malloc() };
 	?{}( *s.inner, rhs );
@@ -118,35 +118,35 @@
 // Assignment
 
-PBOOST string & ?=?( string & s, string c ) {
-	(*s.inner) = (*c.inner);
-	return s;
-}
-
-string & ?=?( string & s, const char * val ) {
-	(*s.inner) = val;
-	return s;
-}
-
-string & ?=?( string & s, char val ) {
-	(*s.inner) = val;
-	return s;
-}
-
-string & assign( string & s, const string & c, size_t n ) {
-	assign( *s.inner, *c.inner, n );
-	return s;
-}
-
-string & assign( string & s, const char * cs , size_t n ) {
-	assign( *s.inner, cs, n );
-	return s;
-}
-
-string & ?=?( string & s, signed long int rhs ) {
-	(*s.inner) = rhs;
+PBOOST string & ?=?( string & s, string rhs ) {
+	(*s.inner) = (*rhs.inner);
+	return s;
+}
+
+string & ?=?( string & s, char rhs ) {
+	(*s.inner) = rhs;
+	return s;
+}
+
+string & ?=?( string & s, const char * rhs ) {
+	(*s.inner) = rhs;
+	return s;
+}
+
+string & assign( string & s, const string & rhs, size_t n ) {
+	assign( *s.inner, *rhs.inner, n );
+	return s;
+}
+
+string & assign( string & s, const char * rhs, size_t n ) {
+	assign( *s.inner, rhs, n );
 	return s;
 }
 
 string & ?=?( string & s, size_t rhs ) {
+	(*s.inner) = rhs;
+	return s;
+}
+
+string & ?=?( string & s, ssize_t rhs ) {
 	(*s.inner) = rhs;
 	return s;
@@ -403,8 +403,4 @@
 // Search
 
-bool contains( const string & s, char ch ) {
-	return contains( *s.inner, ch );
-}
-
 size_t find( const string & s, size_t start, size_t len, const string & key, size_t kstart, size_t klen ) {
 	if ( start < 0 ) { start += len( s ); }
@@ -449,15 +445,15 @@
 }
 
-bool includes( const string & s, const string & mask ) {
-	return includes( *s.inner, *mask.inner );
-}
-
-bool includes( const string & s, const char * mask ) {
-	return includes( *s.inner, mask );
-}
-
-bool includes( const string & s, const char * mask, size_t masksize ) {
-	return includes( *s.inner, mask, masksize );
-}
+// bool includes( const string & s, const string & search ) {
+// 	return includes( *s.inner, *search.inner );
+// }
+
+// bool includes( const string & s, const char * search ) {
+// 	return includes( *s.inner, search );
+// }
+
+// bool includes( const string & s, const char * search, size_t searchsize ) {
+// 	return includes( *s.inner, search, searchsize );
+// }
 
 bool startsWith( const string & s, const string & prefix ) {