Some more improvements to benchmark script.