Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/ControlStruct/ExceptTranslate.cc	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -10,6 +10,6 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 12 15:07:00 2017
-// Update Count     : 3
+// Last Modified On : Tus Jul 18 10:09:00 2017
+// Update Count     : 4
 //
 
@@ -50,5 +50,5 @@
 			LinkageSpec::Cforall,
 			/*bitfieldWidth*/ NULL,
-			new BasicType( emptyQualifiers, BasicType::SignedInt ),
+			new BasicType( noQualifiers, BasicType::SignedInt ),
 			/*init*/ NULL
 			);
@@ -59,6 +59,6 @@
 			/*bitfieldWidth*/ NULL,
 			new PointerType(
-				emptyQualifiers,
-				new BasicType( emptyQualifiers, BasicType::SignedInt )
+				noQualifiers,
+				new BasicType( noQualifiers, BasicType::SignedInt )
 				),
 			/*init*/ NULL
@@ -69,5 +69,5 @@
 			LinkageSpec::Cforall,
 			/*bitfieldWidth*/ NULL,
-			new BasicType(emptyQualifiers, BasicType::Bool),
+			new BasicType(noQualifiers, BasicType::Bool),
 			/*init*/ NULL
 			);
@@ -78,7 +78,7 @@
 			NULL,
 			new PointerType(
-				emptyQualifiers,
+				noQualifiers,
 				new VoidType(
-					emptyQualifiers
+					noQualifiers
 					),
 				std::list<Attribute *>{new Attribute("unused")}
@@ -143,5 +143,5 @@
 			LinkageSpec::Cforall,
 			NULL,
-			new BasicType( emptyQualifiers, BasicType::SignedInt ),
+			new BasicType( noQualifiers, BasicType::SignedInt ),
 			new SingleInit( throwStmt->get_expr() )
 			);
@@ -444,5 +444,5 @@
 			nullptr,
 			new StructInstType(
-				emptyQualifiers,
+				noQualifiers,
 				hook_decl
 				),
Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/Parser/ExpressionNode.cc	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -9,7 +9,7 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 16:09:04 2017
-// Update Count     : 549
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:08:00 2017
+// Update Count     : 550
 //
 
@@ -46,5 +46,5 @@
 // type.
 
-Type::Qualifiers emptyQualifiers;				// no qualifiers on constants
+Type::Qualifiers noQualifiers;				// no qualifiers on constants
 
 static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
@@ -118,5 +118,5 @@
 	} // if
 
-	Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str, v ) );
+	Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
 	delete &str;										// created by lex
 	return ret;
@@ -153,5 +153,5 @@
 	} // if
 
-	Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str, v ) );
+	Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
 	delete &str;										// created by lex
 	return ret;
