Index: include/bfd.h
===================================================================
--- include/bfd.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/bfd.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Thu Jan  8 15:50:56 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:07:14 2015
-// Update Count     : 7
+// Last Modified On : Mon Dec 21 08:44:41 2015
+// Update Count     : 9
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_BFD_H__
-#endif // type
-#include_next <bfd.h>
-#ifdef __CFA_BFD_H__
+#endif // ! type
+
+#include_next <bfd.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_BFD_H__ )			// reset only if set
 #undef type
-#endif // __CFA_BFD_H__
+#undef __CFA_BFD_H__
+#endif // type && __CFA_BFD_H__
 
 // Local Variables: //
Index: include/bfdlink.h
===================================================================
--- include/bfdlink.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/bfdlink.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sat Jun 27 09:14:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:08:26 2015
-// Update Count     : 3
+// Last Modified On : Mon Dec 21 08:47:03 2015
+// Update Count     : 4
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_BFDLINK_H__
-#endif // type
-#include_next <bfdlink.h>
-#ifdef __CFA_BFDLINK_H__
+#endif // ! type
+
+#include_next <bfdlink.h>								// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_BFDLINK_H__ )		// reset only if set
 #undef type
-#endif // __CFA_BFDLINK_H__
+#undef __CFA_BFDLINK_H__
+#endif // type && __CFA_BFDLINK_H__
 
 // Local Variables: //
Index: include/demangle.h
===================================================================
--- include/demangle.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/demangle.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sat Jun 27 16:45:01 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:09:16 2015
-// Update Count     : 8
+// Last Modified On : Mon Dec 21 08:48:30 2015
+// Update Count     : 9
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_DEMANGLE_H__
-#endif // type
-#include_next <demangle.h>
-#ifdef __CFA_DEMANGLE_H__
+#endif // ! type
+
+#include_next <demangle.h>								// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_DEMANGLE_H__ )		// reset only if set
 #undef type
-#endif // __CFA_DEMANGLE_H__
+#undef __CFA_DEMANGLE_H__
+#endif // type && __CFA_DEMANGLE_H__
 
 // Local Variables: //
Index: include/dialog.h
===================================================================
--- include/dialog.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/dialog.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 08:34:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:05:35 2015
-// Update Count     : 4
+// Last Modified On : Mon Dec 21 08:38:21 2015
+// Update Count     : 11
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_DIALOG_H__
-#endif // type
-#include_next <dialog.h>
-#ifdef __CFA_DIALOG_H__
+#endif // ! type
+
+#include_next <dialog.h>								// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_DIALOG_H__ )		// reset only if set
 #undef type
-#endif // __CFA_DIALOG_H__
+#undef __CFA_DIALOG_H__
+#endif // type && __CFA_DIALOG_H__
 
 // Local Variables: //
Index: include/evdns.h
===================================================================
--- include/evdns.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/evdns.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 10:09:23 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 10:10:11 2015
-// Update Count     : 1
+// Last Modified On : Mon Dec 21 08:51:06 2015
+// Update Count     : 3
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_EVDNS_H__
-#endif // type
-#include_next <evdns.h>
-#ifdef __CFA_EVDNS_H__
+#endif // ! type
+
+#include_next <evdns.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_EVDNS_H__ )		// reset only if set
 #undef type
-#endif // __CFA_EVDNS_H__
+#undef __CFA_EVDNS_H__
+#endif // type && __CFA_EVDNS_H__
 
 // Local Variables: //
Index: include/evhttp.h
===================================================================
--- include/evhttp.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/evhttp.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 10:59:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 10:59:55 2015
-// Update Count     : 1
+// Last Modified On : Mon Dec 21 08:52:19 2015
+// Update Count     : 2
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_EVHTTP_H__
-#endif // type
-#include_next <evhttp.h>
-#ifdef __CFA_EVHTTP_H__
+#endif // ! type
+
+#include_next <evhttp.h>								// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_EVHTTP_H__ )		// reset only if set
 #undef type
-#endif // __CFA_EVHTTP_H__
+#undef __CFA_EVHTTP_H__
+#endif // type && __CFA_EVHTTP_H__
 
 // Local Variables: //
Index: include/evrpc.h
===================================================================
--- include/evrpc.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/evrpc.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 11:01:31 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 11:02:26 2015
-// Update Count     : 1
+// Last Modified On : Mon Dec 21 08:53:14 2015
+// Update Count     : 2
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_EVRPC_H__
-#endif // type
-#include_next <evrpc.h>
-#ifdef __CFA_EVRPC_H__
+#endif // ! type
+
+#include_next <evrpc.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_EVRPC_H__ )		// reset only if set
 #undef type
-#endif // __CFA_EVRPC_H__
+#undef __CFA_EVRPC_H__
+#endif // type && __CFA_EVRPC_H__
 
 // Local Variables: //
Index: include/expat.h
===================================================================
--- include/expat.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/expat.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,25 +10,30 @@
 // Created On       : Sun Jun 28 11:10:15 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 11:14:28 2015
