Some refactoring; cleanup
Benchmarks.
More resugaring tests.