@@ -159,5 +159,5 @@
 
 Expression *build_constantChar( const std::string & str ) {
-	Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
+	Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
 	delete &str;										// created by lex
 	return ret;
@@ -166,5 +166,5 @@
 ConstantExpr *build_constantStr( const std::string & str ) {
 	// string should probably be a primitive type
-	ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+	ArrayType *at = new ArrayType( noQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
 								   new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ),  // +1 for '\0' and -2 for '"'
 								   false, false );
@@ -176,5 +176,5 @@
 
 Expression *build_constantZeroOne( const std::string & str ) {
-	Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str,
+	Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( noQualifiers ) : (Type*)new OneType( noQualifiers ), str,
 												   str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
 	delete &str;										// created by lex
Index: src/Parser/TypeData.cc
===================================================================
--- src/Parser/TypeData.cc	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/Parser/TypeData.cc	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:58:00 2017
-// Update Count     : 565
+// Last Modified On : Tus Jul 18 10:10:00 2017
+// Update Count     : 566
 //
 
@@ -454,8 +454,8 @@
 	  case TypeData::Builtin:
 		if(td->builtintype == DeclarationNode::Zero) {
-			return new ZeroType( emptyQualifiers );
+			return new ZeroType( noQualifiers );
 		}
 		else if(td->builtintype == DeclarationNode::One) {
-			return new OneType( emptyQualifiers );
+			return new OneType( noQualifiers );
 		}
 		else {
Index: src/Parser/lex.ll
===================================================================
--- src/Parser/lex.ll	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/Parser/lex.ll	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -10,6 +10,6 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Jul 15 15:46:34 2017
- * Update Count     : 542
+ * Last Modified On : Tue Jul 18 07:11:48 2017
+ * Update Count     : 544
  */
 
@@ -232,4 +232,5 @@
 int				{ KEYWORD_RETURN(INT); }
 __int128		{ KEYWORD_RETURN(INT); }				// GCC
+__int128_t		{ KEYWORD_RETURN(INT); }				// GCC
 __label__		{ KEYWORD_RETURN(LABEL); }				// GCC
 long			{ KEYWORD_RETURN(LONG); }
@@ -266,4 +267,5 @@
 __typeof		{ KEYWORD_RETURN(TYPEOF); }				// GCC
 __typeof__		{ KEYWORD_RETURN(TYPEOF); }				// GCC
+__uint128_t		{ KEYWORD_RETURN(INT); }				// GCC
 union			{ KEYWORD_RETURN(UNION); }
 unsigned		{ KEYWORD_RETURN(UNSIGNED); }
Index: src/Parser/parserutility.cc
===================================================================
--- src/Parser/parserutility.cc	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/Parser/parserutility.cc	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -9,7 +9,7 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:30:39 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 22:11:32 2017
-// Update Count     : 7
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:12:00 2017
+// Update Count     : 8
 //
 
@@ -26,5 +26,5 @@
 	UntypedExpr *comparison = new UntypedExpr( new NameExpr( "?!=?" ) );
 	comparison->get_args().push_back( orig );
-	comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0", (unsigned long long int)0 ) ) );
+	comparison->get_args().push_back( new ConstantExpr( Constant( new ZeroType( noQualifiers ), "0", (unsigned long long int)0 ) ) );
 	return new CastExpr( comparison, new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
 }
Index: src/SynTree/Type.h
===================================================================
--- src/SynTree/Type.h	(revision 969b3fe94aa766b88f7118e8eeb243c4fcb8096b)
+++ src/SynTree/Type.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 23 16:16:36 2017
-// Update Count     : 149
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 18 10:06:00 2017
+// Update Count     : 150
 //
 
@@ -172,5 +172,5 @@
 };
 
-extern Type::Qualifiers emptyQualifiers;				// no qualifiers on constants
+extern Type::Qualifiers noQualifiers;				// no qualifiers on constants
 
 class VoidType : public Type {
Index: src/libcfa/stdhdr/bfdlink.h
===================================================================
--- src/libcfa/stdhdr/bfdlink.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
+++ src/libcfa/stdhdr/bfdlink.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -0,0 +1,33 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+// 
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// bfdlink.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:26:04 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:46:50 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "with".
+#if ! defined( with )									// nesting ?
+#define with `with`										// make keyword an identifier
+#define __CFA_BFDLINK_H__
+#endif
+
+#include_next <bfdlink.h>								// must have internal check for multiple expansion
+
+#if defined( with ) && defined( __CFA_BFDLINK_H__ )		// reset only if set
+#undef with
+#undef __CFA_BFDLINK_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/hwloc.h
===================================================================
--- src/libcfa/stdhdr/hwloc.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
+++ src/libcfa/stdhdr/hwloc.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -0,0 +1,33 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+// 
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// hwloc.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:45:00 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:56:33 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "thread".
+#if ! defined( thread )									// nesting ?
+#define thread `thread`									// make keyword an identifier
+#define __CFA_HWLOC_H__
+#endif
+
+#include_next <hwloc.h>									// must have internal check for multiple expansion
+
+#if defined( thread ) && defined( __CFA_HWLOC_H__ )		// reset only if set
+#undef thread
+#undef __CFA_HWLOC_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/libcfa/stdhdr/krb5.h
===================================================================
--- src/libcfa/stdhdr/krb5.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
+++ src/libcfa/stdhdr/krb5.h	(revision a57cb5818062b911ae08cc2becf536de477363ab)
@@ -0,0 +1,33 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
+// 
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// krb5.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Jul 18 07:55:44 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 18 07:58:01 2017
+// Update Count     : 3
+// 
+
+// include file uses the CFA keyword "enable".
+#if ! defined( enable )									// nesting ?
+#define enable `enable`									// make keyword an identifier
+#define __CFA_KRB5_H__
+#endif
+
+#include_next <krb5.h>									// must have internal check for multiple expansion
+
+#if defined( enable ) && defined( __CFA_KRB5_H__ )		// reset only if set
+#undef enable
+#undef __CFA_KRB5_H__
+#endif
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //