Some enumeration improvements.