Repairing Self- and Recipient Reference