More general pronoun cleanup