Better control over and defaults for benchmark.py