Thanks for the review, Mike.  I've attached a new patch with those
problems (and a few others) fixed.

     Mark