Minor modification: in remote->local non-recursive mode matching a