diff --git a/parse.y b/parse.y
index 243f6703b..6c285e71f 100644
--- a/parse.y
+++ b/parse.y
@@ -2907,6 +2907,7 @@ enum_data_type /* IEEE 1800-2012 A.2.2.1 */
       { enum_type_t*enum_type = $2;
 	FILE_NAME(enum_type, @1);
 	enum_type->names.reset($4);
+	pform_put_enum_type_in_scope(enum_type);
 	$$ = enum_type;
       }
   ;
diff --git a/pform.cc b/pform.cc
index 98c49fb5e..1ee8de7d9 100644
--- a/pform.cc
+++ b/pform.cc
@@ -827,7 +827,7 @@ static void pform_put_wire_in_scope(perm_string name, PWire*net)
       lexical_scope->wires[name] = net;
 }
 
-static void pform_put_enum_type_in_scope(enum_type_t*enum_set)
+void pform_put_enum_type_in_scope(enum_type_t*enum_set)
 {
       if (lexical_scope->enum_sets.count(enum_set))
             return;
@@ -888,9 +888,6 @@ void pform_set_typedef(perm_string name, data_type_t*data_type, std::list<pform_
       ivl_assert(*data_type, ref == 0);
       ref = data_type;
       ref->name = name;
-
-      if (enum_type_t*enum_type = dynamic_cast<enum_type_t*>(data_type))
-	    pform_put_enum_type_in_scope(enum_type);
 }
 
 void pform_set_type_referenced(const struct vlltype&loc, const char*name)
@@ -3592,10 +3589,6 @@ static void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type,
 	// Add the file and line information to the enumeration type.
       FILE_NAME(&(enum_type->li), li);
 
-	// If this is an anonymous enumeration, attach it to the current scope.
-      if (enum_type->name.nil())
-	    pform_put_enum_type_in_scope(enum_type);
-
 	// Now apply the checked enumeration type to the variables
 	// that are being declared with this type.
       for (list<perm_string>::iterator cur = names->begin()
diff --git a/pform.h b/pform.h
index a2d2d3f8d..e95e164ec 100644
--- a/pform.h
+++ b/pform.h
@@ -613,4 +613,6 @@ extern void pform_set_timeprec(const char*txt, bool initial_decl);
 extern bool allow_timeunit_decl;
 extern bool allow_timeprec_decl;
 
+void pform_put_enum_type_in_scope(enum_type_t*enum_set);
+
 #endif /* IVL_pform_H */
diff --git a/pform_pclass.cc b/pform_pclass.cc
index 15c3d0e2a..e9facc013 100644
--- a/pform_pclass.cc
+++ b/pform_pclass.cc
@@ -69,10 +69,6 @@ void pform_class_property(const struct vlltype&loc,
 {
       assert(pform_cur_class);
 
-      if (enum_type_t*enum_set = dynamic_cast<enum_type_t*>(data_type)) {
-	    pform_cur_class->enum_sets .insert(enum_set);
-      }
-
 	// Add the non-static properties to the class type
 	// object. Unwind the list of names to make a map of name to
 	// type.