I modified my patch to follow Henri's and Stefan's  requests and hints. Do you have more observations to do with this one?

As previously, all the tests go on passing.

A+

David