Fix argment handling and quoting.