diff --git a/accessible/block-connection.service.js b/accessible/block-connection.service.js
index c1ee03aac..d2c5cd866 100644
--- a/accessible/block-connection.service.js
+++ b/accessible/block-connection.service.js
@@ -101,7 +101,7 @@ blocklyApp.BlockConnectionService = ng.core.Class({
   },
   attachToMarkedConnection: function(block) {
     var xml = Blockly.Xml.blockToDom(block);
-    var reconstitutedBlock = Blockly.Xml.domToBlock(blocklyApp.workspace, xml);
+    var reconstitutedBlock = Blockly.Xml.domToBlock(xml, blocklyApp.workspace);
 
     var targetConnection = null;
     if (this.markedConnection_.targetBlock() &&
diff --git a/accessible/field-segment.component.js b/accessible/field-segment.component.js
index 8dda20d71..c68afb455 100644
--- a/accessible/field-segment.component.js
+++ b/accessible/field-segment.component.js
@@ -182,7 +182,7 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
   },
   // Sets the value on a dropdown input.
   setDropdownValue: function(optionValue) {
-    this.optionValue = optionValue
+    this.optionValue = optionValue;
     if (this.optionValue == 'NO_ACTION') {
       return;
     }
diff --git a/accessible/media/accessible.css b/accessible/media/accessible.css
index 500ee7323..285fe8a95 100644
--- a/accessible/media/accessible.css
+++ b/accessible/media/accessible.css
@@ -26,7 +26,7 @@
 }
 .blocklySidebarButton[disabled] {
   border: 1px solid #ccc;
-  opacity: 0.5;
+  opacity: .5;
 }
 
 .blocklyAriaLiveStatus {
diff --git a/accessible/toolbox-modal.service.js b/accessible/toolbox-modal.service.js
index 5d93cea88..70c665c4d 100644
--- a/accessible/toolbox-modal.service.js
+++ b/accessible/toolbox-modal.service.js
@@ -71,7 +71,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
       this.allToolboxCategories = Array.from(toolboxCategoryElts).map(
         function(categoryElt) {
           var tmpWorkspace = new Blockly.Workspace();
-          var custom = categoryElt.attributes.custom
+          var custom = categoryElt.attributes.custom;
           // TODO (corydiers): Implement custom flyouts once #1153 is solved.
           if (custom && custom.value == Blockly.VARIABLE_CATEGORY_NAME) {
             var varBlocks =
@@ -95,7 +95,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
       // containing all the top-level blocks.
       var tmpWorkspace = new Blockly.Workspace();
       Array.from(toolboxXmlElt.children).forEach(function(topLevelNode) {
-        Blockly.Xml.domToBlock(tmpWorkspace, topLevelNode);
+        Blockly.Xml.domToBlock(topLevelNode, tmpWorkspace);
       });
 
       that.allToolboxCategories = [{
@@ -214,7 +214,7 @@ blocklyApp.ToolboxModalService = ng.core.Class({
     this.showModal_(this.toolboxCategoriesForNewGroup, function(block) {
       var blockDescription = that.utilsService.getBlockDescription(block);
       var xml = Blockly.Xml.blockToDom(block);
-      var newBlockId = Blockly.Xml.domToBlock(blocklyApp.workspace, xml).id;
+      var newBlockId = Blockly.Xml.domToBlock(xml, blocklyApp.workspace).id;
 
       // Invoke a digest cycle, so that the DOM settles.
       setTimeout(function() {
diff --git a/accessible/variable-add-modal.component.js b/accessible/variable-add-modal.component.js
index 1965e4e5e..2c3f77bbc 100644
--- a/accessible/variable-add-modal.component.js
+++ b/accessible/variable-add-modal.component.js
@@ -71,7 +71,7 @@ blocklyApp.VariableAddModalComponent = ng.core.Component({
       this.workspace = blocklyApp.workspace;
       this.variableModalService = variableService;
       this.audioService = audioService;
-      this.keyboardInputService = keyboardService
+      this.keyboardInputService = keyboardService;
       this.modalIsVisible = false;
       this.activeButtonIndex = -1;
 
@@ -103,7 +103,7 @@ blocklyApp.VariableAddModalComponent = ng.core.Component({
   getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
   // Gets the container with interactive elements.
   getInteractiveContainer: function() {
-    return document.getElementById("varForm");
+    return document.getElementById('varForm');
   },
   // Submits the name change for the variable.
   submit: function() {
diff --git a/accessible/variable-remove-modal.component.js b/accessible/variable-remove-modal.component.js
index b542e88a5..ce27f5c25 100644
--- a/accessible/variable-remove-modal.component.js
+++ b/accessible/variable-remove-modal.component.js
@@ -74,17 +74,17 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
       this.treeService = treeService;
       this.variableModalService = variableService;
       this.audioService = audioService;
-      this.keyboardInputService = keyboardService
+      this.keyboardInputService = keyboardService;
       this.modalIsVisible = false;
       this.activeButtonIndex = -1;
-      this.currentVariableName = "";
+      this.currentVariableName = '';
       this.count = 0;
 
       var that = this;
       this.variableModalService.registerPreRemoveShowHook(
         function(name, count) {
           that.currentVariableName = name;
-          that.count = count
+          that.count = count;
           that.modalIsVisible = true;
 
           Blockly.CommonModal.setupKeyboardOverrides(that);
@@ -106,7 +106,7 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
   getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
   // Gets the container with interactive elements.
   getInteractiveContainer: function() {
-    return document.getElementById("varForm");
+    return document.getElementById('varForm');
   },
   getNumVariables: function() {
     return this.variableModalService.getNumVariables(this.currentVariableName);
diff --git a/accessible/variable-rename-modal.component.js b/accessible/variable-rename-modal.component.js
index e276e739c..3bb92e75b 100644
--- a/accessible/variable-rename-modal.component.js
+++ b/accessible/variable-rename-modal.component.js
@@ -72,10 +72,10 @@ blocklyApp.VariableRenameModalComponent = ng.core.Component({
       this.workspace = blocklyApp.workspace;
       this.variableModalService = variableService;
       this.audioService = audioService;
-      this.keyboardInputService = keyboardService
+      this.keyboardInputService = keyboardService;
       this.modalIsVisible = false;
       this.activeButtonIndex = -1;
-      this.currentVariableName = "";
+      this.currentVariableName = '';
 
       var that = this;
       this.variableModalService.registerPreRenameShowHook(
@@ -106,7 +106,7 @@ blocklyApp.VariableRenameModalComponent = ng.core.Component({
   getInteractiveElements: Blockly.CommonModal.getInteractiveElements,
   // Gets the container with interactive elements.
   getInteractiveContainer: function() {
-    return document.getElementById("varForm");
+    return document.getElementById('varForm');
   },
   // Submits the name change for the variable.
   submit: function() {