Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ libcfa/src/fstream.cfa	(revision d1a9ff51fa9823cee1e1bb8f45cb184ec5617dec)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 11:55:29 2020
-// Update Count     : 356
+// Last Modified On : Fri Feb  7 19:01:01 2020
+// Update Count     : 363
 //
 
@@ -32,29 +32,29 @@
 
 void ?{}( ofstream & os, void * file ) {
-	os.file = file;
-	os.sepDefault = true;
-	os.sepOnOff = false;
-	os.nlOnOff = true;
-	os.prt = false;
-	os.sawNL = false;
+	os.$file = file;
+	os.$sepDefault = true;
+	os.$sepOnOff = false;
+	os.$nlOnOff = true;
+	os.$prt = false;
+	os.$sawNL = false;
+	$sepSetCur( os, sepGet( os ) );
 	sepSet( os, " " );
-	sepSetCur( os, sepGet( os ) );
 	sepSetTuple( os, ", " );
 } // ?{}
 
 // private
-bool sepPrt( ofstream & os ) { setNL( os, false ); return os.sepOnOff; }
-void sepReset( ofstream & os ) { os.sepOnOff = os.sepDefault; }
-void sepReset( ofstream & os, bool reset ) { os.sepDefault = reset; os.sepOnOff = os.sepDefault; }
-const char * sepGetCur( ofstream & os ) { return os.sepCur; }
-void sepSetCur( ofstream & os, const char sepCur[] ) { os.sepCur = sepCur; }
-bool getNL( ofstream & os ) { return os.sawNL; }
-void setNL( ofstream & os, bool state ) { os.sawNL = state; }
-bool getANL( ofstream & os ) { return os.nlOnOff; }
-bool getPrt( ofstream & os ) { return os.prt; }
-void setPrt( ofstream & os, bool state ) { os.prt = state; }
+bool $sepPrt( ofstream & os ) { $setNL( os, false ); return os.$sepOnOff; }
+void $sepReset( ofstream & os ) { os.$sepOnOff = os.$sepDefault; }
+void $sepReset( ofstream & os, bool reset ) { os.$sepDefault = reset; os.$sepOnOff = os.$sepDefault; }
+const char * $sepGetCur( ofstream & os ) { return os.$sepCur; }
+void $sepSetCur( ofstream & os, const char sepCur[] ) { os.$sepCur = sepCur; }
+bool $getNL( ofstream & os ) { return os.$sawNL; }
+void $setNL( ofstream & os, bool state ) { os.$sawNL = state; }
+bool $getANL( ofstream & os ) { return os.$nlOnOff; }
+bool $getPrt( ofstream & os ) { return os.$prt; }
+void $setPrt( ofstream & os, bool state ) { os.$prt = state; }
 
 // public
-void ?{}( ofstream & os ) { os.file = 0; }
+void ?{}( ofstream & os ) { os.$file = 0p; }
 
 void ?{}( ofstream & os, const char name[], const char mode[] ) {
@@ -70,41 +70,41 @@
 } // ^?{}
 
-void sepOn( ofstream & os ) { os.sepOnOff = ! getNL( os ); }
-void sepOff( ofstream & os ) { os.sepOnOff = false; }
+void sepOn( ofstream & os ) { os.$sepOnOff = ! $getNL( os ); }
+void sepOff( ofstream & os ) { os.$sepOnOff = false; }
 
 bool sepDisable( ofstream & os ) {
-	bool temp = os.sepDefault;
-	os.sepDefault = false;
-	sepReset( os );
+	bool temp = os.$sepDefault;
+	os.$sepDefault = false;
+	$sepReset( os );
 	return temp;
 } // sepDisable
 
 bool sepEnable( ofstream & os ) {
-	bool temp = os.sepDefault;
-	os.sepDefault = true;
-	if ( os.sepOnOff ) sepReset( os );					// start of line ?
+	bool temp = os.$sepDefault;
+	os.$sepDefault = true;
+	if ( os.$sepOnOff ) $sepReset( os );				// start of line ?
 	return temp;
 } // sepEnable
 
