Index: src/InitTweak/InitTweak.cc
===================================================================
--- src/InitTweak/InitTweak.cc	(revision fdd0509487d63253738f8e8217fdb95ae3fb381e)
+++ src/InitTweak/InitTweak.cc	(revision 8aa474a522cf439767cfb0cb3720af96323fc04f)
@@ -564,4 +564,17 @@
 		void previsit( ConstantExpr * ) {}
 
+		void previsit( VariableExpr * varExpr ) {
+			visit_children = false;
+
+			if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( varExpr->result ) ) {
+				long long int value;
+				if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
+					// enumerators are const expr
+					return;
+				}
+			}
+			isConstExpr = false;
+		}
+
 		bool isConstExpr = true;
 	};