Fix problems with types storing Token and not Identifier.