Add more special handling of quoted command