Partial cleanup of DisplayMediator.

I'll follow-up with the rest of cleanup.