Improved .mailmap.