More escaping fixes
More escaping fixes

lisongmin/argcomplete,douglas-larocca/argcomplete,neizod/argcomplete,lisongmin/argcomplete,landonb/argcomplete,kislyuk/argcomplete,neizod/argcomplete,kislyuk/argcomplete,douglas-larocca/argcomplete,landonb/argcomplete