Improvements to Pronoun, and some tests.