Shifted redraw code up a level.