Further work on a generic benchmarking framework.