Some more simplifications to the scala bench
Added cold and warm run benching to the scala bench.