I should have time to look at this later tonight (I'm about to drive to
Oregon again), and we might as well open a new bug on it. I suspect the
fix will be pretty easy, and I want the fix in both -stable and -dev.
Thanks for finding this!