Enhance benchmarking once again.