#657318 bash-completion: improve zutils completion