> Yes in this case, though presumably it's not ultimately quite the 
> right place for the fix?

I'm not sure whether I fixed all possible places where this is set up.
Could you please try the attached patch and use it for a while?