Continued slow overhauling of benchmarking functionality.