I suppose I'm as good a person to continue maintaining this as any,
though my time is largely spent doing other stuff these days.  The patch
doesn't apply cleanly right now and lots of the changes it suggests have
been made already (or done in slightly different ways).  I've attached a
simplified patch which takes care of the only two changes I see which
seem to still be worthwhile.  Assigning to Benjamin and changing
resolution to "remind" so he can either apply himself when the time is
right or toss it back to me.  (I apologize, but I am not intimately
tuned into the alpha/beta release process at the moment.)

Skip