Fix up the match, giftee, gifter associations.