>On the other hand, since you're in the area anyway, maybe you could fix that problem too?

To be honest I would prefer to wait with that - the current PR has been on a quite strict 'refactor-only' diet; I am not sufficiently comfortable with the real workings of this code to make further changes. But - that will certainly be relevant when we proceed with the new WellsManager constructor.