Revert changes to lib/Suite, instead align interface for
lib/BenchmarkSuite to match that of the rest of intern.