Finally updated the argparse code to match the fnc4 branch.