Benchmark clean up to reflect changes to main.