diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index 038e36745..b4f602197 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -13,30 +13,30 @@
 goog.module('Blockly.zelos.RightConnectionShape');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Measurable');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a right connection shape
  * takes up during rendering.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Measurable}
+ * @extends {Measurable}
  */
 const RightConnectionShape = function(constants) {
   RightConnectionShape.superClass_.constructor.call(this, constants);
-  this.type |= Blockly.blockRendering.Types.getType('RIGHT_CONNECTION');
+  this.type |= Types.getType('RIGHT_CONNECTION');
   // Size is dynamic
   this.height = 0;
   this.width = 0;
 };
-Blockly.utils.object.inherits(RightConnectionShape,
-    Blockly.blockRendering.Measurable);
+object.inherits(RightConnectionShape,
+    Measurable);
 
 exports = RightConnectionShape;