Make EnumArguments a bit smarter