Updated patch attached.  I'll push in a few days, assuming nothing else
turns up.