-// Update Count     : 2
+// 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.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_EXPAT1_H__
-#endif // type
-#ifndef context	// nesting ?
+#endif // ! type
+
+#if ! defined( context )								// nesting ?
 #define context `context`
 #define __CFA_EXPAT2_H__
-#endif // context
-#include_next <expat.h>
-#ifdef __CFA_EXPAT1_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
-#endif // __CFA_EXPAT_H__
-#ifdef __CFA_EXPAT2_H__
-#undef type
-#endif // __CFA_EXPAT2_H__
+#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: //
Index: include/fcntl.h
===================================================================
--- include/fcntl.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/fcntl.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 23:03:14 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 23:03:48 2015
-// Update Count     : 7
+// Last Modified On : Mon Dec 21 08:38:39 2015
+// Update Count     : 14
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_FCNTL_H__
-#endif // type
-#include_next <fcntl.h>
-#ifdef __CFA_FCNTL_H__
+#endif // ! type
+
+#include_next <fcntl.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_FCNTL_H__ )		// reset only if set
 #undef type
-#endif // __CFA_FCNTL_H__
+#undef __CFA_FCNTL_H__
+#endif // type && __CFA_FCNTL_H__
 
 // Local Variables: //
Index: include/form.h
===================================================================
--- include/form.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/form.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 11:23:56 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 11:24:28 2015
-// Update Count     : 1
+// Last Modified On : Mon Dec 21 08:59:46 2015
+// Update Count     : 2
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_FORM_H__
-#endif // type
-#include_next <form.h>
-#ifdef __CFA_FORM_H__
+#endif // ! type
+
+#include_next <form.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_FORM_H__ )		// reset only if set
 #undef type
-#endif // __CFA_FORM_H__
+#undef __CFA_FORM_H__
+#endif // type && __CFA_FORM_H__
 
 // Local Variables: //
Index: include/gcrypt.h
===================================================================
--- include/gcrypt.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/gcrypt.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Sun Jun 28 11:36:26 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 11:37:07 2015
-// Update Count     : 7
+// Last Modified On : Mon Dec 21 09:01:25 2015
+// Update Count     : 8
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_GCRYPT_H__
-#endif // type
-#include_next <gcrypt.h>
-#ifdef __CFA_GCRYPT_H__
+#endif // ! type
+
+#include_next <gcrypt.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_GCRYPT_H__ )		// reset only if set
 #undef type
-#endif // __CFA_GCRYPT_H__
+#undef __CFA_GCRYPT_H__
+#endif // type && __CFA_GCRYPT_H__
 
 // Local Variables: //
Index: include/math.h
===================================================================
--- include/math.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ include/math.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,18 +10,20 @@
 // Created On       : Mon Nov 10 23:41:29 2014
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 28 09:05:22 2015
-// Update Count     : 6
+// Last Modified On : Mon Dec 21 08:37:57 2015
+// Update Count     : 12
 
 // This include file uses the CFA keyword "type" as a field name of a structure.
-// The name is changed only for the include file.
 
-#ifndef type	// nesting ?
+#if ! defined( type )									// nesting ?
 #define type `type`
 #define __CFA_MATH_H__
-#endif // type
-#include_next <math.h>
-#ifdef __CFA_MATH_H__
+#endif // ! type
+
+#include_next <math.h>									// has internal check for multiple expansion
+
+#if defined( type ) && defined( __CFA_MATH_H__ )		// reset only if set
 #undef type
-#endif // __CFA_MATH_H__
+#undef __CFA_MATH_H__
+#endif // type && __CFA_MATH_H__
 
 // Local Variables: //
Index: src/examples/alloc.c
===================================================================
--- src/examples/alloc.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/alloc.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -26,5 +26,5 @@
 int *baz( int *p, int c );
 
