Refactor the Screen type a bit.