Some refactoring to make sure objects in benchmarks are used.