EAGLESIX-3157: CursorDocumentSource: refactor to match more closely