Refactor old code by removing excessive TheseBenchmarks.new calls