Rework pronoun support, add more separators
2.1.0