Good tweaks with WinForms version.