Make sure to redraw the control during initialization.
Minor cleanups.