Little modifications of benchmarker class.