Remove all singletons, not just the first, and fix markup conversion in affixes
Merge pull request #3 from fbennett/master

Fix for Google Docs, and markup in affixes, which was causing corruption.