These changes are made now to make it possible to add multi-display support in the future while keeping the public interface stable.