[#6431] Fix places that were still expecting a cursor

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>