corrections to TabComplete parser for subcommands