Man, I don't know if there is an easy solution to this. My question is: did we improve on the status quo? i.e., is the current implementation more correct than it used to be? If yes, then let's go ahead with it and file a new ticket. Otherwise, let's brainstorm and see if there is an easy way to improve it. I'll have a deeper look at it tomorrow morning and will share my thoughts over a coffee ;-)