Sync to simplified command-line argument handling.