Further cleanups to benchmark script.