-int main() {
+int main( void ) {
     size_t size = 10;
     int * x = malloc();
Index: src/examples/control_structures.c
===================================================================
--- src/examples/control_structures.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/control_structures.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,9 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 18 08:12:17 2015
-// Update Count     : 28
+// Last Modified On : Mon Jan  4 11:30:30 2016
+// Update Count     : 29
 //
 
-int main() {
+int main( void ) {
 	L1: {
 		L2:	switch ( 3_333_333 ) {						// underscores in constant
Index: src/examples/fstream_test.c
===================================================================
--- src/examples/fstream_test.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/fstream_test.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,11 +10,11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Nov 23 14:43:32 2015
-// Update Count     : 40
+// Last Modified On : Mon Jan  4 11:30:39 2016
+// Update Count     : 41
 //
 
 #include "fstream.h"
 
-int main() {
+int main( void ) {
 	ofstream *sout = ofstream_stdout();
 	ifstream *sin = ifstream_stdin();
Index: src/examples/identity.c
===================================================================
--- src/examples/identity.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/identity.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -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:16:30 2015
-// Update Count     : 2
+// Last Modified On : Mon Jan  4 23:38:05 2016
+// Update Count     : 6
 //
 
@@ -23,17 +23,18 @@
 int main() {
 	ofstream *sout = ofstream_stdout();
-	char c = 'a';
-	c = identity( c );
-	sout << c << ' ' << identity( c ) << '\n';
-	int i = 5;
-	i = identity( i );
-	sout << i << ' ' << identity( i ) << '\n';
-	double d = 3.2;
-	d = identity( d );
-	sout << d << ' ' << identity( d ) << '\n';
+	sout | "char\t\t\t"					| identity( 'z' ) | endl;
+	sout | "signed int\t\t"				| identity( 4 ) | endl;
+	sout | "unsigned int\t\t"			| identity( 4u ) | endl;
+	sout | "signed long int\t\t" 		| identity( 4l ) | endl;
+	sout | "unsigned long int\t" 		| identity( 4ul ) | endl;
+	sout | "signed long long int\t"		| identity( 4ll ) | endl;
+	sout | "unsigned long long int\t"	| identity( 4ull ) | endl;
+	sout | "float\t\t\t" 				| identity( 4.0f ) | endl;
+	sout | "double\t\t\t"				| identity( 4.0 ) | endl;
+	sout | "long double\t\t"			| identity( 4.0l ) | endl;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa identity.c fstream.o iostream.o" //
+// compile-command: "cfa identity.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/includes.c
===================================================================
--- src/examples/includes.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/includes.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -7,31 +7,106 @@
 // includes.c -- 
 //
-// Author           : Richard C. Bilson
+// Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 15:04:33 2015
-// Update Count     : 14
+// Last Modified On : Mon Dec 21 13:54:09 2015
+// Update Count     : 322
 //
 
-#if 0
-//#include <aio.h>		// FAILS -- includes locale.h
+// ***********************************************
+// USE -std=c99 WITH gxx TO GET SAME OUTPUT AS cfa
+// ***********************************************
+
+#ifdef __CFA__
+extern "C" {
+#endif // __CFA__
+
+#if 1
+#define _GNU_SOURCE
+#include <aio.h>
+#include <a.out.h>
 #include <aliases.h>
 #include <alloca.h>
 #include <ansidecl.h>
 #include <ar.h>
-#include <argp.h>		// FAILS -- includes locale.h
-#include <argz.h>		// FAILS -- includes locale.h
+#include <argp.h>
+#include <argz.h>
 #include <assert.h>
-#include <bfd.h>		// contains structure field "type"
+#include <bfd.h>
+#include <bfdlink.h>
+#include <byteswap.h>
+#include <cblas.h>
+#include <cblas_f77.h>
 #include <complex.h>
-#include <ctype.h>		// FAILS -- includes locale.h
+#include <cpio.h>
+#include <crypt.h>
+#include <ctype.h>
+#include <curses.h>
+#include <demangle.h>		// enum / contains "type"
+#include <dialog.h>			// enum / contains "type"
+#include <dirent.h>
+#include <dis-asm.h>
+#include <dlfcn.h>
+#include <dlg_colors.h>
+#include <dlg_config.h>
+#include <dlg_keys.h>
+#include <elf.h>
+#include <endian.h>
+#include <envz.h>
+#include <err.h>
 #include <errno.h>
+#include <error.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_config.h>
+#include <expat_external.h>
+#include <fcntl.h>
+#include <features.h>
 #include <fenv.h>
 #include <float.h>
+#include <fmtmsg.h>
+#include <fnmatch.h>
+#include <form.h>			// contains "type"
+#include <fpu_control.h>
+#include <fstab.h>
+//#include <ft2build.h>
+#include <fts.h>
+#include <ftw.h>
+#include <gconv.h>
+//#include <gcrypt.h>		// enum / contains "type"
+//#include <gcrypt-module.h>
+#include <getopt.h>
+//#include <gettext-po.h>
+#include <glob.h>
+//#include <gmp.h>			// infinite loop
+////#include <gmpxx.h>
+//#include <gmp-x86_64.h>
+#include <gnu-versions.h>
+//#include <gpg-error.h>
+#include <grp.h>
+#include <gshadow.h>
+#include <iconv.h>
+#include <idna.h>
+#include <idn-free.h>
+#include <idn-int.h>
+#include <ieee754.h>
+#include <ifaddrs.h>
 #include <inttypes.h>
 #include <iso646.h>
+#include <jerror.h>
+//#include <jmorecfg.h>
+//#include <jpegint.h>
+//#include <jpeglib.h>
 #include <limits.h>
-#include <locale.h>		// FAILS -- "no reasonable alternatives for applying ... Name: ?+? ..."
-#include <math.h>		// contains structure field "type"
+#include <locale.h>
+#include <math.h>			// contains "type"
+#include <ncurses.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -41,14 +116,22 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>		// FAILS -- includes locale.h
+#include <string.h>
 #include <tgmath.h>
-#include <time.h>		// FAILS -- includes locale.h
+#include <time.h>
 #include <unistd.h>
-#include <wchar.h>		// FAILS -- includes locale.h
-#include <wctype.h>		// FAILS -- includes locale.h
-#include <curses.h>
+#include <wchar.h>
+#include <wctype.h>
+#endif // 0
+
 #else
-#include <aio.h>		// FAILS -- includes locale.h
+
+//#define _GNU_SOURCE
+#include <error.h>
+
 #endif // 0
+
+#ifdef __CFA__
+} // extern "C"
+#endif // __CFA__
 
 // Local Variables: //
Index: src/examples/iostream.c
===================================================================
--- src/examples/iostream.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/iostream.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec  7 23:08:02 2015
-// Update Count     : 24
+// Last Modified On : Mon Jan  4 09:38:58 2016
+// Update Count     : 37
 //
 
@@ -27,14 +27,54 @@
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, int i ) {
-	char buffer[32];									// larger than the largest integer
-	sprintf( buffer, "%d", i );
-	return write( os, buffer, strlen( buffer ) );
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%d", i ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned int i ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%u", i ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long int i ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%ld", i ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long long int i ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%lld", i ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned long int i ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%lu", i ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned long long int i ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%llu", i ) );
 } // ?|?
 
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype *os, double d ) {
-	char buffer[32];									// larger than the largest double
-	sprintf( buffer, "%g", d );
-	return write( os, buffer, strlen( buffer ) );
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%g", d ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, long double d ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%Lg", d ) );
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, const void *p ) {
+	char buffer[32];
+	return write( os, buffer, sprintf( buffer, "%p", p ) );
 } // ?|?
 
@@ -42,11 +82,4 @@
 ostype * ?|?( ostype *os, const char *cp ) {
 	return write( os, cp, strlen( cp ) );
-} // ?|?
-
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, const void *p ) {
-	char buffer[32];									// larger than the largest pointer
-	sprintf( buffer, "%p", p );
-	return write( os, buffer, strlen( buffer ) );
 } // ?|?
 
Index: src/examples/iostream.h
===================================================================
--- src/examples/iostream.h	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/iostream.h	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Nov 23 14:15:25 2015
-// Update Count     : 17
+// Last Modified On : Mon Jan  4 09:02:11 2016
+// Update Count     : 20
 //
 
@@ -34,5 +34,11 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, int );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned int );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long int );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long long int );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long int );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long long int );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char * );
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * );
Index: src/examples/min.c
===================================================================
--- src/examples/min.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/min.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,35 +10,34 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:23:19 2015
-// Update Count     : 2
+// Last Modified On : Mon Jan  4 11:40:51 2016
+// Update Count     : 26
 //
 
