Cleaning up benchmarks and drivers code.