Baiscally, fix all the cursor things.  I'm frankly amazed this ever worked.
While we're changing everything, remove pointless arguments from some functions.
Some were ignored, and some only had one possible value.