Resurrect benchmarks

This gets things building again.