Be more sane about the rewriting, even if it worsens some simple cases. Mooore to come
Be more systematic in scale annotation simplification. Unfortunately, the initial results aren't that good