Some improvements to benchmarking.