Bash completion: Fix issue # 687 for real.

Commit 438a86c4 didn't really help, but made the situation worse.