-extern "C" {
-	int printf( const char *, ... );
-//#include <stdio.h>
-}
+#include "fstream.h"
 
 forall( type T | { int ?<?( T, T ); } )
 T min( const T t1, const T t2 ) {
 	return t1 < t2 ? t1 : t2;
-}
+} // min
 
-int main() {
-	char c;
-//	c = min( 'z', 'a' );
-//	printf( "minimum %d\n", c );
-	int i;
-	i = min( 4, 3 );
-	printf( "minimum %d\n", min( 4, 3 ) );
-	float f;
-	f = min( 4.0, 3.1 );
-	printf( "minimum %g\n", f );
-	double d;
-	d = min( 4.0, 3.2 );
-	printf( "minimum %g\n", d );
-}
+int main( void ) {
+	ofstream *sout = ofstream_stdout();
+	// char does not have less than.
+	int ?<?( char op1, char op2 ) { return (int)op1 < (int)op2; }
+
+	sout | "char\t\t\t"					| 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl;
+	sout | "signed int\t\t"				| 4 | ' ' | 3 | "\tmin " | min( 4, 3 ) | endl;
+	sout | "unsigned int\t\t"			| 4u | ' ' | 3u | "\tmin " | min( 4u, 3u ) | endl;
+	sout | "signed long int\t\t" 		| 4l | ' ' | 3l | "\tmin " | min( 4l, 3l ) | endl;
+	sout | "unsigned long int\t" 		| 4ul | ' ' | 3ul | "\tmin " | min( 4ul, 3ul ) | endl;
+	sout | "signed long long int\t"		| 4ll | ' ' | 3ll | "\tmin " | min( 4ll, 3ll ) | endl;
+	sout | "unsigned long long int\t"	| 4ull | ' ' | 3ull | "\tmin " | min( 4ull, 3ull ) | endl;
+	sout | "float\t\t\t" 				| 4.0f | ' ' | 3.1f | "\tmin " | min( 4.0f, 3.1f ) | endl;
+	sout | "double\t\t\t"				| 4.0 | ' ' | 3.1 | "\tmin " | min( 4.0, 3.1 ) | endl;
+	sout | "long double\t\t"			| 4.0l | ' ' | 3.1l | "\tmin " | min( 4.0l, 3.1l ) | endl;
+} // main
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa min.c" //
+// compile-command: "cfa min.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/quoted_keyword.c
===================================================================
--- src/examples/quoted_keyword.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/quoted_keyword.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,21 +10,24 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:27:26 2015
-// Update Count     : 2
+// Last Modified On : Sun Jan  3 22:46:28 2016
+// Update Count     : 7
 //
 
