PR walkthrough: the heteronym fix