zsh: more Zaw fixes