+#include "fstream.h"
+
 // test quoted keyword usage
-int `catch`;
+int `catch` = 10;
 
 struct {
 	int `type`;
 	int `struct`;
-} st;
+} st = { 10, 10 };
 
 typedef int `forall`;
-`forall` `throw`;
+`forall` `throw` = 10;
 
-int foo() {
-	int w = `catch` + st.`type` + st.`struct` + `throw`;
+int main() {
+	ofstream *sout = ofstream_stdout();
+	sout | `catch` + st.`type` + st.`struct` + `throw` | endl;
 }
 
Index: src/examples/s.c
===================================================================
--- src/examples/s.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/s.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -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:42:39 2015
-// Update Count     : 2
+// Last Modified On : Sun Jan  3 22:38:45 2016
+// Update Count     : 3
 //
 
@@ -17,6 +17,6 @@
 
 void f() {
-//	int a;
-//	a ? 4 : 5;
+	int a;
+	a ? 4 : 5;
 	1 ? 4 : 5;
 	0 ? 4 : 5;
Index: src/examples/square.c
===================================================================
--- src/examples/square.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/square.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,36 +10,63 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:43:34 2015
-// Update Count     : 2
+// Last Modified On : Tue Jan  5 18:08:20 2016
+// Update Count     : 21
 //
 
-extern "C" {
-#include <stdio.h>
-}
+#include "fstream.h"
 
 forall( type T | { T ?*?( T, T ); } )
 T square( T t ) {
 	return t * t;
-}
-
-//char ?*?( char a1, char a2 ) {
-//	return (char)( (int)a1 * (int)a2 );
-//}
+} // square
 
 int main() {
-	char c = 5;
-	short int s = 5;
-	int i = 5;
-	float f = 5.0;
-	double d = 5.0;
-//	printf( "result of square of 5 is %d\n", (char)square( c ) );
-	printf( "result of square of 5 is %d\n", square( s ) );
-	printf( "result of square of 5 is %d\n", square( i ) );
-	printf( "result of square of 5 is %f\n", square( f ) );
-	printf( "result of square of 5 is %f\n", square( d ) );
-}
+#if 0
+	ofstream *sout = ofstream_stdout();
+	sout | "result of squaring 9 is " | endl;
+
+	// char does not have multiplication.
+	char ?*?( char a1, char a2 ) {
+		return (char)((int)a1 * (int)a2);
+	} // ?*?
+	char c = 9;
+	sout | "char\t\t\t" | square( c ) | endl;
+
+	sout | square( s ) | endl;
+#endif
+	short int s = 9;
+	square( s );
+#if 0
+	signed int i = 9;
+	sout | "signed int\t\t" | square( i ) | endl;
+
+	unsigned int ui = 9;
+	sout | "unsigned int\t\t" | square( ui ) | endl;
+
+	long int li = 9;
+	sout | "signed long int\t\t" | square( li ) | endl;
+
+	unsigned long int uli = 9;
+	sout | "unsigned long int\t" | square( uli ) | endl;
+
+	signed long long int lli = 9;
+	sout | "signed long long int\t" | square( lli ) | endl;
+
+	unsigned long long int ulli = 9;
+	sout | "unsigned long long int\t" | square( ulli ) | endl;
+
+	float f = 9.0;
+	sout | "float\t\t\t" | square( f ) | endl;
+
+	double d = 9.0;
+	sout | "double\t\t\t" | square( d ) | endl;
+
+	long double ld = 9.0;
+	sout | "long double\t\t" | square( ld ) | endl;
+#endif
+} // main
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa square.c" //
+// compile-command: "cfa square.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/sum.c
===================================================================
--- src/examples/sum.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/sum.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,11 +10,8 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Nov 21 18:08:18 2015
-// Update Count     : 119
+// Last Modified On : Mon Jan  4 07:40:24 2016
+// Update Count     : 126
 //
 
-extern "C" {
-	int printf( char *, ... );
-}
 #include "fstream.h"
 
@@ -41,5 +38,5 @@
 char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
 
-int main() {
+int main( void ) {
 	const int low = 5, High = 15, size = High - low;
 
@@ -52,6 +49,6 @@
 		a[i] = v;
 	}
-	sout << "sum from " << low << " to " << High << " is "
-		 << (int)sum( size, a ) << ", check " << (int)s << endl;
+	sout | "sum from " | low | " to " | High | " is "
+		 | (int)sum( size, a ) | ", check " | (int)s | endl;
 
 	int s = 0, a[size];
@@ -61,6 +58,6 @@
 		a[i] = (int)v;
 	}
