Improve argument handling in benchmark.py