More argparse refactoring to improve dependencies.