mailmap: Fix things up a bit.