Simplifying screen implementation as part of #151.