Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
+++ libcfa/src/Makefile.am	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Jul 24 17:25:39 2018
-## Update Count     : 240
+## Last Modified On : Mon Jul 15 22:43:27 2019
+## Update Count     : 241
 ###############################################################################
 
@@ -22,5 +22,5 @@
 
 libdir = ${CFA_LIBDIR}
-lib_LTLIBRARIES =  libcfa.la libcfathread.la
+lib_LTLIBRARIES = libcfa.la libcfathread.la
 
 VPATH += :../prelude
Index: bcfa/src/expat.h
===================================================================
--- libcfa/src/expat.h	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
+++ 	(revision )
@@ -1,43 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// expat.h -- 
-//
-// Author           : Peter A. Buhr
-// Created On       : Sun Jun 28 11:10:15 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 21 08:57:26 2015
-// Update Count     : 4
-
-// This include file uses the CFA keyword "type" as a field name of a structure.
-
-#if ! defined( type )									// nesting ?
-#define type `type`
-#define __CFA_EXPAT1_H__
-#endif // ! type
-
-#if ! defined( context )								// nesting ?
-#define context `context`
-#define __CFA_EXPAT2_H__
-#endif // ! context
-
-#include_next <expat.h>									// has internal check for multiple expansion
-
-#if defined( type ) && defined( __CFA_EXPAT1_H__ )		// reset only if set
-#undef type
-#undef __CFA_EXPAT1_H__
-#endif // type && __CFA_EXPAT1_H__
-
-#if defined( context ) && defined( __CFA_EXPAT2_H__ )	// reset only if set
-#undef context
-#undef __CFA_EXPAT2_H__
-#endif // context && __CFA_EXPAT2_H__
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: tests/.expect/copyfile.txt
===================================================================
--- tests/.expect/copyfile.txt	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
+++ tests/.expect/copyfile.txt	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
@@ -0,0 +1,49 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// copyfile.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 16 16:47:22 2019
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 16 16:48:16 2019
+// Update Count     : 1
+// 
+
+#include <fstream.hfa>
+
+int main( int argc, char * argv[] ) {
+    ifstream & in  = stdin;				// default files
+    ofstream & out = stdout;
+    try {
+	choose ( argc ) {
+	  case 2, 3:
+	    open( in, argv[1] );			// open input file first as output creates file
+	    if ( argc == 3 ) open( out, argv[2] );	// only open output if input opens as output created if nonexistent
+	  case 1: ;					// use default files
+	  default:
+	    exit | "Usage [ input-file (default stdin) [ output-file (default stdout) ] ]";
+	} // choose
+
+	char ch;
+	out | nlOff;					// turn off auto newline
+	in  | nlOn;					// turn on reading newline
+
+	for () {					// read all characters
+	    in | ch;
+	  if ( eof( in ) ) break;			// eof ?
+	    out | ch;
+	} // for
+    } finally {
+	close( in );					// stdin, stdout are never closed
+	close( out );
+    } // try
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa copyfile.cfa" //
+// End: //
Index: tests/.in/copyfile.txt
===================================================================
--- tests/.in/copyfile.txt	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
+++ tests/.in/copyfile.txt	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
@@ -0,0 +1,49 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// copyfile.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 16 16:47:22 2019
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 16 16:48:16 2019
+// Update Count     : 1
+// 
+
+#include <fstream.hfa>
+
+int main( int argc, char * argv[] ) {
+    ifstream & in  = stdin;				// default files
+    ofstream & out = stdout;
+    try {
+	choose ( argc ) {
+	  case 2, 3:
+	    open( in, argv[1] );			// open input file first as output creates file
+	    if ( argc == 3 ) open( out, argv[2] );	// only open output if input opens as output created if nonexistent
+	  case 1: ;					// use default files
+	  default:
+	    exit | "Usage [ input-file (default stdin) [ output-file (default stdout) ] ]";
+	} // choose
+
+	char ch;
+	out | nlOff;					// turn off auto newline
+	in  | nlOn;					// turn on reading newline
+
+	for () {					// read all characters
+	    in | ch;
+	  if ( eof( in ) ) break;			// eof ?
+	    out | ch;
+	} // for
+    } finally {
+	close( in );					// stdin, stdout are never closed
+	close( out );
+    } // try
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa copyfile.cfa" //
+// End: //
Index: tests/copyfile.cfa
===================================================================
--- tests/copyfile.cfa	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
+++ tests/copyfile.cfa	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
@@ -0,0 +1,49 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// copyfile.cfa -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 16 16:47:22 2019
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 16 16:48:16 2019
+// Update Count     : 1
+// 
+
+#include <fstream.hfa>
+
+int main( int argc, char * argv[] ) {
+    ifstream & in  = stdin;				// default files
+    ofstream & out = stdout;
+    try {
+	choose ( argc ) {
+	  case 2, 3:
+	    open( in, argv[1] );			// open input file first as output creates file
+	    if ( argc == 3 ) open( out, argv[2] );	// only open output if input opens as output created if nonexistent
+	  case 1: ;					// use default files
+	  default:
+	    exit | "Usage [ input-file (default stdin) [ output-file (default stdout) ] ]";
+	} // choose
+
+	char ch;
+	out | nlOff;					// turn off auto newline
+	in  | nlOn;					// turn on reading newline
+
+	for () {					// read all characters
+	    in | ch;
+	  if ( eof( in ) ) break;			// eof ?
+	    out | ch;
+	} // for
+    } finally {
+	close( in );					// stdin, stdout are never closed
+	close( out );
+    } // try
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa copyfile.cfa" //
+// End: //
Index: tests/sum.cfa
===================================================================
--- tests/sum.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
+++ tests/sum.cfa	(revision 8ac3b0e9698b8388631986619318b28a9334c2ef)
@@ -11,6 +11,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:05:16 2019
-// Update Count     : 335
+// Last Modified On : Tue Jul 16 09:51:37 2019
+// Update Count     : 336
 //
 
@@ -186,5 +186,5 @@
 	void ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
 
-	S s = (S){0}, a[size], v = { low, low };
+	S s = 0, a[size], v = { low, low };
 	for ( int i = 0; i < size; i += 1, v += (S){1} ) {
 		s += (S)v;