Move things around; it was getting messy.
Add unoptimised benchmark variants.
Frob benchmarks some more.
More report stuff.