Index: libcfa/src/enum.cfa
===================================================================
--- libcfa/src/enum.cfa	(revision d5efcb72910e612e3c6dc8ed684f24bef154e8fd)
+++ libcfa/src/enum.cfa	(revision 259012e3d5cbf2639379fff3cc51ef41fb9cb5cf)
@@ -6,5 +6,4 @@
 forall( ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V) ) {
 	ostype & ?|?( ostype& os, E e ) {
-//		if ( scoped( e ) ) os | type_name( e ) | '.' | nonl;
 		return os | label( e );
 	}
@@ -12,9 +11,8 @@
 }
 
-// forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-// ostype & ?|?( ostype & os, E e ) {
-// //    return os | type_name(e) | "." | label(e);
-//     return os | label( e );
-// }
+forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
+ostype & ?|?( ostype & os, E e ) {
+    return os | label( e );
+}
 
 forall( E, V | CfaEnum(E, V) ) {						// relational operators
Index: libcfa/src/enum.hfa
===================================================================
--- libcfa/src/enum.hfa	(revision d5efcb72910e612e3c6dc8ed684f24bef154e8fd)
+++ libcfa/src/enum.hfa	(revision 259012e3d5cbf2639379fff3cc51ef41fb9cb5cf)
@@ -20,6 +20,4 @@
     unsigned int posn( E e );
     V value( E e );
-    char * type_name( E e );
-//    bool scoped( E e );
 };
 
@@ -31,6 +29,6 @@
 }
 
-//forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
-//ostype & ?|?( ostype &, E );
+forall( ostype & | basic_ostream(ostype), E | CfaEnum(E, quasi_void) )
+ostype & ?|?( ostype &, E );
 
 // Design two <- should go for this if we have change the cost model