Improved benchmarking.