Merge "Clean up AbstractCursor API."