- Cleanup early display's internals a bit more (#10538)