Update argument parsing from mettle