Over time, some entries were unnecessarily complicated.
Entries were sometimes of the form :
Canonical name <canonical@email> first other name <other@mail1>
Canonical name <canonical@email> second other name <other@mail1>
Canonical name <canonical@email> OOops my mailer is wrongly configured <other@mail1>
...
This can be simplified like this :
Canonical name <canonical@email>
Canonical name <canonical@email> <other@mail1>
The added benefit is that we're now exempt of adding a line in .mailmap every time an author make a typo. That will save us time.
Also for name normalisation, a single entry Canonical name <complicated@email> is often enough.