Don't add special handling for second and following
categories.

[From Markus's patch email to the list, edited by tml]

This patch is not obvious and I'm not sure that it will not introduce
another regression. I don't fully understand why we need to add
special handling for labels of second and following categories.