Index: src/InitTweak/FixGlobalInit.cc
===================================================================
--- src/InitTweak/FixGlobalInit.cc	(revision a7c90d4d68e0538c8215b52b958e12c56980c401)
+++ src/InitTweak/FixGlobalInit.cc	(revision 4da6a6c62c48d6182b9a9e4567acfd2fb4311701)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 04 15:14:56 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 23:14:19 2017
-// Update Count     : 14
+// Last Modified On : Mon Mar 13 23:58:27 2017
+// Update Count     : 16
 //
 
@@ -87,7 +87,7 @@
 			dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
 		}
-		initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+		initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
 		initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-		destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+		destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
 		destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
 	}
@@ -143,3 +143,2 @@
 // compile-command: "make install" //
 // End: //
-
Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision a7c90d4d68e0538c8215b52b958e12c56980c401)
+++ src/InitTweak/FixInit.cc	(revision 4da6a6c62c48d6182b9a9e4567acfd2fb4311701)
@@ -10,6 +10,6 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:51:40 2017
-// Update Count     : 59
+// Last Modified On : Tue Mar 14 08:05:28 2017
+// Update Count     : 63
 //
 
@@ -678,5 +678,5 @@
 				assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
 				if ( Statement * ctor = ctorInit->get_ctor() ) {
-					if ( objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
+					if ( objDecl->get_storageClasses().is_static ) {
 						// originally wanted to take advantage of gcc nested functions, but
 						// we get memory errors with this approach. To remedy this, the static
@@ -704,5 +704,5 @@
 						BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
 						SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
-						ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
+						ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
 						isUninitializedVar->fixUniqueId();
 
@@ -731,5 +731,5 @@
 
 							// void __objName_dtor_atexitN(...) {...}
-							FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+							FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
 							dtorCaller->fixUniqueId();
 							dtorCaller->get_statements()->push_back( dtorStmt );
@@ -764,5 +764,5 @@
 							// create a new object which is never used
 							static UniqueName dummyNamer( "_dummy" );
-							ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+							ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
 							return dummy;
 						}
@@ -821,5 +821,5 @@
 		void InsertDtors::visit( ObjectDecl * objDecl ) {
 			// remember non-static destructed objects so that their destructors can be inserted later
-			if ( ! objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
+			if ( ! objDecl->get_storageClasses().is_static ) {
 				if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
 					// a decision should have been made by the resolver, so ctor and init are not both non-NULL
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision a7c90d4d68e0538c8215b52b958e12c56980c401)
+++ src/InitTweak/GenInit.cc	(revision 4da6a6c62c48d6182b9a9e4567acfd2fb4311701)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  7 07:51:38 2017
-// Update Count     : 179
+// Last Modified On : Mon Mar 13 23:59:09 2017
+// Update Count     : 180
 //
 
@@ -186,5 +186,5 @@
 		// C doesn't allow variable sized arrays at global scope or for static variables, so don't hoist dimension.
 		if ( ! inFunction ) return;
-		if ( storageClasses[ DeclarationNode::StaticClass] ) return;
+		if ( storageClasses.is_static ) return;
 
 		if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision a7c90d4d68e0538c8215b52b958e12c56980c401)
+++ src/InitTweak/InitTweak.cc	(revision 4da6a6c62c48d6182b9a9e4567acfd2fb4311701)
@@ -260,5 +260,5 @@
 			(objDecl->get_init() == NULL ||
 				( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
-			&& ! objDecl->get_storageClasses()[ DeclarationNode::Extern ];
+			&& ! objDecl->get_storageClasses().is_extern;
 	}