Apply tidy.
Add code and tests for number disambiguation.

This is still not properly factored, but progressing.