Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 5b2f5bb4b0269a726d7840b6f270858c3ff12d9a)
+++ src/CodeGen/CodeGenerator.cc	(revision a5a71d0e95113b304e03502a14ccab969324804f)
@@ -10,5 +10,5 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Mar 30 14:39:30 2016
+// Last Modified On : Mon Apr 04 17:08:06 2016
 // Update Count     : 255
 //
@@ -21,8 +21,9 @@
 #include "Parser/ParseNode.h"
 
-#include "SynTree/Type.h"
+#include "SynTree/Declaration.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Statement.h"
+#include "SynTree/Type.h"
 
 #include "Common/utility.h"
@@ -170,5 +171,5 @@
 	}
 
-	void CodeGenerator::visit( ContextDecl *aggregateDecl ) {}
+	void CodeGenerator::visit( TraitDecl *aggregateDecl ) {}
 
 	void CodeGenerator::visit( TypedefDecl *typeDecl ) {
Index: src/CodeGen/CodeGenerator.h
===================================================================
--- src/CodeGen/CodeGenerator.h	(revision 5b2f5bb4b0269a726d7840b6f270858c3ff12d9a)
+++ src/CodeGen/CodeGenerator.h	(revision a5a71d0e95113b304e03502a14ccab969324804f)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 14:27:14 2015
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:32:24 2016
+// Update Count     : 28
 //
 
@@ -19,6 +19,8 @@
 #include <list>
 
+#include "SynTree/Declaration.h"
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
+
 #include "SymTab/Indexer.h"
 
@@ -38,5 +40,5 @@
 		virtual void visit( UnionDecl *aggregateDecl );
 		virtual void visit( EnumDecl *aggregateDecl );
-		virtual void visit( ContextDecl *aggregateDecl );
+		virtual void visit( TraitDecl *aggregateDecl );
 		virtual void visit( TypedefDecl *typeDecl );
 		virtual void visit( TypeDecl *typeDecl );
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision 5b2f5bb4b0269a726d7840b6f270858c3ff12d9a)
+++ src/CodeGen/GenType.cc	(revision a5a71d0e95113b304e03502a14ccab969324804f)
@@ -19,7 +19,9 @@
 #include "GenType.h"
 #include "CodeGenerator.h"
+
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
 #include "SynTree/Visitor.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
 
 namespace CodeGen {
@@ -194,5 +196,5 @@
 	void GenType::visit( VarArgsType *varArgsType ) {
 		typeString = "__builtin_va_list " + typeString;
-		// don't handle qualifiers, var args pack shouldn't have any
+		handleQualifiers( varArgsType );
 	}