Some cleaning up for benchmarks/run.py.