Fixing the TODOs dependent on SimpleDisplayText.

Yes.