Fix issue where tab completions could ignore command-specific completions

Fixes #1742