Change argument parsing to correctly handle eval and replay arguments