Fix a subtle but potentially nasty case where string tokens could be doubled.