Use -N/-i instead of -n, quote args, update zsh-completion