Bench: Whitespace cleanup
Make benchmarks build
Merge branch 'benGamari' into upstream-master