XD-2124 Improved parsing of quoted args