Much improved!

Pretty sure it does everything it could the old way and everything to
be expected of default use the new way.  A little more tweaking of
argparse ahead before adding new features.