Minor Zsh cleanups