More updates to argparse for remaining scripts.