Simplify argument parsing