Fix autoremove completion

This cleans up some of the language and some backwards autocompletions for zsh.