More fixing of options removal
Use arrays in bash completion, not strings.