More work on bug #8378.  The control is mostly done.  Probably just tweaks from now on.