Miscellaneous changes.
Generalise term sizes so they can be rational.