[zsh] some code clean-up.