> That's at the beginning of redisplay, so yes, I think it's a better
 > place.

Patch attached.  Everybody involved, please try.

Thanks, martin