diff --git a/core/block_events.js b/core/block_events.js
index c016bca46..b57fe3ee3 100644
--- a/core/block_events.js
+++ b/core/block_events.js
@@ -429,7 +429,7 @@ Blockly.Events.Move.prototype.fromJson = function(json) {
   if (json['newCoordinate']) {
     var xy = json['newCoordinate'].split(',');
     this.newCoordinate =
-        new Blockly.utils.Coordinate(parseFloat(xy[0]), parseFloat(xy[1]));
+        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
   }
 };
 
diff --git a/core/field_number.js b/core/field_number.js
index 5603b728c..d430145c8 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -77,7 +77,7 @@ Blockly.FieldNumber.prototype.SERIALIZABLE = true;
 
 /**
  * Set the maximum, minimum and precision constraints on this field.
- * Any of these properties may be undefiend or NaN to be disabled.
+ * Any of these properties may be undefined or NaN to be disabled.
  * Setting precision (usually a power of 10) enforces a minimum step between
  * values. That is, the user's value will rounded to the closest multiple of
  * precision. The least significant digit place is inferred from the precision.
@@ -87,15 +87,15 @@ Blockly.FieldNumber.prototype.SERIALIZABLE = true;
  * @param {number|string|undefined} precision Precision for value.
  */
 Blockly.FieldNumber.prototype.setConstraints = function(min, max, precision) {
-  precision = parseFloat(precision);
+  precision = Number(precision);
   this.precision_ = isNaN(precision) ? 0 : precision;
   var precisionString = this.precision_.toString();
   var decimalIndex = precisionString.indexOf('.');
   this.fractionalDigits_ = (decimalIndex == -1) ? -1 :
       precisionString.length - (decimalIndex + 1);
-  min = parseFloat(min);
+  min = Number(min);
   this.min_ = isNaN(min) ? -Infinity : min;
-  max = parseFloat(max);
+  max = Number(max);
   this.max_ = isNaN(max) ? Infinity : max;
   this.setValue(this.getValue());
 };
