Index: src/examples/fstream_test.c
===================================================================
--- src/examples/fstream_test.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/fstream_test.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 15:12:21 2016
-// Update Count     : 51
+// Last Modified On : Sun Mar  6 20:58:29 2016
+// Update Count     : 54
 //
 
@@ -28,5 +28,5 @@
 	int i, j, k;
 	sin  | &i | &j | &k;
-	sout | "Vous avez entré" | "i:" | i | "j:" | j | "k:" | k | endl;
+	sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
 }
 
Index: src/examples/huge.c
===================================================================
--- src/examples/huge.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/huge.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,9 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:15:34 2015
-// Update Count     : 1
+// Last Modified On : Tue Mar  8 22:16:32 2016
+// Update Count     : 2
 //
 
-int huge( int n, forall( type T ) T (*f)( T ) ) {
+int huge( int n, forall( otype T ) T (*f)( T ) ) {
 	if ( n <= 0 )
 		return f( 0 );
Index: src/examples/identity.c
===================================================================
--- src/examples/identity.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/identity.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 29 23:40:45 2016
-// Update Count     : 12
+// Last Modified On : Tue Mar  8 22:15:08 2016
+// Update Count     : 13
 //
 
 #include <fstream>
 
-forall( type T )
+forall( otype T )
 T identity( T t ) {
 	return t;
Index: src/examples/includes.c
===================================================================
--- src/examples/includes.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/includes.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 21 13:54:09 2015
-// Update Count     : 322
+// Last Modified On : Wed Mar  2 23:28:02 2016
+// Update Count     : 328
 //
 
@@ -43,6 +43,6 @@
 #include <ctype.h>
 #include <curses.h>
-#include <demangle.h>		// enum / contains "type"
-#include <dialog.h>			// enum / contains "type"
+#include <demangle.h>
+#include <dialog.h>
 #include <dirent.h>
 #include <dis-asm.h>
@@ -56,14 +56,16 @@
 #include <err.h>
 #include <errno.h>
+#if 0
 #include <error.h>
+#endif
+#include <eti.h>
+#include <evdns.h>
+#include <event.h>
+#include <evhttp.h>
 #if 0
-#include <eti.h>
-#include <evdns.h>			// subdirectory event2 contains "type"
-#include <event.h>
-#include <evhttp.h>			// enum / subdirectory event2 contains "type"
 #include <evrpc.h>
 #include <evutil.h>
 #include <execinfo.h>
-#include <expat.h>			// enum / contains "type" and "context"
+#include <expat.h>
 #include <expat_config.h>
 #include <expat_external.h>
@@ -74,5 +76,5 @@
 #include <fmtmsg.h>
 #include <fnmatch.h>
-#include <form.h>			// contains "type"
+#include <form.h>
 #include <fpu_control.h>
 #include <fstab.h>
@@ -81,5 +83,5 @@
 #include <ftw.h>
 #include <gconv.h>
-//#include <gcrypt.h>		// enum / contains "type"
+//#include <gcrypt.h>
 //#include <gcrypt-module.h>
 #include <getopt.h>
@@ -107,5 +109,5 @@
 #include <limits.h>
 #include <locale.h>
-#include <math.h>			// contains "type"
+#include <math.h>
 #include <ncurses.h>
 #include <setjmp.h>
Index: src/examples/it_out.c
===================================================================
--- src/examples/it_out.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/it_out.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:11:00 2016
-// Update Count     : 5
+// Last Modified On : Tue Mar  8 22:14:39 2016
+// Update Count     : 8
 //
 
@@ -21,5 +21,5 @@
 };
 
-trait writeable( type T ) {
+trait writeable( otype T ) {
 	forall( dtype os_type | ostream( os_type ) ) os_type * ?<<?( os_type *, T );
 };
@@ -36,5 +36,5 @@
 };
 
-trait readable( type T ) {
+trait readable( otype T ) {
 	forall( dtype is_type | istream( is_type ) ) is_type * ?<<?( is_type *, T );
 };
@@ -43,5 +43,5 @@
 forall( dtype is_type | istream( is_type ) ) is_type * ?>>?( is_type *, int* );
 
-trait iterator( type iterator_type, type elt_type ) {
+trait iterator( otype iterator_type, otype elt_type ) {
 	iterator_type ?++( iterator_type* );
 	iterator_type ++?( iterator_type* );
@@ -52,11 +52,11 @@
 };
 
-forall( type elt_type | writeable( elt_type ),
-		type iterator_type | iterator( iterator_type, elt_type ),
+forall( otype elt_type | writeable( elt_type ),
+		otype iterator_type | iterator( iterator_type, elt_type ),
 		dtype os_type | ostream( os_type ) )
 void write_all( iterator_type begin, iterator_type end, os_type *os );
 
-forall( type elt_type | writeable( elt_type ),
-		type iterator_type | iterator( iterator_type, elt_type ),
+forall( otype elt_type | writeable( elt_type ),
+		otype iterator_type | iterator( iterator_type, elt_type ),
 		dtype os_type | ostream( os_type ) )
 void write_all( elt_type begin, iterator_type end, os_type *os ) {
Index: src/examples/new.c
===================================================================
--- src/examples/new.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/new.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,9 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 25 23:33:55 2016
-// Update Count     : 2
+// Last Modified On : Tue Mar  8 22:13:20 2016
+// Update Count     : 4
 //
 
-forall( type T )
+forall( otype T )
 void f( T *t ) {
 	t--;
Index: src/examples/prolog.c
===================================================================
--- src/examples/prolog.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/prolog.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,13 +10,13 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:11:18 2016
-// Update Count     : 2
+// Last Modified On : Tue Mar  8 22:09:39 2016
+// Update Count     : 5
 //
 
-extern "C" { extern int printf( const char *fmt, ... ); }
+#include <fstream>
 
-void printResult( int x ) { printf( "int\n" ); }
-void printResult( double x ) { printf( "double\n" ); }
-void printResult( char * x ) { printf( "char*\n" ); }
+void printResult( int x ) { sout | "int" | endl; }
+void printResult( double x ) { sout | "double" | endl; }
+void printResult( char * x ) { sout | "char*" | endl; }
 
 void is_arithmetic( int x ) {}
@@ -25,13 +25,13 @@
 void is_integer( int x ) {}
 
-trait ArithmeticType( type T ) {
+trait ArithmeticType( otype T ) {
 	void is_arithmetic( T );
 };
 
-trait IntegralType( type T | ArithmeticType( T ) ) {
+trait IntegralType( otype T | ArithmeticType( T ) ) {
 	void is_integer( T );
 };
 
-forall( type T | IntegralType( T ) | { void printResult( T ); } )
+forall( otype T | IntegralType( T ) | { void printResult( T ); } )
 void hornclause( T param ) {
 	printResult( param );
Index: src/examples/quad.c
===================================================================
--- src/examples/quad.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/quad.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,16 +10,16 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  1 08:24:56 2016
-// Update Count     : 7
+// Last Modified On : Tue Mar  8 22:07:02 2016
+// Update Count     : 8
 //
 
 #include <fstream>
 
-forall( type T | { T ?*?( T, T ); } )
+forall( otype T | { T ?*?( T, T ); } )
 T square( T t ) {
 	return t * t;
 }
 
-forall( type U | { U square( U ); } )
+forall( otype U | { U square( U ); } )
 U quad( U u ) {
 	return square( square( u ) );
Index: src/examples/simplePoly.c
===================================================================
--- src/examples/simplePoly.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/simplePoly.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,9 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:31:17 2015
-// Update Count     : 2
+// Last Modified On : Tue Mar  8 22:06:41 2016
+// Update Count     : 3
 //
 
-forall( type T, type U | { T f( T, U ); } )
+forall( otype T, otype U | { T f( T, U ); } )
 T q( T t, U u ) {
 	return f( t, u );
Index: src/examples/simpler.c
===================================================================
--- src/examples/simpler.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/simpler.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,9 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:31:48 2015
-// Update Count     : 1
+// Last Modified On : Tue Mar  8 22:06:30 2016
+// Update Count     : 2
 //
 
-forall( type T ) T id( T, T );
+forall( otype T ) T id( T, T );
 
 int main() {
Index: src/examples/specialize.c
===================================================================
--- src/examples/specialize.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/specialize.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:32:26 2015
-// Update Count     : 2
+// Last Modified On : Tue Mar  8 22:06:17 2016
+// Update Count     : 3
 //
 
@@ -39,5 +39,5 @@
 }
 
-forall( type T ) T f( T t )
+forall( otype T ) T f( T t )
 {
 	printf( "in f; sizeof T is %d\n", sizeof( T ) );
Index: src/examples/square.c
===================================================================
--- src/examples/square.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/square.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 12:21:58 2016
-// Update Count     : 26
+// Last Modified On : Tue Mar  8 22:05:48 2016
+// Update Count     : 27
 //
 
 #include <fstream>
 
-forall( type T | { T ?*?( T, T ); } )
+forall( otype T | { T ?*?( T, T ); } )
 T square( T t ) {
 	return t * t;
Index: src/examples/sum.c
===================================================================
--- src/examples/sum.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/sum.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:12:01 2016
-// Update Count     : 194
+// Last Modified On : Fri Mar  4 15:06:47 2016
+// Update Count     : 196
 //
 
 #include <fstream>
 
-trait sumable( type T ) {
+trait sumable( otype T ) {
 	const T 0;
 	T ?+?( T, T );
@@ -24,5 +24,5 @@
 }; // sumable
 
-forall( type T | sumable( T ) )
+forall( otype T | sumable( T ) )
 T sum( unsigned int n, T a[] ) {
 	T total = 0;										// instantiate T, select 0
Index: src/examples/twice.c
===================================================================
--- src/examples/twice.c	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
+++ src/examples/twice.c	(revision b63e3760197cb5f480cf1cdfd5886fdd0411d103)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 12:23:25 2016
-// Update Count     : 13
+// Last Modified On : Tue Mar  8 22:04:58 2016
+// Update Count     : 16
 //
 
 #include <fstream>
 
-forall( type T | { T ?+?( T, T ); T ?++( T * ); [T] ?+=?( T *, T ); } )
+forall( otype T | { T ?+?( T, T ); T ?++( T * ); [T] ?+=?( T *, T ); } )
 T twice( const T t ) {
 	return t + t;
@@ -27,5 +27,5 @@
 	char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
 
-	sout | twice( 'a' ) | ' ' | twice( 1 ) | ' ' | twice( 3.2 ) | endl;
+	sout | twice( 'a' ) | ' ' | twice( 1 ) | twice( 3.2 ) | endl;
 }