Make benchmarks compile again.

Additionally, fix the problem which caused one failing benchmark
to stop other benchmarks from running.