I think that ```make_cli``` should be renamed to something like ```make_optparse```, or ```make_cli``` could have its name kept as-is, but it could be made to support stubbing out either optparse or argparse configs (and whatever else we end up supporting) via a command-line option.