-	sout << "sum from " << low << " to " << High << " is "
-		 << sum( size, (int *)a ) << ", check " << (int)s << endl;
+	sout | "sum from " | low | " to " | High | " is "
+		 | sum( size, (int *)a ) | ", check " | (int)s | endl;
 
 	double s = 0.0, a[size];
@@ -70,7 +67,6 @@
 		a[i] = (double)v;
 	}
-	printf( "%g\n", sum( size, (double *)a ) );
-//	sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//		 << sum( size, (double *)a ) << ", check " << (double)s << endl;
+	sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is "
+		 | sum( size, (double *)a ) | ", check " | (double)s | endl;
 
 	float s = 0.0, a[size];
@@ -80,11 +76,10 @@
 		a[i] = (float)v;
 	}
-	printf( "%g\n", sum( size, (float *)a ) );
-//	sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//		 << sum( size, (float *)a ) << ", check " << (float)s << endl;
+	sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is "
+		 | sum( size, (float *)a ) | ", check " | (float)s | endl;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa sum.c fstream.o iostream.o" //
+// compile-command: "cfa sum.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/swap.c
===================================================================
--- src/examples/swap.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/swap.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,11 +10,9 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:34:47 2015
-// Update Count     : 1
+// Last Modified On : Mon Jan  4 11:32:25 2016
+// Update Count     : 5
 //
 
-extern "C" {
-	int printf( const char *, ... );
-}
+#include "fstream.h"
 
 forall( type T )
@@ -25,13 +23,14 @@
 }
 
