Clean up benchmarks a little