Fix bug #2149: EM mit punctuation nach NOTEREF

The template that handles noterefs/annorefs and punctiation and
following punctuation, and the template that removes punctuation if it
follows a noteref/annoref, were not 100% complementary.