Further enhance the bash completion script