EnumSet: improved valid() and current()