Remove obsolete todo comment.
Don't segragate String_+ as not being a primitive.