Move some more stuff into zsh