Simplify mailmap rules