Refactor to use new atom-like cursors