Make [binary_with_subcommands] more flexible