Add support for non-string tokens/post-prepass tokens with ids
Adding ids to merged comments, we now drop them nicely