Improve handling of comments when comments include comment delimtier