We now have a pretty decent term re-writing system.
Merge branch 'master' into output-format