Issue 537:	attachComment causes too many tokens to be added to the stream