diff --git a/core/block_svg.js b/core/block_svg.js
index 1ebaa5388..9bc5a35a8 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -187,34 +187,34 @@ Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
 // Leftover UI constants from block_render_svg.js.
 /**
  * Vertical space between elements.
- * TODO (#3142): Remove.
  * @const
  * @package
  */
+// TODO (#3142): Remove.
 Blockly.BlockSvg.SEP_SPACE_Y = 10;
 
 /**
  * Minimum height of a block.
- * TODO (#3142): Remove.
  * @const
  * @package
  */
+// TODO (#3142): Remove.
 Blockly.BlockSvg.MIN_BLOCK_Y = 25;
 
 /**
  * Width of horizontal puzzle tab.
- * TODO (#3142): Remove.
  * @const
  * @package
  */
+// TODO (#3142): Remove.
 Blockly.BlockSvg.TAB_WIDTH = 8;
 
 /**
  * Do blocks with no previous or output connections have a 'hat' on top?
- * TODO (#3142): Remove.
  * @const
  * @package
  */
+// TODO (#3142): Remove.
 Blockly.BlockSvg.START_HAT = false;
 
 /**
diff --git a/core/gesture.js b/core/gesture.js
index e8c81b034..ba80a8fdc 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -446,9 +446,9 @@ Blockly.Gesture.prototype.startDraggingBlock_ = function() {
 
 /**
  * Create a bubble dragger and start dragging the selected bubble.
- * TODO (fenichel): Possibly combine this and startDraggingBlock_.
  * @private
  */
+// TODO (fenichel): Possibly combine this and startDraggingBlock_.
 Blockly.Gesture.prototype.startDraggingBubble_ = function() {
   this.bubbleDragger_ = new Blockly.BubbleDragger(this.startBubble_,
       this.startWorkspace_);
diff --git a/core/icon.js b/core/icon.js
index 084df886c..cd76e888c 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -185,9 +185,9 @@ Blockly.Icon.prototype.getIconLocation = function() {
  * Get the size of the icon as used for rendering.
  * This differs from the actual size of the icon, because it bulges slightly
  * out of its row rather than increasing the height of its row.
- * TODO (#2562): Remove getCorrectedSize.
  * @return {!Blockly.utils.Size} Height and width.
  */
+// TODO (#2562): Remove getCorrectedSize.
 Blockly.Icon.prototype.getCorrectedSize = function() {
   return new Blockly.utils.Size(
       Blockly.Icon.prototype.SIZE, Blockly.Icon.prototype.SIZE - 2);
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index ce8ca9418..6f978889e 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -459,6 +459,7 @@ Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, ne
  * should be placed.
  * @protected
  */
+// TODO: More cleanup.
 Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
   var widestStatementRowFields = 0;
   var blockWidth = 0;
diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js
index 141ceb08a..7b85ae0f0 100644
--- a/core/renderers/measurables/rows.js
+++ b/core/renderers/measurables/rows.js
@@ -170,6 +170,7 @@ Blockly.blockRendering.Row.prototype.measure = function() {
  *     or null.
  * @package
  */
+// TODO: Consider moving this to InputRow, if possible.
 Blockly.blockRendering.Row.prototype.getLastInput = function() {
   for (var i = this.elements.length - 1, elem; (elem = this.elements[i]); i--) {
     if (Blockly.blockRendering.Types.isInput(elem)) {