More factoring out of the display interface.