Second pass at zsh completions