Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 7f8b7409e1e8dfb7ac736a0639e9ce936ae60b78)
+++ src/libcfa/Makefile.in	(revision 8a63547c8b9b3e31b4bd7d0ed2806b1e05a1fb74)
@@ -113,4 +113,5 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 CCDEPMODE = @CCDEPMODE@
+CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -131,5 +132,4 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@
Index: src/libcfa/iostream.c
===================================================================
--- src/libcfa/iostream.c	(revision 7f8b7409e1e8dfb7ac736a0639e9ce936ae60b78)
+++ src/libcfa/iostream.c	(revision 8a63547c8b9b3e31b4bd7d0ed2806b1e05a1fb74)
@@ -9,7 +9,7 @@
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 02 15:13:55 2016
-// Update Count     : 302
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu May 26 10:08:31 2016
+// Update Count     : 305
 //
 
@@ -21,5 +21,4 @@
 #include <float.h>										// DBL_DIG, LDBL_DIG
 #include <complex.h>									// creal, cimag
-#include <ctype.h>										// isspace, ispunct
 }
 
@@ -336,5 +335,5 @@
 } // ?|?
 
-_Istream_cstrUC cstr( char * str ) { _Istream_cstrUC s = { str }; return s; }
+_Istream_cstrUC cstr( char * str ) { return (_Istream_cstrUC){ str }; }
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
@@ -343,5 +342,5 @@
 } // cstr
 
-_Istream_cstrC cstr( char * str, int size ) { _Istream_cstrC s = { str, size }; return s; }
+_Istream_cstrC cstr( char * str, int size ) { return (_Istream_cstrC){ str, size }; }
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype * is, _Istream_cstrC cstr ) {