Ok I see the trickiness there. Will re-review it on that PR.