Command line argument parsing changed