zsh: miscellaneous cleanups