Remove all singletons, not just the first, and fix markup conversion in affixes