Make benchmarks compile again.

Additionally, fix the problem which caused one failing benchmark
to stop other benchmarks from running.
Merge pull request #1475 from Aelve/fix-benchmark

Make benchmarks compile again.