diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index f828b0df..b4cb1c7b 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -45,8 +45,6 @@ var TextMode = require("ace/mode/text").Mode;
 var Range = require("ace/range").Range;
 var Document = require("ace/document").Document;
 
-var NO_CHANGE_DELTAS = {};
-
 var EditSession = function(text, mode) {
     this.$modified = true;
     this.$breakpoints = [];
@@ -54,7 +52,6 @@ var EditSession = function(text, mode) {
     this.$backMarkers = {};
     this.$markerId = 1;
     this.$wrapData = [];
-    this.listeners = [];
 
     if (text instanceof Document) {
         this.setDocument(text);
diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js
index ffc2130c..636271c3 100644
--- a/lib/ace/layer/cursor.js
+++ b/lib/ace/layer/cursor.js
@@ -58,8 +58,7 @@ var Cursor = function(parentEl) {
     };
 
     this.setCursor = function(position, overwrite) {
-        this.position =
-            this.session.documentToScreenPosition(position);
+        this.position = position;
 
         if (overwrite) {
             dom.addCssClass(this.cursor, "ace_overwrite");
@@ -108,7 +107,7 @@ var Cursor = function(parentEl) {
             };
         }
 
-        var pos = this.position;
+        var pos = this.session.documentToScreenPosition(this.position);
         var cursorLeft = Math.round(pos.column * this.config.characterWidth);
         var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
             this.config.lineHeight;