Index: libcfa/src/interpose.cfa
===================================================================
--- libcfa/src/interpose.cfa	(revision ec728619421b2c61e94f86fdfc062c238a3532ef)
+++ libcfa/src/interpose.cfa	(revision 4f3725551e52fab2c85ffd4b7324b84e05aab9ce)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  5 11:37:35 2018
-// Update Count     : 111
+// Last Modified On : Sun Jul 14 22:57:16 2019
+// Update Count     : 116
 //
 
@@ -81,9 +81,9 @@
 //=============================================================================================
 
-void sigHandler_segv ( __CFA_SIGPARMS__ );
-void sigHandler_ill  ( __CFA_SIGPARMS__ );
-void sigHandler_fpe  ( __CFA_SIGPARMS__ );
-void sigHandler_abort( __CFA_SIGPARMS__ );
-void sigHandler_term ( __CFA_SIGPARMS__ );
+void sigHandler_segv( __CFA_SIGPARMS__ );
+void sigHandler_ill ( __CFA_SIGPARMS__ );
+void sigHandler_fpe ( __CFA_SIGPARMS__ );
+void sigHandler_abrt( __CFA_SIGPARMS__ );
+void sigHandler_term( __CFA_SIGPARMS__ );
 
 struct {
@@ -110,5 +110,5 @@
 		__cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO );
 		__cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO );
-		__cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO | SA_RESETHAND);
+		__cfaabi_sigaction( SIGABRT, sigHandler_abrt, SA_SIGINFO | SA_RESETHAND);
 		__cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO );
 		__cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO );
@@ -204,9 +204,7 @@
 			if ( *p == '(' ) {
 				name = p;
-			}
-			else if ( *p == '+' ) {
+			} else if ( *p == '+' ) {
 				offset_begin = p;
-			}
-			else if ( *p == ')' ) {
+			} else if ( *p == ')' ) {
 				offset_end = p;
 				break;
@@ -223,7 +221,5 @@
 
 			__cfaabi_dbg_bits_print_nolock( "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-		}
-		// otherwise, print the whole line
-		else {
+		} else {										// otherwise, print the whole line
 			__cfaabi_dbg_bits_print_nolock( "(%i) %s\n", frameNo, messages[i] );
 		}
@@ -258,5 +254,5 @@
 }
 
-void sigHandler_abort( __CFA_SIGPARMS__ ) {
+void sigHandler_abrt( __CFA_SIGPARMS__ ) {
 	__cfaabi_backtrace();
 
Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision ec728619421b2c61e94f86fdfc062c238a3532ef)
+++ libcfa/src/iostream.cfa	(revision 4f3725551e52fab2c85ffd4b7324b84e05aab9ce)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:04:13 2019
-// Update Count     : 819
+// Last Modified On : Sat Jul 13 08:07:59 2019
+// Update Count     : 821
 //
 
@@ -499,5 +499,5 @@
 				if ( ! f.flags.left ) { \
 					buf[i] = '.'; buf[i + 1] = '\0'; \
-					if ( buf[0] == ' ' ) bufbeg = 1; /* decimal point within width */ \
+					if ( buf[0] == ' ' ) bufbeg = 1;	/* decimal point within width */ \
 				} else { \
 					for ( i = 0; i < len && buf[i] != ' '; i += 1 ); /* trailing blank ? */ \
@@ -546,5 +546,5 @@
 forall( dtype ostype | ostream( ostype ) ) {
 	ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
-		if ( f.base != 'c' ) {								// bespoke binary/octal/hex format
+		if ( f.base != 'c' ) {							// bespoke binary/octal/hex format
 			_Ostream_Manip(unsigned char) fmtuc @= { f.val, f.wd, f.pc, f.base, {'\0'} };
 			fmtuc.flags.pc = f.flags.pc;
@@ -558,7 +558,7 @@
 
 		#define CFMTNP "% * "
-		char fmtstr[sizeof(CFMTNP)];						// sizeof includes '\0'
+		char fmtstr[sizeof(CFMTNP)];					// sizeof includes '\0'
 		memcpy( &fmtstr, CFMTNP, sizeof(CFMTNP) );
-		int star = 1;										// position before first '*'
+		int star = 1;									// position before first '*'
 
 		// Insert flags into spaces before '*', from right to left.
@@ -566,5 +566,5 @@
 		fmtstr[star] = '%';
 
-		fmtstr[sizeof(CFMTNP)-2] = f.base;					// sizeof includes '\0'
+		fmtstr[sizeof(CFMTNP)-2] = f.base;				// sizeof includes '\0'
 		// printf( "%d %s\n", f.wd, &fmtstr[star] );
 		fmt( os, &fmtstr[star], f.wd, f.val );
@@ -631,5 +631,5 @@
 		else {
 			fprintf( stderr, "invalid Boolean constant\n" );
-			abort();
+			abort();									// cannot use abort stream
 		} // if
 		return is;
@@ -639,5 +639,5 @@
 		char temp;
 		for () {
-			fmt( is, "%c", &temp );							// must pass pointer through varg to fmt
+			fmt( is, "%c", &temp );						// must pass pointer through varg to fmt
 			// do not overwrite parameter with newline unless appropriate
 			if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
@@ -773,5 +773,5 @@
 	if ( ! f.s ) {
 		// printf( "skip %s %d\n", f.scanset, f.wd );
-		if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
+		if ( f.wd == -1 ) fmt( is, f.scanset, "" );		// no input arguments
 		else for ( f.wd ) fmt( is, "%*c" );
 		return is;