[mailing list changed]

The attached implements the theory.  Doesn't show any regressions.  Then 
again, I don't know if it fixes the reported problem either :-/

Kris?

Andrew