Continual small improvements to the text parser...

Expect slow, tentative progress. This stuff is quite hard work to
manage.