Add some more slightly-modified benchmarks, but also make it easier to run them from the pypy directory