Fixed strings.
New context-independent rendering of choice terms.
New rendering of choice terms.

In sync with tptpize.pl.
Typo.