Small cleanup in benchmarkable interface