Zsh completion, part 2

Follow up to #841.