Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 11f95ee5606eec72d0fcac9490bf3b668c7a28fd)
+++ src/CodeGen/CodeGenerator.cc	(revision dd020c0cdff72537d5b1dffcf6920c72db9d585a)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:56:29 2017
-// Update Count     : 418
+// Last Modified On : Fri Mar  3 21:18:47 2017
+// Update Count     : 465
 //
 
@@ -134,10 +134,6 @@
 
 		handleStorageClass( functionDecl );
-		if ( functionDecl->get_isInline() ) {
-			output << "inline ";
-		} // if
-		if ( functionDecl->get_isNoreturn() ) {
-			output << "_Noreturn ";
-		} // if
+		DeclarationNode::print_FuncSpec( output, functionDecl->get_funcSpec() );
+
 		output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
 
@@ -835,5 +831,4 @@
 	}
 
-
 	void CodeGenerator::visit( ReturnStmt * returnStmt ) {
 		output << "return ";
@@ -899,6 +894,7 @@
 	}
 
-	void CodeGenerator::handleStorageClass( Declaration * decl ) {
+	void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
 		switch ( decl->get_storageClass() ) {
+			//output << DeclarationNode::storageClassNames[decl->get_storageClass()] << ' ';
 		  case DeclarationNode::Extern:
 			output << "extern ";
@@ -913,20 +909,13 @@
 			output << "register ";
 			break;
-		  case DeclarationNode::Inline:
-			output << "inline ";
-			break;
-		  case DeclarationNode::Fortran:
-			output << "fortran ";
-			break;
-		  case DeclarationNode::Noreturn:
-			output << "_Noreturn ";
-			break;
 		  case DeclarationNode::Threadlocal:
-			output << "_Thread_local ";
-			break;
+		  	output << "_Thread_local ";
+		  	break;
 		  case DeclarationNode::NoStorageClass:
 			break;
+		  default:
+			assert( false );
 		} // switch
-	}
+	} // CodeGenerator::handleStorageClass
 
 	std::string genName( DeclarationWithType * decl ) {
Index: src/CodeGen/CodeGenerator.h
===================================================================
--- src/CodeGen/CodeGenerator.h	(revision 11f95ee5606eec72d0fcac9490bf3b668c7a28fd)
+++ src/CodeGen/CodeGenerator.h	(revision dd020c0cdff72537d5b1dffcf6920c72db9d585a)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 15:06:21 2017
-// Update Count     : 49
+// Last Modified On : Wed Mar  1 16:20:04 2017
+// Update Count     : 50
 //
 
@@ -123,5 +123,5 @@
 
 		void printDesignators( std::list< Expression * > & );
-		void handleStorageClass( Declaration *decl );
+		void handleStorageClass( DeclarationWithType *decl );
 		void handleAggregate( AggregateDecl *aggDecl );
 		void handleTypedef( NamedTypeDecl *namedType );
Index: src/CodeGen/FixNames.cc
===================================================================
--- src/CodeGen/FixNames.cc	(revision 11f95ee5606eec72d0fcac9490bf3b668c7a28fd)
+++ src/CodeGen/FixNames.cc	(revision dd020c0cdff72537d5b1dffcf6920c72db9d585a)
@@ -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 : Mon Apr 11 15:38:10 2016
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar  3 21:52:17 2017
+// Update Count     : 6
 //
 
@@ -44,5 +44,5 @@
 			LinkageSpec::Cforall, 
 			main_type = new FunctionType( Type::Qualifiers(), true ), 
-			nullptr, false, false
+			nullptr
 		) };
 		main_type->get_returnVals().push_back( 
@@ -50,5 +50,5 @@
 		);
 
-		auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
+		auto && name = SymTab::Mangler::mangle( mainDecl.get() );
 		// std::cerr << name << std::endl;
 		return name;
@@ -61,5 +61,5 @@
 			LinkageSpec::Cforall, 
 			main_type = new FunctionType( Type::Qualifiers(), false ), 
-			nullptr, false, false
+			nullptr
 		) };
 		main_type->get_returnVals().push_back(