WIP tweak to make the bash-based zsh completion more robust