Fixing the TODOs dependent on SimpleDisplayText.

Does SimpleDisplayText take care of NullDisplayText?