-int main() {
+int main( void ) {
 	int x = 1, y = 2;
-	printf( "%d %d\n", x, y );
+	ofstream *sout = ofstream_stdout();
+	sout | x | ' ' | y | endl;
 	swap( &x, &y );
-	printf( "%d %d\n", x, y );
+	sout | x | ' ' | y | endl;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa swap.c" //
+// compile-command: "cfa swap.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/twice.c
===================================================================
--- src/examples/twice.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/twice.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -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:37:23 2015
-// Update Count     : 1
+// Last Modified On : Mon Jan  4 11:32:04 2016
+// Update Count     : 10
 //
 
@@ -21,11 +21,16 @@
 }
 
-int main() {
+int main( void ) {
+	// char does not have addition
+	char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
+	char ++?( char *op ) { *op += 1; return *op; }
+	char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
+
 	ofstream *sout = ofstream_stdout();
-	sout << twice( 1 ) << ' ' << twice( 3.2 ) << '\n';
+	sout | twice( 'a' ) | ' ' | twice( 1 ) | ' ' | twice( 3.2 ) | endl;
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa twice.c fstream.o iostream.o" //
+// compile-command: "cfa twice.c fstream.o iostream.o iterator.o" //
 // End: //
Index: src/examples/vector_test.c
===================================================================
--- src/examples/vector_test.c	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/examples/vector_test.c	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 15 16:02:56 2015
-// Update Count     : 13
+// Last Modified On : Mon Jan  4 11:31:56 2016
+// Update Count     : 14
 //
 
@@ -19,5 +19,5 @@
 #include "iterator.h"
 
-int main() {
+int main( void ) {
 	ofstream *sout = ofstream_stdout();
 	ifstream *sin = ifstream_stdin();
Index: src/libcfa/prelude.cf
===================================================================
--- src/libcfa/prelude.cf	(revision 1cced2816c1a5a6e545b33c42c2e4ce165024ef1)
+++ src/libcfa/prelude.cf	(revision 784deab79c9d58f003b487276e5bf683364fc75c)
@@ -7,7 +7,7 @@
 // Author           : Glen Ditchfield
 // Created On       : Sat Nov 29 07:23:41 2014
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Nov 19 11:09:47 2015
-// Update Count     : 76
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jan  4 11:13:26 2016
+// Update Count     : 81
 //
 
@@ -149,7 +149,7 @@
 unsigned int		?*?( unsigned int, unsigned int ),			?/?( unsigned int, unsigned int ),		?%?( unsigned int, unsigned int );
 signed long int		?*?( signed long int, signed long int ),		?/?( signed long int, signed long int ),	?%?( signed long int, signed long int );
-unsigned long int	?*?( unsigned long int, unsigned long int ),		?/?( unsigned long int, long unsigned ),	?%?( long unsigned, long unsigned );
+unsigned long int	?*?( unsigned long int, unsigned long int ),		?/?( unsigned long int, unsigned long int ),	?%?( unsigned long int, unsigned long int );
 signed long long int	?*?( signed long long int, signed long long int ),	?/?( signed long long int, signed long long int ), ?%?( signed long long int, signed long long int );
-unsigned long long int	?*?( unsigned long long int, unsigned long long int ),	?/?( unsigned long long int, long long unsigned ), ?%?( long long unsigned, long long unsigned );
+unsigned long long int	?*?( unsigned long long int, unsigned long long int ),	?/?( unsigned long long int, unsigned long long int ), ?%?( unsigned long long int, unsigned long long int );
 float			?*?( float, float ),					?/?( float, float );
 double			?*?( double, double ),					?/?( double, double );
@@ -173,7 +173,7 @@
 unsigned int		?+?( unsigned int, unsigned int ),			?-?( unsigned int, unsigned int );
 signed long int		?+?( signed long int, signed long int ),		?-?( signed long int, signed long int );
-unsigned long int	?+?( unsigned long int, unsigned long int ),		?-?( unsigned long int, long unsigned );
+unsigned long int	?+?( unsigned long int, unsigned long int ),		?-?( unsigned long int, unsigned long int );
 signed long long int	?+?( signed long long int, long long int  signed),	?-?( signed long long int, signed long long int );
-unsigned long long int	?+?( unsigned long long int, unsigned long long int ),	?-?( unsigned long long int, long long unsigned );
+unsigned long long int	?+?( unsigned long long int, unsigned long long int ),	?-?( unsigned long long int, unsigned long long int );
 float			?+?( float, float ),					?-?( float, float );
 double			?+?( double, double ),					?-?( double, double );
@@ -203,9 +203,11 @@
 // ------------------------------------------------------------
 
-_Bool			?<<?( _Bool, _Bool ),				?>>?( _Bool, _Bool );
-signed int		?<<?( signed int, signed int ),			?>>?( signed int, signed int );
-unsigned int		?<<?( unsigned int, unsigned int ),		?>>?( unsigned int, unsigned int );
-signed long int		?<<?( signed long int, signed long int ),	?>>?( signed long int, signed long int );
-unsigned long int	?<<?( unsigned long int, long unsigned ),	?>>?( unsigned long int, unsigned long int );
+_Bool			?<<?( _Bool, _Bool ),					?>>?( _Bool, _Bool );
+signed int		?<<?( signed int, signed int ),				?>>?( signed int, signed int );
+unsigned int		?<<?( unsigned int, unsigned int ),			?>>?( unsigned int, unsigned int );
+signed long int		?<<?( signed long int, signed long int ),		?>>?( signed long int, signed long int );
+unsigned long int	?<<?( unsigned long int, unsigned long int ),		?>>?( unsigned long int, unsigned long int );
+signed long long int	?<<?( signed long long int, signed long long int ),	?>>?( signed long long int, signed long long int );
+unsigned long long int	?<<?( unsigned long long int, unsigned long long int ),	?>>?( unsigned long long int, unsigned long long int );
 
 // ------------------------------------------------------------
@@ -215,22 +217,26 @@
 // ------------------------------------------------------------
 
-signed int ?<?( _Bool, _Bool ),				?<=?( _Bool, _Bool ),
-	   ?>?( _Bool, _Bool ),				?>=?( _Bool, _Bool );
-signed int ?<?( unsigned char, unsigned char ),		?<=?( unsigned char, unsigned char ),
-	   ?>?( unsigned char, unsigned char ),		?>=?( unsigned char, unsigned char );
-signed int ?<?( signed int, signed int ),		?<=?( signed int, signed int ),
-	   ?>?( signed int, signed int ),		?>=?( signed int, signed int );
-signed int ?<?( unsigned int, unsigned int ),		?<=?( unsigned int, unsigned int ),
-	   ?>?( unsigned int, unsigned int ),		?>=?( unsigned int, unsigned int );
-signed int ?<?( signed long int, signed long int ),	?<=?( signed long int, signed long int ),
-	   ?>?( signed long int, signed long int ),	?>=?( signed long int, signed long int );
-signed int ?<?( unsigned long int, unsigned long int ),	?<=?( unsigned long int, unsigned long int ),
-	   ?>?( unsigned long int, unsigned long int ),	?>=?( unsigned long int, unsigned long int );
-signed int ?<?( float, float ),				?<=?( float, float ),
-	   ?>?( float, float ),				?>=?( float, float );
-signed int ?<?( double, double ),			?<=?( double, double ),
-	   ?>?( double, double ),			?>=?( double, double );
-signed int ?<?( long double, long double ),		?<=?( long double, long double ),
-	   ?>?( long double, long double ),		?>=?( long double, long double );
+signed int ?<?( _Bool, _Bool ),						?<=?( _Bool, _Bool ),
+	   ?>?( _Bool, _Bool ),						?>=?( _Bool, _Bool );
+signed int ?<?( unsigned char, unsigned char ),				?<=?( unsigned char, unsigned char ),
+	   ?>?( unsigned char, unsigned char ),				?>=?( unsigned char, unsigned char );
+signed int ?<?( signed int, signed int ),				?<=?( signed int, signed int ),
+	   ?>?( signed int, signed int ),				?>=?( signed int, signed int );
+signed int ?<?( unsigned int, unsigned int ),				?<=?( unsigned int, unsigned int ),
+	   ?>?( unsigned int, unsigned int ),				?>=?( unsigned int, unsigned int );
+signed int ?<?( signed long int, signed long int ),			?<=?( signed long int, signed long int ),
+	   ?>?( signed long int, signed long int ),			?>=?( signed long int, signed long int );
+signed int ?<?( unsigned long int, unsigned long int ),			?<=?( unsigned long int, unsigned long int ),
+	   ?>?( unsigned long int, unsigned long int ),			?>=?( unsigned long int, unsigned long int );
+signed int ?<?( signed long long int, signed long long int ),		?<=?( signed long long int, signed long long int ),
+	   ?>?( signed long long int, signed long long int ),		?>=?( signed long long int, signed long long int );
+signed int ?<?( unsigned long long int, unsigned long long int ),	?<=?( unsigned long long int, unsigned long long int ),
+	   ?>?( unsigned long long int, unsigned long long int ),	?>=?( unsigned long long int, unsigned long long int );
+signed int ?<?( float, float ),						?<=?( float, float ),
+	   ?>?( float, float ),						?>=?( float, float );
+signed int ?<?( double, double ),					?<=?( double, double ),
+	   ?>?( double, double ),					?>=?( double, double );
+signed int ?<?( long double, long double ),				?<=?( long double, long double ),
+	   ?>?( long double, long double ),				?>=?( long double, long double );
 
 forall( dtype DT ) signed int ?<?(  const volatile DT *, const volatile DT * );
@@ -245,17 +251,17 @@
 // ------------------------------------------------------------
 
-signed int ?==?( _Bool, _Bool ),				?!=?( _Bool, _Bool );
-signed int ?==?( signed int, signed int ),			?!=?( signed int, signed int );
-signed int ?==?( unsigned int, unsigned int ),			?!=?( unsigned int, unsigned int );
-signed int ?==?( signed long int, signed long int ),		?!=?( signed long int, signed long int );
-signed int ?==?( unsigned long int, unsigned long int ),	?!=?( unsigned long int, long unsigned );
-signed int ?==?( signed long long int, long long int  signed),	?!=?( signed long long int, signed long long int );
-signed int ?==?( unsigned long long int, unsigned long long int ), ?!=?( unsigned long long int, long long unsigned );
-signed int ?==?( float, float ),				?!=?( float, float );
-signed int ?==?( double, double ),				?!=?( double, double );
-signed int ?==?( long double, long double ),			?!=?( long double, long double );
-signed int ?==?( float _Complex, float _Complex ),		?!=?( float _Complex, float _Complex );
-signed int ?==?( double _Complex, double _Complex ),		?!=?( double _Complex, double _Complex );
-signed int ?==?( long double _Complex, long double _Complex ),	?!=?( long double _Complex, long double _Complex );
+signed int ?==?( _Bool, _Bool ),					?!=?( _Bool, _Bool );
+signed int ?==?( signed int, signed int ),				?!=?( signed int, signed int );
+signed int ?==?( unsigned int, unsigned int ),				?!=?( unsigned int, unsigned int );
+signed int ?==?( signed long int, signed long int ),			?!=?( signed long int, signed long int );
+signed int ?==?( unsigned long int, unsigned long int ),		?!=?( unsigned long int, unsigned long int );
+signed int ?==?( signed long long int, long long int  signed),		?!=?( signed long long int, signed long long int );
+signed int ?==?( unsigned long long int, unsigned long long int ),	?!=?( unsigned long long int, unsigned long long int );
+signed int ?==?( float, float ),					?!=?( float, float );
+signed int ?==?( double, double ),					?!=?( double, double );
+signed int ?==?( long double, long double ),				?!=?( long double, long double );
+signed int ?==?( float _Complex, float _Complex ),			?!=?( float _Complex, float _Complex );
+signed int ?==?( double _Complex, double _Complex ),			?!=?( double _Complex, double _Complex );
+signed int ?==?( long double _Complex, long double _Complex ),		?!=?( long double _Complex, long double _Complex );
 
 forall( dtype DT ) signed int ?==?(		   DT *,		DT * );
@@ -295,4 +301,6 @@
 signed long int		?&?( signed long int, signed long int );
 unsigned long int	?&?( unsigned long int, unsigned long int );
+signed long long int	?&?( signed long long int, signed long long int );
+unsigned long long int	?&?( unsigned long long int, unsigned long long int );
 
 // ------------------------------------------------------------
@@ -307,4 +315,6 @@
 signed long int		?^?( signed long int, signed long int );
 unsigned long int	?^?( unsigned long int, unsigned long int );
+signed long long int	?^?( signed long long int, signed long long int );
+unsigned long long int	?^?( unsigned long long int, unsigned long long int );
 
 // ------------------------------------------------------------
@@ -319,4 +329,6 @@
 signed long int		?|?( signed long int, signed long int );
 unsigned long int	?|?( unsigned long int, unsigned long int );
+signed long long int	?|?( signed long long int, signed long long int );
+unsigned long long int	?|?( unsigned long long int, unsigned long long int );
 
 // ------------------------------------------------------------