Index: src/SynTree/AggregateDecl.cc
===================================================================
--- src/SynTree/AggregateDecl.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/AggregateDecl.cc	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 23:56:39 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:10:22 2019
-// Update Count     : 30
+// Last Modified On : Mon Dec 16 15:07:20 2019
+// Update Count     : 31
 //
 
@@ -55,5 +55,5 @@
 	os << typeString() << " " << name << ":";
 	if ( get_linkage() != LinkageSpec::Cforall ) {
-		os << " " << LinkageSpec::linkageName( linkage );
+		os << " " << LinkageSpec::name( linkage );
 	} // if
 	os << " with body " << has_body();
Index: src/SynTree/FunctionDecl.cc
===================================================================
--- src/SynTree/FunctionDecl.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/FunctionDecl.cc	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:10:34 2019
-// Update Count     : 76
+// Last Modified On : Mon Dec 16 15:11:20 2019
+// Update Count     : 77
 //
 
@@ -73,5 +73,5 @@
 	} // if
 	if ( linkage != LinkageSpec::Cforall ) {
-		os << LinkageSpec::linkageName( linkage ) << " ";
+		os << LinkageSpec::name( linkage ) << " ";
 	} // if
 
Index: src/SynTree/LinkageSpec.cc
===================================================================
--- src/SynTree/LinkageSpec.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/LinkageSpec.cc	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -9,12 +9,12 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Spt 12 15:59:00 2018
-// Update Count     : 26
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Dec 16 15:02:29 2019
+// Update Count     : 28
 //
 
-#include <memory>
+#include <cassert>
+#include <memory>   // for unique_ptr
 #include <string>
-#include <cassert>
 using namespace std;
 
@@ -23,40 +23,30 @@
 
 namespace LinkageSpec {
+	Spec update( CodeLocation location, Spec spec, const string * cmd ) {
+		assert( cmd );
+		unique_ptr<const string> guard( cmd ); // allocated by lexer
+		if ( *cmd == "\"Cforall\"" ) {
+			spec.is_mangled = true;
+			return spec;
+		} else if ( *cmd == "\"C\"" ) {
+			spec.is_mangled = false;
+			return spec;
+		} else {
+			SemanticError( location, "Invalid linkage specifier " + *cmd );
+		} // if
+	} // update
 
-Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) {
-	assert( cmd );
-	unique_ptr<const string> guard( cmd ); // allocated by lexer
-	if ( *cmd == "\"Cforall\"" ) {
-		old_spec.is_mangled = true;
-		return old_spec;
-	} else if ( *cmd == "\"C\"" ) {
-		old_spec.is_mangled = false;
-		return old_spec;
-	} else {
-		SemanticError( location, "Invalid linkage specifier " + *cmd );
-	} // if
-}
-
-std::string linkageName( Spec linkage ) {
-    switch ( linkage ) {
-    case Intrinsic:
-        return "intrinsic";
-    case C:
-        return "C";
-    case Cforall:
-        return "Cforall";
-    case AutoGen:
-        return "autogenerated cfa";
-    case Compiler:
-        return "compiler built-in";
-    case BuiltinCFA:
-        return "cfa built-in";
-    case BuiltinC:
-        return "c built-in";
-    default:
-        return "<unnamed linkage spec>";
-    }
-}
-
+	string name( Spec spec ) {
+		switch ( spec ) {
+		  case Intrinsic: return "intrinsic";
+		  case C: return "C";
+		  case Cforall: return "Cforall";
+		  case AutoGen: return "autogenerated cfa";
+		  case Compiler: return "compiler built-in";
+		  case BuiltinCFA: return "cfa built-in";
+		  case BuiltinC: return "c built-in";
+		  default: return "<unnamed linkage spec>";
+		} // siwtch
+	} // name
 } // LinkageSpec
 
Index: src/SynTree/LinkageSpec.h
===================================================================
--- src/SynTree/LinkageSpec.h	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/LinkageSpec.h	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 10 16:02:34 2019
-// Update Count     : 18
+// Last Modified On : Mon Dec 16 15:03:43 2019
+// Update Count     : 20
 //
 
@@ -21,7 +21,14 @@
 
 namespace LinkageSpec {
-	// All linkage specs are some combination of these flags:
-	enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
+	// Bitflags for linkage specifiers
+	enum {
+		Mangle = 1 << 0,
+		Generate = 1 << 1,
+		Overrideable = 1 << 2,
+		Builtin = 1 << 3,
+		GccBuiltin = 1 << 4,
+	};
 
+	// Bitflag type for storage classes
 	union Spec {
 		unsigned int val;
@@ -42,10 +49,9 @@
 
 
-	Spec linkageUpdate( CodeLocation location, Spec old_spec, const std::string * cmd );
-	/* If cmd = "C" returns a Spec that is old_spec with is_mangled = false
-	 * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
-	 */
+	Spec update( CodeLocation location, Spec spec, const std::string * cmd );
+	// If cmd = "C" returns a Spec that is old_spec with is_mangled = false
+	// If cmd = "Cforall" returns old_spec Spec with is_mangled = true
 
-	std::string linkageName( Spec );
+	std::string name( Spec );
 
 	// To Update: LinkageSpec::isXyz( cur_spec ) -> cur_spec.is_xyz
Index: src/SynTree/NamedTypeDecl.cc
===================================================================
--- src/SynTree/NamedTypeDecl.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/NamedTypeDecl.cc	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:44:24 2019
-// Update Count     : 16
+// Last Modified On : Mon Dec 16 15:11:40 2019
+// Update Count     : 17
 //
 
@@ -44,5 +44,5 @@
 
 	if ( linkage != LinkageSpec::Cforall ) {
-		os << LinkageSpec::linkageName( linkage ) << " ";
+		os << LinkageSpec::name( linkage ) << " ";
 	} // if
 	get_storageClasses().print( os );
Index: src/SynTree/ObjectDecl.cc
===================================================================
--- src/SynTree/ObjectDecl.cc	(revision 07de76bb7a0e1179ac6fb9bae0cb96e709315c84)
+++ src/SynTree/ObjectDecl.cc	(revision e0c235ca8e62339b4cd07c92fdf5cb4522119b86)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:44:50 2019
-// Update Count     : 60
+// Last Modified On : Mon Dec 16 15:12:03 2019
+// Update Count     : 61
 //
 
@@ -48,5 +48,5 @@
 
 	if ( linkage != LinkageSpec::Cforall ) {
-		os << LinkageSpec::linkageName( linkage ) << " ";
+		os << LinkageSpec::name( linkage ) << " ";
 	} // if