Victor, I understan your wish to be consistent with other implementations, but as we look to improve let's try to keep consistent in terms of behavior but improving the code as we move forward.

I could also make the point that if you're taking inspiration in code which is not so good, make yours better and also improve the older one.