diff --git a/core/contextmenu.js b/core/contextmenu.js
index ebb8caeb6..3f1566310 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -44,7 +44,8 @@ goog.require('goog.ui.MenuItem');
 Blockly.ContextMenu.currentBlock = null;
 
 /**
- * @type {Array.<!Array>} Opaque data that can be passed to unbindEvent_.
+ * Opaque data that can be passed to unbindEvent_.
+ * @type {Array.<!Array>}
  * @private
  */
 Blockly.ContextMenu.eventWrapper_ = null;
diff --git a/core/flyout_base.js b/core/flyout_base.js
index fd8272214..0672c757c 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -138,8 +138,9 @@ Blockly.Flyout.prototype.CORNER_RADIUS = 8;
  */
 Blockly.Flyout.prototype.MARGIN = Blockly.Flyout.prototype.CORNER_RADIUS;
 
+// TODO: Move GAP_X and GAP_Y to their appropriate files.
+
 /**
- * TODO: Move GAP_X and GAP_Y to their appropriate files.
  * Gap between items in horizontal flyouts. Can be overridden with the "sep"
  * element.
  * @const {number}
diff --git a/core/gesture.js b/core/gesture.js
index ba09192cf..dce37d1fd 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -38,11 +38,12 @@ goog.require('goog.asserts');
 goog.require('goog.math.Coordinate');
 
 
-/**
- * NB: In this file "start" refers to touchstart, mousedown, and pointerstart
+/*
+ * Note: In this file "start" refers to touchstart, mousedown, and pointerstart
  * events.  "End" refers to touchend, mouseup, and pointerend events.
- * TODO: Consider touchcancel/pointercancel.
  */
+// TODO: Consider touchcancel/pointercancel.
+
 
 /**
  * Class for one gesture.
diff --git a/core/variable_map.js b/core/variable_map.js
index 0eb2a9154..b0c6e3819 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -35,10 +35,10 @@ goog.provide('Blockly.VariableMap');
  */
  Blockly.VariableMap = function(workspace) {
  /**
-   * @type {!Object<string, !Array.<Blockly.VariableModel>>}
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
    * that are not currently in use.
+   * @type {!Object<string, !Array.<Blockly.VariableModel>>}
    * @private
    */
   this.variableMap_ = {};
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index c4c783600..19a506215 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -929,7 +929,6 @@ Blockly.WorkspaceSvg.prototype.refreshToolboxSelection_ = function() {
 
 /**
  * Rename a variable by updating its name in the variable list.
- * TODO: google/blockly:#468
  * @param {string} oldName Variable to rename.
  * @param {string} newName New variable name.
  * @package