Handle UPnP argument limits consistently