Thanks for the patch.  Even though I didn't apply it, it was still very
useful in understanding the problem.