Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 5bb1ac108d66b3bbf5b72ee26e4034dc1e0a9a18)
+++ src/ResolvExpr/Resolver.cc	(revision 9e7236f4ea98982d55cddf21f808b612dbfe6ddf)
@@ -427,4 +427,5 @@
 			// enumerator initializers should not use the enum type to initialize, since
 			// the enum type is still incomplete at this point. Use signed int instead.
+			// TODO: BasicType::SignedInt may not longer be true
 			currentObject = CurrentObject( new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );
 		}
@@ -1477,22 +1478,5 @@
 			// enum type is still incomplete at this point. Use `int` instead.
 
-			if (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base) { // const ast::PointerType &
-				// const ast::Type * enumBase =  (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base.get());
-				// const ast::PointerType * enumBaseAsPtr = dynamic_cast<const ast::PointerType *>(enumBase);
-
-				// if ( enumBaseAsPtr ) {
-				// 	const ast::Type * pointerBase = enumBaseAsPtr->base.get();
-				// 	if ( dynamic_cast<const ast::BasicType *>(pointerBase) ) {
-				// 		objectDecl = fixObjectType(objectDecl, context);
-				// 		if (dynamic_cast<const ast::BasicType *>(pointerBase)->kind == ast::BasicType::Char)
-				// 		currentObject = ast::CurrentObject{
-				// 	 		objectDecl->location,  new ast::PointerType{ 
-				// 			 	new ast::BasicType{ ast::BasicType::Char }
-				// 			} };
-				// 	} else {
-				// 		objectDecl = fixObjectType(objectDecl, context);
-				// 		currentObject = ast::CurrentObject{objectDecl->location, new ast::BasicType{ ast::BasicType::SignedInt } };
-				// 	}
-				// }
+			if (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base) {
 				objectDecl = fixObjectType( objectDecl, context );
 				const ast::Type * enumBase =  (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base.get());