-void nlOn( ofstream & os ) { os.nlOnOff = true; }
-void nlOff( ofstream & os ) { os.nlOnOff = false; }
-
-const char * sepGet( ofstream & os ) { return os.separator; }
+void nlOn( ofstream & os ) { os.$nlOnOff = true; }
+void nlOff( ofstream & os ) { os.$nlOnOff = false; }
+
+const char * sepGet( ofstream & os ) { return os.$separator; }
 void sepSet( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.separator, s, sepSize - 1 );
-	os.separator[sepSize - 1] = '\0';
+	strncpy( os.$separator, s, sepSize - 1 );
+	os.$separator[sepSize - 1] = '\0';
 } // sepSet
 
-const char * sepGetTuple( ofstream & os ) { return os.tupleSeparator; }
+const char * sepGetTuple( ofstream & os ) { return os.$tupleSeparator; }
 void sepSetTuple( ofstream & os, const char s[] ) {
 	assert( s );
-	strncpy( os.tupleSeparator, s, sepSize - 1 );
-	os.tupleSeparator[sepSize - 1] = '\0';
+	strncpy( os.$tupleSeparator, s, sepSize - 1 );
+	os.$tupleSeparator[sepSize - 1] = '\0';
 } // sepSet
 
 void ends( ofstream & os ) {
-	if ( getANL( os ) ) nl( os );
-	else setPrt( os, false );							// turn off
+	if ( $getANL( os ) ) nl( os );
+	else $setPrt( os, false );							// turn off
 	if ( &os == &exit ) exit( EXIT_FAILURE );
 	if ( &os == &abort ) abort();
@@ -112,9 +112,9 @@
 
 int fail( ofstream & os ) {
-	return os.file == 0 || ferror( (FILE *)(os.file) );
+	return os.$file == 0 || ferror( (FILE *)(os.$file) );
 } // fail
 
 int flush( ofstream & os ) {
-	return fflush( (FILE *)(os.file) );
+	return fflush( (FILE *)(os.$file) );
 } // flush
 
@@ -122,5 +122,5 @@
 	FILE * file = fopen( name, mode );
 	#ifdef __CFA_DEBUG__
-	if ( file == 0 ) {
+	if ( file == 0p ) {
 		abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
 	} // if
@@ -134,7 +134,7 @@
 
 void close( ofstream & os ) {
-	if ( (FILE *)(os.file) == stdout || (FILE *)(os.file) == stderr ) return;
-
-	if ( fclose( (FILE *)(os.file) ) == EOF ) {
+	if ( (FILE *)(os.$file) == stdout || (FILE *)(os.$file) == stderr ) return;
+
+	if ( fclose( (FILE *)(os.$file) ) == EOF ) {
 		abort | IO_MSG "close output" | nl | strerror( errno );
 	} // if
@@ -146,5 +146,5 @@
 	} // if
 
-	if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
+	if ( fwrite( data, 1, size, (FILE *)(os.$file) ) != size ) {
 		abort | IO_MSG "write" | nl | strerror( errno );
 	} // if
@@ -155,7 +155,7 @@
 	va_list args;
 	va_start( args, format );
-	int len = vfprintf( (FILE *)(os.file), format, args );
+	int len = vfprintf( (FILE *)(os.$file), format, args );
 	if ( len == EOF ) {
-		if ( ferror( (FILE *)(os.file) ) ) {
+		if ( ferror( (FILE *)(os.$file) ) ) {
 			abort | IO_MSG "invalid write";
 		} // if
@@ -163,6 +163,6 @@
 	va_end( args );
 
-	setPrt( os, true );									// called in output cascade
-	sepReset( os );										// reset separator
+	$setPrt( os, true );								// called in output cascade
+	$sepReset( os );									// reset separator
 	return len;
 } // fmt
@@ -184,10 +184,10 @@
 // private
 void ?{}( ifstream & is, void * file ) {
-	is.file = file;
-	is.nlOnOff = false;
+	is.$file = file;
+	is.$nlOnOff = false;
 } // ?{}
 
 // public
-void ?{}( ifstream & is ) {	is.file = 0; }
+void ?{}( ifstream & is ) { is.$file = 0p; }
 
 void ?{}( ifstream & is, const char name[], const char mode[] ) {
@@ -203,14 +203,14 @@
 } // ^?{}
 
-void nlOn( ifstream & os ) { os.nlOnOff = true; }
-void nlOff( ifstream & os ) { os.nlOnOff = false; }
-bool getANL( ifstream & os ) { return os.nlOnOff; }
+void nlOn( ifstream & os ) { os.$nlOnOff = true; }
+void nlOff( ifstream & os ) { os.$nlOnOff = false; }
+bool getANL( ifstream & os ) { return os.$nlOnOff; }
 
 int fail( ifstream & is ) {
-	return is.file == 0 || ferror( (FILE *)(is.file) );
+	return is.$file == 0p || ferror( (FILE *)(is.$file) );
 } // fail
 
 int eof( ifstream & is ) {
-	return feof( (FILE *)(is.file) );
+	return feof( (FILE *)(is.$file) );
 } // eof
 
@@ -218,9 +218,9 @@
 	FILE * file = fopen( name, mode );
 	#ifdef __CFA_DEBUG__
-	if ( file == 0 ) {
+	if ( file == 0p ) {
 		abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
 	} // if
 	#endif // __CFA_DEBUG__
-	is.file = file;
+	is.$file = file;
 } // open
 
@@ -230,7 +230,7 @@
 
 void close( ifstream & is ) {
-	if ( (FILE *)(is.file) == stdin ) return;
-
-	if ( fclose( (FILE *)(is.file) ) == EOF ) {
+	if ( (FILE *)(is.$file) == stdin ) return;
+
+	if ( fclose( (FILE *)(is.$file) ) == EOF ) {
 		abort | IO_MSG "close input" | nl | strerror( errno );
 	} // if
@@ -242,5 +242,5 @@
 	} // if
 
-	if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
+	if ( fread( data, size, 1, (FILE *)(is.$file) ) == 0 ) {
 		abort | IO_MSG "read" | nl | strerror( errno );
 	} // if
@@ -253,5 +253,5 @@
 	} // if
 
-	if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
+	if ( ungetc( c, (FILE *)(is.$file) ) == EOF ) {
 		abort | IO_MSG "ungetc" | nl | strerror( errno );
 	} // if
@@ -263,7 +263,7 @@
 
 	va_start( args, format );
-	int len = vfscanf( (FILE *)(is.file), format, args );
+	int len = vfscanf( (FILE *)(is.$file), format, args );
 	if ( len == EOF ) {
-		if ( ferror( (FILE *)(is.file) ) ) {
+		if ( ferror( (FILE *)(is.$file) ) ) {
 			abort | IO_MSG "invalid read";
 		} // if
Index: libcfa/src/fstream.hfa
===================================================================
--- libcfa/src/fstream.hfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ libcfa/src/fstream.hfa	(revision d1a9ff51fa9823cee1e1bb8f45cb184ec5617dec)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 13:03:17 2020
-// Update Count     : 172
+// Last Modified On : Fri Feb  7 19:00:51 2020
+// Update Count     : 174
 //
 
@@ -24,26 +24,26 @@
 enum { sepSize = 16 };
 struct ofstream {
-	void * file;
-	bool sepDefault;
-	bool sepOnOff;
-	bool nlOnOff;
-	bool prt;											// print text
-	bool sawNL;
-	const char * sepCur;
-	char separator[sepSize];
-	char tupleSeparator[sepSize];
+	void * $file;
+	bool $sepDefault;
+	bool $sepOnOff;
+	bool $nlOnOff;
+	bool $prt;											// print text
+	bool $sawNL;
+	const char * $sepCur;
+	char $separator[sepSize];
+	char $tupleSeparator[sepSize];
 }; // ofstream
 
 // private
-bool sepPrt( ofstream & );
-void sepReset( ofstream & );
-void sepReset( ofstream &, bool );
-const char * sepGetCur( ofstream & );
-void sepSetCur( ofstream &, const char [] );
-bool getNL( ofstream & );
-void setNL( ofstream &, bool );
-bool getANL( ofstream & );
-bool getPrt( ofstream & );
-void setPrt( ofstream &, bool );
+bool $sepPrt( ofstream & );
+void $sepReset( ofstream & );
+void $sepReset( ofstream &, bool );
+const char * $sepGetCur( ofstream & );
+void $sepSetCur( ofstream &, const char [] );
+bool $getNL( ofstream & );
+void $setNL( ofstream &, bool );
+bool $getANL( ofstream & );
+bool $getPrt( ofstream & );
+void $setPrt( ofstream &, bool );
 
 // public
@@ -82,6 +82,6 @@
 
 struct ifstream {
-	void * file;
-	bool nlOnOff;
+	void * $file;
+	bool $nlOnOff;
 }; // ifstream
 
Index: libcfa/src/gmp.hfa
===================================================================
--- libcfa/src/gmp.hfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ libcfa/src/gmp.hfa	(revision d1a9ff51fa9823cee1e1bb8f45cb184ec5617dec)
@@ -10,6 +10,6 @@
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 11:55:07 2020
-// Update Count     : 28
+// Last Modified On : Fri Feb  7 22:10:30 2020
+// Update Count     : 29
 //
 
@@ -265,5 +265,5 @@
 	forall( dtype ostype | ostream( ostype ) ) {
 		ostype & ?|?( ostype & os, Int mp ) {
-			if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+			if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 			gmp_printf( "%Zd", mp.mpz );
 			sepOn( os );
Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ libcfa/src/iostream.cfa	(revision d1a9ff51fa9823cee1e1bb8f45cb184ec5617dec)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 10:07:17 2020
-// Update Count     : 822
+// Last Modified On : Fri Feb  7 18:48:38 2020
+// Update Count     : 825
 //
 
@@ -35,5 +35,5 @@
 forall( dtype ostype | ostream( ostype ) ) {
 	ostype & ?|?( ostype & os, zero_t ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%d", 0n );
 		return os;
@@ -44,5 +44,5 @@
 
 	ostype & ?|?( ostype & os, one_t ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%d", 1n );
 		return os;
@@ -53,5 +53,5 @@
 
 	ostype & ?|?( ostype & os, bool b ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%s", b ? "true" : "false" );
 		return os;
@@ -63,5 +63,5 @@
 	ostype & ?|?( ostype & os, char c ) {
 		fmt( os, "%c", c );
-		if ( c == '\n' ) setNL( os, true );
+		if ( c == '\n' ) $setNL( os, true );
 		return sepOff( os );
 	} // ?|?
@@ -71,5 +71,5 @@
 
 	ostype & ?|?( ostype & os, signed char sc ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%hhd", sc );
 		return os;
@@ -80,5 +80,5 @@
 
 	ostype & ?|?( ostype & os, unsigned char usc ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%hhu", usc );
 		return os;
@@ -89,5 +89,5 @@
 
 	ostype & ?|?( ostype & os, short int si ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%hd", si );
 		return os;
@@ -98,5 +98,5 @@
 
 	ostype & ?|?( ostype & os, unsigned short int usi ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%hu", usi );
 		return os;
@@ -107,5 +107,5 @@
 
 	ostype & ?|?( ostype & os, int i ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%d", i );
 		return os;
@@ -116,5 +116,5 @@
 
 	ostype & ?|?( ostype & os, unsigned int ui ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%u", ui );
 		return os;
@@ -125,5 +125,5 @@
 
 	ostype & ?|?( ostype & os, long int li ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%ld", li );
 		return os;
@@ -134,5 +134,5 @@
 
 	ostype & ?|?( ostype & os, unsigned long int uli ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%lu", uli );
 		return os;
@@ -143,5 +143,5 @@
 
 	ostype & ?|?( ostype & os, long long int lli ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%lld", lli );
 		return os;
@@ -152,5 +152,5 @@
 
 	ostype & ?|?( ostype & os, unsigned long long int ulli ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%llu", ulli );
 		return os;
@@ -175,5 +175,5 @@
 
 	ostype & ?|?( ostype & os, float f ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		PrintWithDP( os, "%g", f );
 		return os;
@@ -184,5 +184,5 @@
 
 	ostype & ?|?( ostype & os, double d ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		PrintWithDP( os, "%.*lg", d, DBL_DIG );
 		return os;
@@ -193,5 +193,5 @@
 
 	ostype & ?|?( ostype & os, long double ld ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
 		return os;
@@ -202,5 +202,5 @@
 
 	ostype & ?|?( ostype & os, float _Complex fc ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 //		os | crealf( fc ) | nonl;
 		PrintWithDP( os, "%g", crealf( fc ) );
@@ -214,5 +214,5 @@
 
 	ostype & ?|?( ostype & os, double _Complex dc ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 //		os | creal( dc ) | nonl;
 		PrintWithDP( os, "%.*lg", creal( dc ), DBL_DIG );
@@ -226,5 +226,5 @@
 
 	ostype & ?|?( ostype & os, long double _Complex ldc ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 //		os | creall( ldc ) || nonl;
 		PrintWithDP( os, "%.*Lg", creall( ldc ), LDBL_DIG );
@@ -257,20 +257,20 @@
 		// first character IS NOT spacing or closing punctuation => add left separator
 		unsigned char ch = str[0];						// must make unsigned
-		if ( sepPrt( os ) && mask[ ch ] != Close && mask[ ch ] != OpenClose ) {
-			fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) && mask[ ch ] != Close && mask[ ch ] != OpenClose ) {
+			fmt( os, "%s", $sepGetCur( os ) );
 		} // if
 
 		// if string starts line, must reset to determine open state because separator is off
-		sepReset( os );									// reset separator
+		$sepReset( os );								// reset separator
 
 		// last character IS spacing or opening punctuation => turn off separator for next item
 		size_t len = strlen( str );
 		ch = str[len - 1];								// must make unsigned
-		if ( sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
+		if ( $sepPrt( os ) && mask[ ch ] != Open && mask[ ch ] != OpenClose ) {
 			sepOn( os );
 		} else {
 			sepOff( os );
 		} // if
-		if ( ch == '\n' ) setNL( os, true );			// check *AFTER* sepPrt call above as it resets NL flag
+		if ( ch == '\n' ) $setNL( os, true );			// check *AFTER* $sepPrt call above as it resets NL flag
 		return write( os, str, len );
 	} // ?|?
@@ -281,5 +281,5 @@
 
 // 	ostype & ?|?( ostype & os, const char16_t * str ) {
-// 		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+// 		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 // 		fmt( os, "%ls", str );
 // 		return os;
@@ -288,5 +288,5 @@
 // #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
 // 	ostype & ?|?( ostype & os, const char32_t * str ) {
-// 		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+// 		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 // 		fmt( os, "%ls", str );
 // 		return os;
@@ -295,5 +295,5 @@
 
 // 	ostype & ?|?( ostype & os, const wchar_t * str ) {
-// 		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+// 		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 // 		fmt( os, "%ls", str );
 // 		return os;
@@ -301,5 +301,5 @@
 
 	ostype & ?|?( ostype & os, const void * p ) {
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 		fmt( os, "%p", p );
 		return os;
@@ -316,6 +316,6 @@
 	void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
 		(ostype &)(manip( os ));
-		if ( getPrt( os ) ) ends( os );					// something printed ?
-		setPrt( os, false );							// turn off
+		if ( $getPrt( os ) ) ends( os );				// something printed ?
+		$setPrt( os, false );							// turn off
 	} // ?|?
 
@@ -330,6 +330,6 @@
 	ostype & nl( ostype & os ) {
 		(ostype &)(os | '\n');
-		setPrt( os, false );							// turn off
-		setNL( os, true );
+		$setPrt( os, false );							// turn off
+		$setNL( os, true );
 		flush( os );
 		return sepOff( os );							// prepare for next line
@@ -337,5 +337,5 @@
 
 	ostype & nonl( ostype & os ) {
-		setPrt( os, false );							// turn off
+		$setPrt( os, false );							// turn off
 		return os;
 	} // nonl
@@ -376,7 +376,7 @@
 	ostype & ?|?( ostype & os, T arg, Params rest ) {
 		(ostype &)(os | arg);							// print first argument
-		sepSetCur( os, sepGetTuple( os ) );				// switch to tuple separator
+		$sepSetCur( os, sepGetTuple( os ) );			// switch to tuple separator
 		(ostype &)(os | rest);							// print remaining arguments
-		sepSetCur( os, sepGet( os ) );					// switch to regular separator
+		$sepSetCur( os, sepGet( os ) );					// switch to regular separator
 		return os;
 	} // ?|?
@@ -384,7 +384,7 @@
 		// (ostype &)(?|?( os, arg, rest )); ends( os );
 		(ostype &)(os | arg);							// print first argument
-		sepSetCur( os, sepGetTuple( os ) );				// switch to tuple separator
+		$sepSetCur( os, sepGetTuple( os ) );			// switch to tuple separator
 		(ostype &)(os | rest);							// print remaining arguments
-		sepSetCur( os, sepGet( os ) );					// switch to regular separator
+		$sepSetCur( os, sepGet( os ) );					// switch to regular separator
 		ends( os );
 	} // ?|?
@@ -415,5 +415,5 @@
 forall( dtype ostype | ostream( ostype ) ) { \
 	ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); \
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
 \
 		if ( f.base == 'b' || f.base == 'B' ) {			/* bespoke binary format */ \
@@ -514,5 +514,5 @@
 forall( dtype ostype | ostream( ostype ) ) { \
 	ostype & ?|?( ostype & os, _Ostream_Manip(T) f ) { \
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) ); \
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) ); \
 		char fmtstr[sizeof(DFMTP)];						/* sizeof includes '\0' */ \
 		if ( ! f.flags.pc ) memcpy( &fmtstr, DFMTNP, sizeof(DFMTNP) ); \
@@ -557,5 +557,5 @@
 		} // if
 
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 
 		#define CFMTNP "% * "
@@ -595,5 +595,5 @@
 		} // if
 
-		if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+		if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
 
 		#define SFMTNP "% * "
Index: libcfa/src/iostream.hfa
===================================================================
--- libcfa/src/iostream.hfa	(revision 095ac9927ab4898752d1b2c90bc12487bfb282c1)
+++ libcfa/src/iostream.hfa	(revision d1a9ff51fa9823cee1e1bb8f45cb184ec5617dec)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 11:55:28 2020
-// Update Count     : 335
+// Last Modified On : Fri Feb  7 17:53:52 2020
+// Update Count     : 336
 //
 
@@ -24,14 +24,14 @@
 trait ostream( dtype ostype ) {
 	// private
-	bool sepPrt( ostype & );							// get separator state (on/off)
-	void sepReset( ostype & );							// set separator state to default state
-	void sepReset( ostype &, bool );					// set separator and default state
-	const char * sepGetCur( ostype & );					// get current separator string
-	void sepSetCur( ostype &, const char [] );			// set current separator string
-	bool getNL( ostype & );								// check newline
-	void setNL( ostype &, bool );						// saw newline
-	bool getANL( ostype & );							// get auto newline (on/off)
-	bool getPrt( ostype & );							// get fmt called in output cascade
-	void setPrt( ostype &, bool );						// set fmt called in output cascade
+	bool $sepPrt( ostype & );							// get separator state (on/off)
+	void $sepReset( ostype & );							// set separator state to default state
+	void $sepReset( ostype &, bool );					// set separator and default state
+	const char * $sepGetCur( ostype & );				// get current separator string
+	void $sepSetCur( ostype &, const char [] );			// set current separator string
+	bool $getNL( ostype & );							// check newline
+	void $setNL( ostype &, bool );						// saw newline
+	bool $getANL( ostype & );							// get auto newline (on/off)
+	bool $getPrt( ostype & );							// get fmt called in output cascade
+	void $setPrt( ostype &, bool );						// set fmt called in output cascade
 	// public
 	void sepOn( ostype & );								// turn separator state on