Update to recent zsh changes from BSD configs