Further cursor position improvements.