diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
index d866b54cd..adc915d9e 100644
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -77,7 +77,7 @@ goog.addDependency("../../../" + dir + "/core/generator.js", ['Blockly.Generator
 goog.addDependency("../../../" + dir + "/core/gesture.js", ['Blockly.Gesture'], ['Blockly.blockAnimations', 'Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.constants', 'Blockly.Events', 'Blockly.Events.Ui', 'Blockly.FlyoutDragger', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.WorkspaceDragger']);
 goog.addDependency("../../../" + dir + "/core/grid.js", ['Blockly.Grid'], ['Blockly.utils.dom', 'Blockly.utils.userAgent']);
 goog.addDependency("../../../" + dir + "/core/icon.js", ['Blockly.Icon'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.dom', 'Blockly.utils.Size']);
-goog.addDependency("../../../" + dir + "/core/inject.js", ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Component', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Options', 'Blockly.Tooltip', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.userAgent', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg']);
+goog.addDependency("../../../" + dir + "/core/inject.js", ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.blockRendering', 'Blockly.Component', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Options', 'Blockly.Tooltip', 'Blockly.utils', 'Blockly.utils.dom', 'Blockly.utils.userAgent', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg']);
 goog.addDependency("../../../" + dir + "/core/input.js", ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel']);
 goog.addDependency("../../../" + dir + "/core/insertion_marker_manager.js", ['Blockly.InsertionMarkerManager'], ['Blockly.blockAnimations', 'Blockly.Events', 'Blockly.RenderedConnection']);
 goog.addDependency("../../../" + dir + "/core/keyboard_nav/action.js", ['Blockly.Action'], []);
@@ -96,12 +96,12 @@ goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_render_draw_debug.js", ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Highlighter', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow']);
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js", ['Blockly.blockRendering.Highlighter'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow']);
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_render_info.js", ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.RenderedConnection']);
-goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering.js", ['Blockly.blockRendering'], ['Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.constants', 'Blockly.blockRendering.highlightConstants', 'Blockly.geras.RenderInfo', 'Blockly.thrasos.RenderInfo', 'Blockly.zelos.RenderInfo']);
-goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering_constants.js", ['Blockly.blockRendering.constants'], ['Blockly.utils.svgPaths']);
-goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/highlight_constants.js", ['Blockly.blockRendering.highlightConstants'], ['Blockly.blockRendering.constants', 'Blockly.utils.svgPaths']);
+goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering.js", ['Blockly.blockRendering'], ['Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.HighlightConstantProvider', 'Blockly.geras.RenderInfo', 'Blockly.thrasos.RenderInfo', 'Blockly.zelos.RenderInfo']);
+goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/block_rendering_constants.js", ['Blockly.blockRendering.ConstantProvider'], ['Blockly.utils.svgPaths']);
+goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/highlight_constants.js", ['Blockly.blockRendering.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths']);
 goog.addDependency("../../../" + dir + "/core/renderers/block_rendering_rewrite/measurables.js", ['Blockly.blockRendering.InRowSpacer'], ['Blockly.blockRendering.Measurable']);
 goog.addDependency("../../../" + dir + "/core/renderers/geras/info.js", ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.RenderedConnection']);
-goog.addDependency("../../../" + dir + "/core/renderers/measurables/base.js", ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.constants']);
+goog.addDependency("../../../" + dir + "/core/renderers/measurables/base.js", ['Blockly.blockRendering.Measurable'], []);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/connections.js", ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.RenderedConnection']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/inputs.js", ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Measurable']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/rows.js", ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.RenderedConnection']);
@@ -263,9 +263,11 @@ goog.require('Blockly.blockAnimations');
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.BottomRow');
 goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
 goog.require('Blockly.blockRendering.ExternalValueInput');
+goog.require('Blockly.blockRendering.HighlightConstantProvider');
 goog.require('Blockly.blockRendering.Highlighter');
 goog.require('Blockly.blockRendering.InRowSpacer');
 goog.require('Blockly.blockRendering.InlineInput');
@@ -280,8 +282,6 @@ goog.require('Blockly.blockRendering.Row');
 goog.require('Blockly.blockRendering.SpacerRow');
 goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.blockRendering.TopRow');
-goog.require('Blockly.blockRendering.constants');
-goog.require('Blockly.blockRendering.highlightConstants');
 goog.require('Blockly.constants');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.geras');
diff --git a/core/renderers/block_rendering_rewrite/block_rendering.js b/core/renderers/block_rendering_rewrite/block_rendering.js
index d09f2186b..161566836 100644
--- a/core/renderers/block_rendering_rewrite/block_rendering.js
+++ b/core/renderers/block_rendering_rewrite/block_rendering.js
@@ -33,8 +33,8 @@ goog.provide('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
 goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.constants');
-goog.require('Blockly.blockRendering.highlightConstants');
+goog.require('Blockly.blockRendering.ConstantProvider');
+goog.require('Blockly.blockRendering.HighlightConstantProvider');
 
 goog.require('Blockly.geras.RenderInfo');
 goog.require('Blockly.thrasos.RenderInfo');
@@ -45,7 +45,10 @@ goog.require('Blockly.zelos.RenderInfo');
  * @package
  */
 Blockly.blockRendering.init = function() {
-  // Currently a no-op.
+  Blockly.blockRendering.constants =
+      new Blockly.blockRendering.ConstantProvider();
+  Blockly.blockRendering.highlightConstants =
+      new Blockly.blockRendering.HighlightConstantProvider();
 };
 
 /**
diff --git a/core/renderers/block_rendering_rewrite/block_rendering_constants.js b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
index 4a896d65c..760119c8c 100644
--- a/core/renderers/block_rendering_rewrite/block_rendering_constants.js
+++ b/core/renderers/block_rendering_rewrite/block_rendering_constants.js
@@ -19,125 +19,167 @@
  */
 
 /**
- * @fileoverview Methods for graphically rendering a block as SVG.
+ * @fileoverview Namespace for block rendering functionality.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.constants');
+goog.provide('Blockly.blockRendering.ConstantProvider');
 
 goog.require('Blockly.utils.svgPaths');
 
+/**
+ * An object that provides constants for rendering blocks.
+ * @constructor
+ * @package
+ */
+Blockly.blockRendering.ConstantProvider = function() {
+  this.NO_PADDING = 0;
+  this.SMALL_PADDING = 3;
+  this.MEDIUM_PADDING = 5;
+  this.MEDIUM_LARGE_PADDING = 8;
+  this.LARGE_PADDING = 10;
 
-Blockly.blockRendering.constants.NO_PADDING = 0;
-Blockly.blockRendering.constants.SMALL_PADDING = 3;
-Blockly.blockRendering.constants.MEDIUM_PADDING = 5;
-Blockly.blockRendering.constants.MEDIUM_LARGE_PADDING = 8;
-Blockly.blockRendering.constants.LARGE_PADDING = 10;
-
-// Offset from the top of the row for placing fields on inline input rows
-// and statement input rows.
-// Matches existing rendering (in 2019).
-Blockly.blockRendering.constants.TALL_INPUT_FIELD_OFFSET_Y =
-    Blockly.blockRendering.constants.MEDIUM_PADDING;
+  // Offset from the top of the row for placing fields on inline input rows
+  // and statement input rows.
+  // Matches existing rendering (in 2019).
+  this.TALL_INPUT_FIELD_OFFSET_Y = this.MEDIUM_PADDING;
 
 
-// The dark/shadow path in classic rendering is the same as the normal block
-// path, but translated down one and right one.
-Blockly.blockRendering.constants.DARK_PATH_OFFSET = 1;
+  // The dark/shadow path in classic rendering is the same as the normal block
+  // path, but translated down one and right one.
+  this.DARK_PATH_OFFSET = 1;
 
-Blockly.blockRendering.constants.TAB_HEIGHT = 15;
+  this.TAB_HEIGHT = 15;
 
-Blockly.blockRendering.constants.TAB_OFFSET_FROM_TOP = 5;
+  this.TAB_OFFSET_FROM_TOP = 5;
 
-Blockly.blockRendering.constants.TAB_VERTICAL_OVERLAP = 2.5;
+  this.TAB_VERTICAL_OVERLAP = 2.5;
 
-Blockly.blockRendering.constants.TAB_WIDTH = 8;
+  this.TAB_WIDTH = 8;
 
-Blockly.blockRendering.constants.NOTCH_WIDTH = 15;
-Blockly.blockRendering.constants.NOTCH_HEIGHT = 4;
+  this.NOTCH_WIDTH = 15;
+  this.NOTCH_HEIGHT = 4;
 
-// This is the minimum width of a block measuring from the end of a rounded
-// corner
-Blockly.blockRendering.constants.MIN_BLOCK_WIDTH = 12;
+  // This is the minimum width of a block measuring from the end of a rounded
+  // corner
+  this.MIN_BLOCK_WIDTH = 12;
 
-Blockly.blockRendering.constants.EMPTY_BLOCK_SPACER_HEIGHT = 16;
+  this.EMPTY_BLOCK_SPACER_HEIGHT = 16;
+
+  /**
+   * Rounded corner radius.
+   * @const
+   */
+  this.CORNER_RADIUS = 8;
+
+  // Offset from the left side of a block or the inside of a statement input to
+  // the left side of the notch.
+  this.NOTCH_OFFSET_LEFT =
+      this.NOTCH_WIDTH;
+
+  this.STATEMENT_BOTTOM_SPACER = 5;
+  this.STATEMENT_INPUT_PADDING_LEFT = 20;
+  this.BETWEEN_STATEMENT_PADDING_Y = 4;
+
+  // This is the max width of a bottom row that follows a statement input and
+  // has inputs inline.
+  this.MAX_BOTTOM_WIDTH = 66.5;
+
+  /**
+   * Height of the top hat.
+   * @const
+   * @private
+   */
+  this.START_HAT_HEIGHT = 15;
+
+  /**
+   * Width of the top hat.
+   * @const
+   * @private
+   */
+  this.START_HAT_WIDTH = 100;
+
+  this.SPACER_DEFAULT_HEIGHT = 15;
+
+  this.MIN_BLOCK_HEIGHT = 24;
+
+  this.EMPTY_INLINE_INPUT_PADDING = 14.5;
+
+  this.EMPTY_INLINE_INPUT_HEIGHT = this.TAB_HEIGHT + 11;
+
+  this.EXTERNAL_VALUE_INPUT_PADDING = 2;
+
+  /**
+   * The height of an empty statement input.  Note that in the old rendering this
+   * varies slightly depending on whether the block has external or inline inputs.
+   * In the new rendering this is consistent.  It seems unlikely that the old
+   * behaviour was intentional.
+   * @const
+   * @type {number}
+   */
+  this.EMPTY_STATEMENT_INPUT_HEIGHT = this.MIN_BLOCK_HEIGHT;
+
+  this.START_POINT = Blockly.utils.svgPaths.moveBy(0, 0);
+
+  /**
+   * Height of SVG path for jagged teeth at the end of collapsed blocks.
+   * @const
+   */
+  this.JAGGED_TEETH_HEIGHT = 12;
+
+  /**
+   * Width of SVG path for jagged teeth at the end of collapsed blocks.
+   * @const
+   */
+  this.JAGGED_TEETH_WIDTH = 6;
+
+  /**
+   * An object containing sizing and path information about collapsed block
+   * indicators.
+   * @type {!Object}
+   */
+  this.JAGGED_TEETH = this.makeJaggedTeeth();
+
+  /**
+   * An object containing sizing and path information about notches.
+   * @type {!Object}
+   */
+  this.NOTCH = this.makeNotch();
+
+  /**
+   * An object containing sizing and path information about start hats
+   * @type {!Object}
+   */
+  this.START_HAT = this.makeStartHat();
+
+  /**
+   * An object containing sizing and path information about puzzle tabs.
+   * @type {!Object}
+   */
+  this.PUZZLE_TAB = this.makePuzzleTab();
+
+  /**
+   * An object containing sizing and path information about inside corners
+   * @type {!Object}
+   */
+  this.INSIDE_CORNERS = this.makeInsideCorners();
+
+  /**
+   * An object containing sizing and path information about outside corners.
+   * @type {!Object}
+   */
+  this.OUTSIDE_CORNERS = this.makeOutsideCorners();
+};
 
 /**
- * Rounded corner radius.
- * @const
+ * @return {!Object} An object containing sizing and path information about
+ *     collapsed block indicators.
+ * @package
  */
-Blockly.blockRendering.constants.CORNER_RADIUS = 8;
-
-// Offset from the left side of a block or the inside of a statement input to
-// the left side of the notch.
-Blockly.blockRendering.constants.NOTCH_OFFSET_LEFT =
-    Blockly.blockRendering.constants.NOTCH_WIDTH;
-
-Blockly.blockRendering.constants.STATEMENT_BOTTOM_SPACER = 5;
-Blockly.blockRendering.constants.STATEMENT_INPUT_PADDING_LEFT = 20;
-Blockly.blockRendering.constants.BETWEEN_STATEMENT_PADDING_Y = 4;
-
-// This is the max width of a bottom row that follows a statement input and
-// has inputs inline.
-Blockly.blockRendering.constants.MAX_BOTTOM_WIDTH = 66.5;
-
-/**
- * Height of the top hat.
- * @const
- * @private
- */
-Blockly.blockRendering.constants.START_HAT_HEIGHT = 15;
-
-/**
- * Width of the top hat.
- * @const
- * @private
- */
-Blockly.blockRendering.constants.START_HAT_WIDTH = 100;
-
-Blockly.blockRendering.constants.SPACER_DEFAULT_HEIGHT = 15;
-
-Blockly.blockRendering.constants.MIN_BLOCK_HEIGHT = 24;
-
-Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_PADDING = 14.5;
-
-Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_HEIGHT =
-    Blockly.blockRendering.constants.TAB_HEIGHT + 11;
-
-Blockly.blockRendering.constants.EXTERNAL_VALUE_INPUT_PADDING = 2;
-
-/**
- * The height of an empty statement input.  Note that in the old rendering this
- * varies slightly depending on whether the block has external or inline inputs.
- * In the new rendering this is consistent.  It seems unlikely that the old
- * behaviour was intentional.
- * @const
- * @type {number}
- */
-Blockly.blockRendering.constants.EMPTY_STATEMENT_INPUT_HEIGHT =
-    Blockly.blockRendering.constants.MIN_BLOCK_HEIGHT;
-
-Blockly.blockRendering.constants.START_POINT = Blockly.utils.svgPaths.moveBy(0, 0);
-
-/**
- * Height of SVG path for jagged teeth at the end of collapsed blocks.
- * @const
- */
-Blockly.blockRendering.constants.JAGGED_TEETH_HEIGHT = 12;
-/**
- * Width of SVG path for jagged teeth at the end of collapsed blocks.
- * @const
- */
-Blockly.blockRendering.constants.JAGGED_TEETH_WIDTH = 6;
-
-/**
- * SVG path for drawing jagged teeth at the end of collapsed blocks.
- * @const
- */
-Blockly.blockRendering.constants.JAGGED_TEETH = (function() {
-  var height = Blockly.blockRendering.constants.JAGGED_TEETH_HEIGHT;
-  var width = Blockly.blockRendering.constants.JAGGED_TEETH_WIDTH;
+Blockly.blockRendering.ConstantProvider.prototype.makeJaggedTeeth = function() {
+  var height = this.JAGGED_TEETH_HEIGHT;
+  var width = this.JAGGED_TEETH_WIDTH;
 
   var mainPath =
       Blockly.utils.svgPaths.line(
@@ -151,14 +193,16 @@ Blockly.blockRendering.constants.JAGGED_TEETH = (function() {
     width: width,
     path: mainPath
   };
-})();
+};
 
 /**
- * Information about the hat on a start block.
+ * @return {!Object} An object containing sizing and path information about
+ *     start hats.
+ * @package
  */
-Blockly.blockRendering.constants.START_HAT = (function() {
-  var height = Blockly.blockRendering.constants.START_HAT_HEIGHT;
-  var width = Blockly.blockRendering.constants.START_HAT_WIDTH;
+Blockly.blockRendering.ConstantProvider.prototype.makeStartHat = function() {
+  var height = this.START_HAT_HEIGHT;
+  var width = this.START_HAT_WIDTH;
 
   var mainPath =
       Blockly.utils.svgPaths.curve('c',
@@ -172,11 +216,16 @@ Blockly.blockRendering.constants.START_HAT = (function() {
     width: width,
     path: mainPath
   };
-})();
+};
 
-Blockly.blockRendering.constants.PUZZLE_TAB = (function() {
-  var width = Blockly.blockRendering.constants.TAB_WIDTH;
-  var height = Blockly.blockRendering.constants.TAB_HEIGHT;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     puzzle tabs.
+ * @package
+ */
+Blockly.blockRendering.ConstantProvider.prototype.makePuzzleTab = function() {
+  var width = this.TAB_WIDTH;
+  var height = this.TAB_HEIGHT;
 
   // The main path for the puzzle tab is made out of a few curves (c and s).
   // Those curves are defined with relative positions.  The 'up' and 'down'
@@ -220,35 +269,16 @@ Blockly.blockRendering.constants.PUZZLE_TAB = (function() {
     pathDown: pathDown,
     pathUp: pathUp
   };
-})();
+};
 
-Blockly.blockRendering.constants.TRIANGLE = (function() {
-  var width = 20;
-  var height = 20;
-  // The 'up' and 'down'  versions of the paths are the same, but the Y sign
-  // flips.  Forward and back are the signs to use to move the cursor in the
-  // direction that the path is being drawn.
-  function makeMainPath(up) {
-    var forward = up ? -1 : 1;
-
-    return Blockly.utils.svgPaths.lineTo(-width, forward * height / 2) +
-        Blockly.utils.svgPaths.lineTo(width, forward * height / 2);
-  }
-
-  var pathUp = makeMainPath(true);
-  var pathDown = makeMainPath(false);
-
-  return {
-    width: width,
-    height: height,
-    pathDown: pathDown,
-    pathUp: pathUp
-  };
-})();
-
-Blockly.blockRendering.constants.NOTCH = (function() {
-  var width = Blockly.blockRendering.constants.NOTCH_WIDTH;
-  var height = Blockly.blockRendering.constants.NOTCH_HEIGHT;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     notches.
+ * @package
+ */
+Blockly.blockRendering.ConstantProvider.prototype.makeNotch = function() {
+  var width = this.NOTCH_WIDTH;
+  var height = this.NOTCH_HEIGHT;
   var innerWidth = 3;
   var outerWidth = (width - innerWidth) / 2;
   function makeMainPath(dir) {
@@ -269,10 +299,15 @@ Blockly.blockRendering.constants.NOTCH = (function() {
     pathLeft: pathLeft,
     pathRight: pathRight
   };
-})();
+};
 
-Blockly.blockRendering.constants.INSIDE_CORNERS = (function() {
-  var radius = Blockly.blockRendering.constants.CORNER_RADIUS;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     inside corners.
+ * @package
+ */
+Blockly.blockRendering.ConstantProvider.prototype.makeInsideCorners = function() {
+  var radius = this.CORNER_RADIUS;
 
   var innerTopLeftCorner = Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
       Blockly.utils.svgPaths.point(-radius, radius));
@@ -286,10 +321,15 @@ Blockly.blockRendering.constants.INSIDE_CORNERS = (function() {
     pathTop: innerTopLeftCorner,
     pathBottom: innerBottomLeftCorner
   };
-})();
+};
 
-Blockly.blockRendering.constants.OUTSIDE_CORNERS = (function() {
-  var radius = Blockly.blockRendering.constants.CORNER_RADIUS;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     outside corners.
+ * @package
+ */
+Blockly.blockRendering.ConstantProvider.prototype.makeOutsideCorners = function() {
+  var radius = this.CORNER_RADIUS;
   /**
    * SVG path for drawing the rounded top-left corner.
    * @const
@@ -306,4 +346,6 @@ Blockly.blockRendering.constants.OUTSIDE_CORNERS = (function() {
     topLeft: topLeft,
     bottomLeft: bottomLeft
   };
-})();
+};
+
+
diff --git a/core/renderers/block_rendering_rewrite/highlight_constants.js b/core/renderers/block_rendering_rewrite/highlight_constants.js
index 0b461f0c1..35c129651 100644
--- a/core/renderers/block_rendering_rewrite/highlight_constants.js
+++ b/core/renderers/block_rendering_rewrite/highlight_constants.js
@@ -24,38 +24,89 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.highlightConstants');
+goog.provide('Blockly.blockRendering.HighlightConstantProvider');
 
-goog.require('Blockly.blockRendering.constants');
+goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.utils.svgPaths');
 
-
 /**
+ * An object that provides constants for rendering highlights on blocks.
  * Some highlights are simple offsets of the parent paths and can be generated
  * programmatically.  Others, especially on curves, are just made out of piles
  * of constants and are hard to tweak.
- */
-
-/**
- * The offset between the block's main path and highlight path.
- * @type {number}
+ * @constructor
  * @package
  */
-Blockly.blockRendering.highlightConstants.OFFSET = 0.5;
+Blockly.blockRendering.HighlightConstantProvider = function() {
+  /**
+   * An object that provides the constants used for base block rendering.
+   * @type {!Blockly.blockRendering.ConstantProvider}
+   */
+  this.constantProvider = Blockly.blockRendering.getConstants();
 
-Blockly.blockRendering.highlightConstants.START_POINT =
-    Blockly.utils.svgPaths.moveBy(
-        Blockly.blockRendering.highlightConstants.OFFSET,
-        Blockly.blockRendering.highlightConstants.OFFSET);
+  /**
+   * The offset between the block's main path and highlight path.
+   * @type {number}
+   * @package
+   */
+  this.OFFSET = 0.5;
+
+  /**
+   * The start point, which is offset in both X and Y, as an SVG path chunk.
+   * @type {string}
+   */
+  this.START_POINT = Blockly.utils.svgPaths.moveBy(this.OFFSET, this.OFFSET);
+
+  /**
+   * An object containing sizing and path information about inside corner
+   * highlights.
+   * @type {!Object}
+   */
+  this.INSIDE_CORNER = this.makeInsideCorner();
+
+  /**
+   * An object containing sizing and path information about outside corner
+   * highlights.
+   * @type {!Object}
+   */
+  this.OUTSIDE_CORNER = this.makeOutsideCorner();
+
+  /**
+   * An object containing sizing and path information about puzzle tab
+   * highlights.
+   * @type {!Object}
+   */
+  this.PUZZLE_TAB = this.makePuzzleTab();
+
+  /**
+   * An object containing sizing and path information about notch highlights.
+   * @type {!Object}
+   */
+  this.NOTCH = this.makeNotch();
+
+  /**
+   * An object containing sizing and path information about highlights for
+   * collapsed block indicators.
+   * @type {!Object}
+   */
+  this.JAGGED_TEETH = this.makeJaggedTeeth();
+
+  /**
+   * An object containing sizing and path information about start hat
+   * highlights.
+   * @type {!Object}
+   */
+  this.START_HAT = this.makeStartHat();
+};
 
 /**
- * Highlight paths for drawing the inside corners of a statement input.
- * RTL and LTR refer to the rendering of the block as a whole.  However, the top
- * of the statement input is drawn from right to left in LTR mode.
+ * @return {!Object} An object containing sizing and path information about
+ *     inside corner highlights.
+ * @package
  */
-Blockly.blockRendering.highlightConstants.INSIDE_CORNER = (function() {
-  var radius = Blockly.blockRendering.constants.CORNER_RADIUS;
-  var offset = Blockly.blockRendering.highlightConstants.OFFSET;
+Blockly.blockRendering.HighlightConstantProvider.prototype.makeInsideCorner = function() {
+  var radius = this.constantProvider.CORNER_RADIUS;
+  var offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
@@ -91,11 +142,16 @@ Blockly.blockRendering.highlightConstants.INSIDE_CORNER = (function() {
       return rtl ? pathBottomRtl : pathBottomLtr;
     },
   };
-})();
+};
 
-Blockly.blockRendering.highlightConstants.OUTSIDE_CORNER = (function() {
-  var radius = Blockly.blockRendering.constants.CORNER_RADIUS;
-  var offset = Blockly.blockRendering.highlightConstants.OFFSET;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     outside corner highlights.
+ * @package
+ */
+Blockly.blockRendering.HighlightConstantProvider.prototype.makeOutsideCorner = function() {
+  var radius = this.constantProvider.CORNER_RADIUS;
+  var offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
@@ -136,12 +192,16 @@ Blockly.blockRendering.highlightConstants.OUTSIDE_CORNER = (function() {
       return bottomLeftPath;
     }
   };
-})();
+};
 
-
-Blockly.blockRendering.highlightConstants.PUZZLE_TAB = (function() {
-  var width = Blockly.blockRendering.constants.TAB_WIDTH;
-  var height = Blockly.blockRendering.constants.TAB_HEIGHT;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     puzzle tab highlights.
+ * @package
+ */
+Blockly.blockRendering.HighlightConstantProvider.prototype.makePuzzleTab = function() {
+  var width = this.constantProvider.TAB_WIDTH;
+  var height = this.constantProvider.TAB_HEIGHT;
 
   // This is how much of the vertical block edge is actually drawn by the puzzle
   // tab.
@@ -186,20 +246,30 @@ Blockly.blockRendering.highlightConstants.PUZZLE_TAB = (function() {
       return rtl ? highlightRtlDown : highlightLtrDown;
     }
   };
-})();
+};
 
-Blockly.blockRendering.highlightConstants.NOTCH = (function() {
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     notch highlights.
+ * @package
+ */
+Blockly.blockRendering.HighlightConstantProvider.prototype.makeNotch = function() {
   // This is only for the previous connection.
   var pathLeft =
       Blockly.utils.svgPaths.lineOnAxis(
-          'h', Blockly.blockRendering.highlightConstants.OFFSET) +
-      Blockly.blockRendering.constants.NOTCH.pathLeft;
+          'h', this.OFFSET) +
+      this.constantProvider.NOTCH.pathLeft;
   return {
     pathLeft: pathLeft
   };
-})();
+};
 
-Blockly.blockRendering.highlightConstants.JAGGED_TEETH = (function() {
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     collapsed block edge highlights.
+ * @package
+ */
+Blockly.blockRendering.HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
   var pathLeft =
       Blockly.utils.svgPaths.lineTo(5.1, 2.6) +
       Blockly.utils.svgPaths.moveBy(-10.2, 6.8) +
@@ -207,10 +277,15 @@ Blockly.blockRendering.highlightConstants.JAGGED_TEETH = (function() {
   return {
     pathLeft: pathLeft
   };
-})();
+};
 
-Blockly.blockRendering.highlightConstants.START_HAT = (function() {
-  var hatHeight = Blockly.blockRendering.constants.START_HAT.height;
+/**
+ * @return {!Object} An object containing sizing and path information about
+ *     start highlights.
+ * @package
+ */
+Blockly.blockRendering.HighlightConstantProvider.prototype.makeStartHat = function() {
+  var hatHeight = this.constantProvider.START_HAT.height;
   var pathRtl =
       Blockly.utils.svgPaths.moveBy(25, -8.7) +
       Blockly.utils.svgPaths.curve('c',
@@ -233,4 +308,4 @@ Blockly.blockRendering.highlightConstants.START_HAT = (function() {
       return rtl ? pathRtl : pathLtr;
     }
   };
-})();
+};
diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js
index 8ff36e8b2..b89b64326 100644
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -27,8 +27,6 @@
 
 goog.provide('Blockly.blockRendering.Measurable');
 
-goog.require('Blockly.blockRendering.constants');
-
 
 /**
  * The base class to represent a part of a block that takes up space during