Normalise labelling of types a bit.