Yes, actually, I just pushed a refactoring of `_cursor` to master in 29628e0b6e5b1c6324e0c06cc56a49a5aa0747e0.

I'll rebase the PR on top of that commit.