Various argparse / regex fixes.