minor fixes to recent EnumNames<> code