More support for zsh vi mode