All points addressed.  New patch attached.

I also attached a fix for mode-line-highlight that I noticed from this.

   -- MJF