That seems fine.

I guess go ahead and add a TODO to modify add_parser as well. It does seem like we should change the default parser_class from ArgumentParser to SelfCompletingArgumentParser, while still allowing you to override it.