Address substantially all of Eric Snow's comments in issue #15295, except for

those which now have additional XXX's here.  I'll get to those later. :)