Fix benchmarks (now with -O2). Better errors. Remove some dead stuff.