zsh: Path disambiguation bug fixes