I don't know that the original version is "best" - but I've looked at the amount of code needed to change it (a lot!) and ... it would seem to make the library slower, so ... I'm going to undo my changes and leave it working the way it was previously.