get benchmarks running again

I'll make sure to follow guidelines more closely next time (using a feature branch), but this was a quick job that i did so I could start my real work. See the commit message for the rationale behind the changes.