Slight improvements in the bash completion script