Your changes do seem to be doing the trick and the tests pass with them, thank you very much, I committed them
(but I will need to come back to this tomorrow with a clearer head and reason about this stuff to understand the logic better :sweat_smile:)