@@ -121,7 +121,7 @@ Blockly.FieldNumber.prototype.doClassValidation_ = function(opt_newValue) {
   newValue = newValue.replace(/,/g, '');
 
   // Clean up number.
-  var n = parseFloat(newValue || 0);
+  var n = Number(newValue || 0);
   if (isNaN(n)) {
     // Invalid number.
     return null;
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 68180abb6..923807ea1 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -410,7 +410,7 @@ Blockly.FieldTextInput.numberValidator = function(text) {
   text = text.replace(/O/ig, '0');
   // Strip out thousands separators.
   text = text.replace(/,/g, '');
-  var n = parseFloat(text || 0);
+  var n = Number(text || 0);
   return isNaN(n) ? null : String(n);
 };
 
diff --git a/core/field_variable.js b/core/field_variable.js
index dd6bed075..209d9be57 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -59,7 +59,7 @@ Blockly.FieldVariable = function(varname, opt_validator, opt_variableTypes,
   this.menuGenerator_ = Blockly.FieldVariable.dropdownCreate;
   this.size_ = new Blockly.utils.Size(0, Blockly.BlockSvg.MIN_BLOCK_Y);
   opt_validator && this.setValidator(opt_validator);
-  this.defaultVariableName = (varname || '');
+  this.defaultVariableName = varname || '';
 
   this.setTypes_(opt_variableTypes, opt_defaultType);
   this.value_ = null;
diff --git a/core/options.js b/core/options.js
index d584ae86d..ecd5497d0 100644
--- a/core/options.js
+++ b/core/options.js
@@ -219,22 +219,22 @@ Blockly.Options.parseZoomOptions_ = function(options) {
   if (zoom['startScale'] === undefined) {
     zoomOptions.startScale = 1;
   } else {
-    zoomOptions.startScale = parseFloat(zoom['startScale']);
+    zoomOptions.startScale = Number(zoom['startScale']);
   }
   if (zoom['maxScale'] === undefined) {
     zoomOptions.maxScale = 3;
   } else {
-    zoomOptions.maxScale = parseFloat(zoom['maxScale']);
+    zoomOptions.maxScale = Number(zoom['maxScale']);
   }
   if (zoom['minScale'] === undefined) {
     zoomOptions.minScale = 0.3;
   } else {
-    zoomOptions.minScale = parseFloat(zoom['minScale']);
+    zoomOptions.minScale = Number(zoom['minScale']);
   }
   if (zoom['scaleSpeed'] === undefined) {
     zoomOptions.scaleSpeed = 1.2;
   } else {
-    zoomOptions.scaleSpeed = parseFloat(zoom['scaleSpeed']);
+    zoomOptions.scaleSpeed = Number(zoom['scaleSpeed']);
   }
   return zoomOptions;
 };
@@ -250,9 +250,9 @@ Blockly.Options.parseZoomOptions_ = function(options) {
 Blockly.Options.parseGridOptions_ = function(options) {
   var grid = options['grid'] || {};
   var gridOptions = {};
-  gridOptions.spacing = parseFloat(grid['spacing']) || 0;
+  gridOptions.spacing = Number(grid['spacing']) || 0;
   gridOptions.colour = grid['colour'] || '#888';
-  gridOptions.length = parseFloat(grid['length']) || 1;
+  gridOptions.length = Number(grid['length']) || 1;
   gridOptions.snap = gridOptions.spacing > 0 && !!grid['snap'];
   return gridOptions;
 };
diff --git a/core/utils.js b/core/utils.js
index a3a5bb97a..dfbdec90a 100644
--- a/core/utils.js
+++ b/core/utils.js
@@ -85,9 +85,9 @@ Blockly.utils.getRelativeXY = function(element) {
   var transform = element.getAttribute('transform');
   var r = transform && transform.match(Blockly.utils.getRelativeXY.XY_REGEX_);
   if (r) {
-    xy.x += parseFloat(r[1]);
+    xy.x += Number(r[1]);
     if (r[3]) {
-      xy.y += parseFloat(r[3]);
+      xy.y += Number(r[3]);
     }
   }
 
@@ -97,9 +97,9 @@ Blockly.utils.getRelativeXY = function(element) {
     var styleComponents =
         style.match(Blockly.utils.getRelativeXY.XY_STYLE_REGEX_);
     if (styleComponents) {
-      xy.x += parseFloat(styleComponents[1]);
+      xy.x += Number(styleComponents[1]);
       if (styleComponents[3]) {
-        xy.y += parseFloat(styleComponents[3]);
+        xy.y += Number(styleComponents[3]);
       }
     }
   }
diff --git a/core/ws_comment_events.js b/core/ws_comment_events.js
index 953f1a7d3..70ca6d0cd 100644
--- a/core/ws_comment_events.js
+++ b/core/ws_comment_events.js
@@ -345,8 +345,8 @@ Blockly.Events.CommentMove.prototype.type = Blockly.Events.COMMENT_MOVE;
 /**
  * Override the location before the move.  Use this if you don't create the
  * event until the end of the move, but you know the original location.
- * @param {!Blockly.utils.Coordinate} xy The location before the move, in workspace
- *     coordinates.
+ * @param {!Blockly.utils.Coordinate} xy The location before the move,
+ *     in workspace coordinates.
  */
 Blockly.Events.CommentMove.prototype.setOldCoordinate = function(xy) {
   this.oldCoordinate_ = xy;
@@ -376,7 +376,7 @@ Blockly.Events.CommentMove.prototype.fromJson = function(json) {
   if (json['newCoordinate']) {
     var xy = json['newCoordinate'].split(',');
     this.newCoordinate_ =
-        new Blockly.utils.Coordinate(parseFloat(xy[0]), parseFloat(xy[1]));
+        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
   }
 };
 
@@ -385,7 +385,8 @@ Blockly.Events.CommentMove.prototype.fromJson = function(json) {
  * @return {boolean} False if something changed.
  */
 Blockly.Events.CommentMove.prototype.isNull = function() {
-  return Blockly.utils.Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
+  return Blockly.utils.Coordinate.equals(this.oldCoordinate_,
+      this.newCoordinate_);
 };
 
 /**
diff --git a/demos/blockfactory/factory_utils.js b/demos/blockfactory/factory_utils.js
index ee1b32807..3e63006c7 100644
--- a/demos/blockfactory/factory_utils.js
+++ b/demos/blockfactory/factory_utils.js
@@ -443,7 +443,7 @@ FactoryUtils.getFieldsJs_ = function(block) {
         case 'field_angle':
           // Result: new Blockly.FieldAngle(90), 'ANGLE'
           fields.push('new Blockly.FieldAngle(' +
-              parseFloat(block.getFieldValue('ANGLE')) + '), ' +
+              Number(block.getFieldValue('ANGLE')) + '), ' +
               JSON.stringify(block.getFieldValue('FIELDNAME')));
           break;
         case 'field_checkbox':
@@ -536,17 +536,17 @@ FactoryUtils.getFieldsJson_ = function(block) {
           var obj = {
             type: block.type,
             name: block.getFieldValue('FIELDNAME'),
-            value: parseFloat(block.getFieldValue('VALUE'))
+            value: Number(block.getFieldValue('VALUE'))
           };
-          var min = parseFloat(block.getFieldValue('MIN'));
+          var min = Number(block.getFieldValue('MIN'));
           if (min > -Infinity) {
             obj.min = min;
           }
-          var max = parseFloat(block.getFieldValue('MAX'));
+          var max = Number(block.getFieldValue('MAX'));
           if (max < Infinity) {
             obj.max = max;
           }
-          var precision = parseFloat(block.getFieldValue('PRECISION'));
+          var precision = Number(block.getFieldValue('PRECISION'));
           if (precision) {
             obj.precision = precision;
           }
diff --git a/demos/blockfactory/workspacefactory/wfactory_controller.js b/demos/blockfactory/workspacefactory/wfactory_controller.js
index 67b656e4d..578d0a964 100644
--- a/demos/blockfactory/workspacefactory/wfactory_controller.js
+++ b/demos/blockfactory/workspacefactory/wfactory_controller.js
@@ -1179,19 +1179,19 @@ WorkspaceFactoryController.prototype.readOptions_ = function() {
     var startScaleValue =
         document.getElementById('zoomOption_startScale_number').value;
     zoom['startScale'] = typeof startScaleValue == 'string' ?
-        parseFloat(startScaleValue) : startScaleValue;
+        Number(startScaleValue) : startScaleValue;
     var maxScaleValue =
         document.getElementById('zoomOption_maxScale_number').value;
     zoom['maxScale'] = typeof maxScaleValue == 'string' ?
-        parseFloat(maxScaleValue) : maxScaleValue;
+        Number(maxScaleValue) : maxScaleValue;
     var minScaleValue =
         document.getElementById('zoomOption_minScale_number').value;
     zoom['minScale'] = typeof minScaleValue == 'string' ?
-        parseFloat(minScaleValue) : minScaleValue;
+        Number(minScaleValue) : minScaleValue;
     var scaleSpeedValue =
         document.getElementById('zoomOption_scaleSpeed_number').value;
     zoom['scaleSpeed'] = typeof scaleSpeedValue == 'string' ?
-        parseFloat(scaleSpeedValue) : scaleSpeedValue;
+        Number(scaleSpeedValue) : scaleSpeedValue;
     optionsObj['zoom'] = zoom;
   }
 
diff --git a/demos/blockfactory_old/factory.js b/demos/blockfactory_old/factory.js
index 338349f8a..b40a43e98 100644
--- a/demos/blockfactory_old/factory.js
+++ b/demos/blockfactory_old/factory.js
@@ -416,17 +416,17 @@ function getFieldsJson_(block) {
           var obj = {
             type: block.type,
             name: block.getFieldValue('FIELDNAME'),
-            value: parseFloat(block.getFieldValue('VALUE'))
+            value: Number(block.getFieldValue('VALUE'))
           };
-          var min = parseFloat(block.getFieldValue('MIN'));
+          var min = Number(block.getFieldValue('MIN'));
           if (min > -Infinity) {
             obj.min = min;
           }
-          var max = parseFloat(block.getFieldValue('MAX'));
+          var max = Number(block.getFieldValue('MAX'));
           if (max < Infinity) {
             obj.max = max;
           }
-          var precision = parseFloat(block.getFieldValue('PRECISION'));
+          var precision = Number(block.getFieldValue('PRECISION'));
           if (precision) {
             obj.precision = precision;
           }
diff --git a/generators/dart/loops.js b/generators/dart/loops.js
index 617768ce6..12e5e3dc4 100644
--- a/generators/dart/loops.js
+++ b/generators/dart/loops.js
@@ -89,11 +89,11 @@ Blockly.Dart['controls_for'] = function(block) {
   if (Blockly.isNumber(argument0) && Blockly.isNumber(argument1) &&
       Blockly.isNumber(increment)) {
     // All arguments are simple numbers.
-    var up = parseFloat(argument0) <= parseFloat(argument1);
+    var up = Number(argument0) <= Number(argument1);
     code = 'for (' + variable0 + ' = ' + argument0 + '; ' +
         variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' +
         variable0;
-    var step = Math.abs(parseFloat(increment));
+    var step = Math.abs(Number(increment));
     if (step == 1) {
       code += up ? '++' : '--';
     } else {
diff --git a/generators/dart/math.js b/generators/dart/math.js
index a79e2ddb6..c26cf791f 100644
--- a/generators/dart/math.js
+++ b/generators/dart/math.js
@@ -33,7 +33,7 @@ Blockly.Dart.addReservedWords('Math');
 
 Blockly.Dart['math_number'] = function(block) {
   // Numeric value.
-  var code = parseFloat(block.getFieldValue('NUM'));
+  var code = Number(block.getFieldValue('NUM'));
   var order;
   if (code == Infinity) {
     code = 'double.infinity';
diff --git a/generators/javascript.js b/generators/javascript.js
index 9d20ca974..f5d777e43 100644
--- a/generators/javascript.js
+++ b/generators/javascript.js
@@ -304,7 +304,7 @@ Blockly.JavaScript.getAdjusted = function(block, atId, opt_delta, opt_negate,
 
   if (Blockly.isNumber(at)) {
     // If the index is a naked number, adjust it right now.
-    at = parseFloat(at) + delta;
+    at = Number(at) + delta;
     if (opt_negate) {
       at = -at;
     }
diff --git a/generators/javascript/lists.js b/generators/javascript/lists.js
index 45430162c..2dc538993 100644
--- a/generators/javascript/lists.js
+++ b/generators/javascript/lists.js
@@ -354,7 +354,7 @@ Blockly.JavaScript['lists_sort'] = function(block) {
           '(type, direction) {',
        '  var compareFuncs = {',
        '    "NUMERIC": function(a, b) {',
-       '        return parseFloat(a) - parseFloat(b); },',
+       '        return Number(a) - Number(b); },',
        '    "TEXT": function(a, b) {',
        '        return a.toString() > b.toString() ? 1 : -1; },',
        '    "IGNORE_CASE": function(a, b) {',
diff --git a/generators/javascript/loops.js b/generators/javascript/loops.js
index 79dda13c1..f49323c18 100644
--- a/generators/javascript/loops.js
+++ b/generators/javascript/loops.js
@@ -90,11 +90,11 @@ Blockly.JavaScript['controls_for'] = function(block) {
   if (Blockly.isNumber(argument0) && Blockly.isNumber(argument1) &&
       Blockly.isNumber(increment)) {
     // All arguments are simple numbers.
-    var up = parseFloat(argument0) <= parseFloat(argument1);
+    var up = Number(argument0) <= Number(argument1);
     code = 'for (' + variable0 + ' = ' + argument0 + '; ' +
         variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' +
         variable0;
-    var step = Math.abs(parseFloat(increment));
+    var step = Math.abs(Number(increment));
     if (step == 1) {
       code += up ? '++' : '--';
     } else {
diff --git a/generators/javascript/math.js b/generators/javascript/math.js
index fa7d7714b..7137a39ac 100644
--- a/generators/javascript/math.js
+++ b/generators/javascript/math.js
@@ -31,7 +31,7 @@ goog.require('Blockly.JavaScript');
 
 Blockly.JavaScript['math_number'] = function(block) {
   // Numeric value.
-  var code = parseFloat(block.getFieldValue('NUM'));
+  var code = Number(block.getFieldValue('NUM'));
   var order = code >= 0 ? Blockly.JavaScript.ORDER_ATOMIC :
               Blockly.JavaScript.ORDER_UNARY_NEGATION;
   return [code, order];
diff --git a/generators/javascript/text.js b/generators/javascript/text.js
index 32ced3fb1..fbada57e4 100644
--- a/generators/javascript/text.js
+++ b/generators/javascript/text.js
@@ -316,7 +316,7 @@ Blockly.JavaScript['text_prompt_ext'] = function(block) {
   var code = 'window.prompt(' + msg + ')';
   var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
   if (toNumber) {
-    code = 'parseFloat(' + code + ')';
+    code = 'Number(' + code + ')';
   }
   return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
diff --git a/generators/lua/loops.js b/generators/lua/loops.js
index d229a9402..8b64bd004 100644
--- a/generators/lua/loops.js
+++ b/generators/lua/loops.js
@@ -116,8 +116,8 @@ Blockly.Lua['controls_for'] = function(block) {
   if (Blockly.isNumber(startVar) && Blockly.isNumber(endVar) &&
       Blockly.isNumber(increment)) {
     // All arguments are simple numbers.
-    var up = parseFloat(startVar) <= parseFloat(endVar);
-    var step = Math.abs(parseFloat(increment));
+    var up = Number(startVar) <= Number(endVar);
+    var step = Math.abs(Number(increment));
     incValue = (up ? '' : '-') + step;
   } else {
     code = '';
diff --git a/generators/lua/math.js b/generators/lua/math.js
index a105371e5..bc80d1597 100644
--- a/generators/lua/math.js
+++ b/generators/lua/math.js
@@ -31,7 +31,7 @@ goog.require('Blockly.Lua');
 
 Blockly.Lua['math_number'] = function(block) {
   // Numeric value.
-  var code = parseFloat(block.getFieldValue('NUM'));
+  var code = Number(block.getFieldValue('NUM'));
   var order = code < 0 ? Blockly.Lua.ORDER_UNARY :
               Blockly.Lua.ORDER_ATOMIC;
   return [code, order];
@@ -434,4 +434,4 @@ Blockly.Lua['math_atan2'] = function(block) {
       Blockly.Lua.ORDER_NONE) || '0';
   return ['math.deg(math.atan2(' + argument1 + ', ' + argument0 + '))',
       Blockly.Lua.ORDER_HIGH];
-};
\ No newline at end of file
+};
diff --git a/generators/php.js b/generators/php.js
index 0c926e90b..84a7bc755 100644
--- a/generators/php.js
+++ b/generators/php.js
@@ -285,7 +285,7 @@ Blockly.PHP.getAdjusted = function(block, atId, opt_delta, opt_negate,
 
   if (Blockly.isNumber(at)) {
     // If the index is a naked number, adjust it right now.
-    at = parseFloat(at) + delta;
+    at = Number(at) + delta;
     if (opt_negate) {
       at = -at;
     }
diff --git a/generators/php/loops.js b/generators/php/loops.js
index 09d54de0a..c311d27c9 100644
--- a/generators/php/loops.js
+++ b/generators/php/loops.js
@@ -89,11 +89,11 @@ Blockly.PHP['controls_for'] = function(block) {
   if (Blockly.isNumber(argument0) && Blockly.isNumber(argument1) &&
       Blockly.isNumber(increment)) {
     // All arguments are simple numbers.
-    var up = parseFloat(argument0) <= parseFloat(argument1);
+    var up = Number(argument0) <= Number(argument1);
     code = 'for (' + variable0 + ' = ' + argument0 + '; ' +
         variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' +
         variable0;
-    var step = Math.abs(parseFloat(increment));
+    var step = Math.abs(Number(increment));
     if (step == 1) {
       code += up ? '++' : '--';
     } else {
diff --git a/generators/php/math.js b/generators/php/math.js
index 478faa8c6..a9478e73e 100644
--- a/generators/php/math.js
+++ b/generators/php/math.js
@@ -31,7 +31,7 @@ goog.require('Blockly.PHP');
 
 Blockly.PHP['math_number'] = function(block) {
   // Numeric value.
-  var code = parseFloat(block.getFieldValue('NUM'));
+  var code = Number(block.getFieldValue('NUM'));
   var order = code >= 0 ? Blockly.PHP.ORDER_ATOMIC :
               Blockly.PHP.ORDER_UNARY_NEGATION;
   if (code == Infinity) {
diff --git a/generators/python/loops.js b/generators/python/loops.js
index 4e331f089..bcbccfaf6 100644
--- a/generators/python/loops.js
+++ b/generators/python/loops.js
@@ -113,9 +113,9 @@ Blockly.Python['controls_for'] = function(block) {
   if (Blockly.isNumber(argument0) && Blockly.isNumber(argument1) &&
       Blockly.isNumber(increment)) {
     // All parameters are simple numbers.
-    argument0 = parseFloat(argument0);
-    argument1 = parseFloat(argument1);
-    increment = Math.abs(parseFloat(increment));
+    argument0 = Number(argument0);
+    argument1 = Number(argument1);
+    increment = Math.abs(Number(increment));
     if (argument0 % 1 === 0 && argument1 % 1 === 0 && increment % 1 === 0) {
       // All parameters are integers.
       if (argument0 <= argument1) {
@@ -151,7 +151,7 @@ Blockly.Python['controls_for'] = function(block) {
     var scrub = function(arg, suffix) {
       if (Blockly.isNumber(arg)) {
         // Simple number.
-        arg = parseFloat(arg);
+        arg = Number(arg);
       } else if (arg.match(/^\w+$/)) {
         // Variable.
         arg = 'float(' + arg + ')';
diff --git a/generators/python/math.js b/generators/python/math.js
index 11e8466e2..c2d49d735 100644
--- a/generators/python/math.js
+++ b/generators/python/math.js
@@ -34,7 +34,7 @@ Blockly.Python.addReservedWords('math,random,Number');
 
 Blockly.Python['math_number'] = function(block) {
   // Numeric value.
-  var code = parseFloat(block.getFieldValue('NUM'));
+  var code = Number(block.getFieldValue('NUM'));
   var order;
   if (code == Infinity) {
     code = 'float("inf")';
diff --git a/tests/generators/golden/generated.js b/tests/generators/golden/generated.js
index f59298f40..a24dd0bdd 100644
--- a/tests/generators/golden/generated.js
+++ b/tests/generators/golden/generated.js
@@ -1440,7 +1440,7 @@ function test_split() {
 function listsGetSortCompare(type, direction) {
   var compareFuncs = {
     "NUMERIC": function(a, b) {
-        return parseFloat(a) - parseFloat(b); },
+        return Number(a) - Number(b); },
     "TEXT": function(a, b) {
         return a.toString() > b.toString() ? 1 : -1; },
     "IGNORE_CASE": function(a, b) {
diff --git a/tests/generators/unittest_dart.js b/tests/generators/unittest_dart.js
index 28b14e670..cf87e1d79 100644
--- a/tests/generators/unittest_dart.js
+++ b/tests/generators/unittest_dart.js
@@ -166,7 +166,7 @@ Blockly.Dart['unittest_adjustindex'] = function(block) {
   if (block.workspace.options.oneBasedIndex) {
     if (Blockly.isNumber(index)) {
       // If the index is a naked number, adjust it right now.
-      return [parseFloat(index) + 1, Blockly.Dart.ORDER_ATOMIC];
+      return [Number(index) + 1, Blockly.Dart.ORDER_ATOMIC];
     } else {
       // If the index is dynamic, adjust it in code.
       index = index + ' + 1';
diff --git a/tests/generators/unittest_javascript.js b/tests/generators/unittest_javascript.js
index e483be1b8..2afac9d45 100644
--- a/tests/generators/unittest_javascript.js
+++ b/tests/generators/unittest_javascript.js
@@ -170,7 +170,7 @@ Blockly.JavaScript['unittest_adjustindex'] = function(block) {
   if (block.workspace.options.oneBasedIndex) {
     if (Blockly.isNumber(index)) {
       // If the index is a naked number, adjust it right now.
-      return [parseFloat(index) + 1, Blockly.JavaScript.ORDER_ATOMIC];
+      return [Number(index) + 1, Blockly.JavaScript.ORDER_ATOMIC];
     } else {
       // If the index is dynamic, adjust it in code.
       index = index + ' + 1';
diff --git a/tests/generators/unittest_lua.js b/tests/generators/unittest_lua.js
index 1d0860bdc..bdeba49a1 100644
--- a/tests/generators/unittest_lua.js
+++ b/tests/generators/unittest_lua.js
@@ -173,7 +173,7 @@ Blockly.Lua['unittest_adjustindex'] = function(block) {
       Blockly.Lua.ORDER_ADDITIVE) || '0';
   if (Blockly.isNumber(index)) {
     // If the index is a naked number, adjust it right now.
-    return [parseFloat(index) + 1, Blockly.Lua.ORDER_ATOMIC];
+    return [Number(index) + 1, Blockly.Lua.ORDER_ATOMIC];
   }
   // If the index is dynamic, adjust it in code.
   return [index + ' + 1', Blockly.Lua.ORDER_ATOMIC];
diff --git a/tests/generators/unittest_php.js b/tests/generators/unittest_php.js
index 4d030ea83..b2f499bda 100644
--- a/tests/generators/unittest_php.js
+++ b/tests/generators/unittest_php.js
@@ -157,7 +157,7 @@ Blockly.PHP['unittest_adjustindex'] = function(block) {
   if (block.workspace.options.oneBasedIndex) {
     if (Blockly.isNumber(index)) {
       // If the index is a naked number, adjust it right now.
-      return [parseFloat(index) + 1, Blockly.PHP.ORDER_ATOMIC];
+      return [Number(index) + 1, Blockly.PHP.ORDER_ATOMIC];
     } else {
       // If the index is dynamic, adjust it in code.
       index = index + ' + 1';
diff --git a/tests/generators/unittest_python.js b/tests/generators/unittest_python.js
index 70f6773e1..637be2830 100644
--- a/tests/generators/unittest_python.js
+++ b/tests/generators/unittest_python.js
@@ -141,7 +141,7 @@ Blockly.Python['unittest_adjustindex'] = function(block) {
   if (block.workspace.options.oneBasedIndex) {
     if (Blockly.isNumber(index)) {
       // If the index is a naked number, adjust it right now.
-      return [parseFloat(index) + 1, Blockly.Python.ORDER_ATOMIC];
+      return [Number(index) + 1, Blockly.Python.ORDER_ATOMIC];
     } else {
       // If the index is dynamic, adjust it in code.
       index = index + ' + 1';
diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js
index 93e3dc870..d86a6b365 100644
--- a/tests/mocha/field_angle_test.js
+++ b/tests/mocha/field_angle_test.js
@@ -24,7 +24,7 @@ suite('Angle Fields', function() {
     var actualText = angleField.getText();
     opt_expectedText = opt_expectedText || String(expectedValue);
     assertEquals(String(actualValue), String(expectedValue));
-    assertEquals(parseFloat(actualValue), expectedValue);
+    assertEquals(Number(actualValue), expectedValue);
     assertEquals(actualText, opt_expectedText);
   }
   function assertValueDefault(angleField) {
diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js
index c7d68cdf5..95ff1b3dd 100644
--- a/tests/mocha/field_number_test.js
+++ b/tests/mocha/field_number_test.js
@@ -24,7 +24,7 @@ suite('Number Fields', function() {
     var actualText = numberField.getText();
     opt_expectedText = opt_expectedText || String(expectedValue);
     assertEquals(String(actualValue), String(expectedValue));
-    assertEquals(parseFloat(actualValue), expectedValue);
+    assertEquals(Number(actualValue), expectedValue);
     assertEquals(actualText, opt_expectedText);
   }
   function assertValueDefault(numberField) {