Hi Mark, thanks for the comments. :-)

Here the improved patch, against stable-2.0/73ff8e3: