Minor changes in redraw().