> I am not a good judge for this. Can you please commit the fix that feels
> the most right?

Sure, done,


        Stefan