Fixup cli to handle parsing matches when called as a cargo subcommand

Fixup cli to handle parsing matches when called as a cargo subcommand #317