diff --git a/closure.log b/closure.log
deleted file mode 100644
index c442555558..0000000000
--- a/closure.log
+++ /dev/null
@@ -1,29 +0,0 @@
-gulp-google-closure-compiler: polymer.html_script_13.js:621: WARNING - Invalid type for parameter 4 of function processElementStyles.
-Expected : string
-Found    : (string|undefined)
-More details:
-The found type is a union that includes an unexpected type: undefined
-          processElementStyles(this, template, is, ext, baseURI);
-                                                   ^^^
-
-polymer.html_script_6.js:36: WARNING - Type annotation references non-existent type array.
-     * @return {array} Array of contained <style> elements
-                ^^^^^
-
-polymer.html_script_6.js:56: WARNING - Type annotation references non-existent type array.
-     * @return {array} Array of contained styles.
-                ^^^^^
-
-polymer.html_script_6.js:85: WARNING - Type annotation references non-existent type array.
-     * @return {array} Array of styles
-                ^^^^^
-
-polymer.html_script_6.js:119: WARNING - Type annotation references non-existent type array.
-     * @return {array} Array of contained styles.
-                ^^^^^
-
-polymer.html_script_6.js:131: WARNING - Type annotation references non-existent type array.
-     * @return {array} Array of contained styles
-                ^^^^^
-
-0 error(s), 6 warning(s), 77.7% typed
diff --git a/externs/closure-types.js b/externs/closure-types.js
index fcb29ec3f4..7d03a31482 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -749,12 +749,11 @@ Polymer_ElementMixin._parseTemplateContent = function(template, templateInfo, no
 */
 Polymer_ElementMixin.finalize = function(){};
 /**
-* @param {string} is Tag name for this element
-* @param {!HTMLTemplateElement} template Template to process
+* @param {string} cssText Text containing styling to process
 * @param {string} baseURI Base URI to rebase CSS paths against
 * @return {string}
 */
-Polymer_ElementMixin._processStyleText = function(is, template, baseURI){};
+Polymer_ElementMixin._processStyleText = function(cssText, baseURI){};
 /**
 * @param {string} is Tag name (or type extension name) for this element
 * @param {string=} ext For type extensions, the tag name that was extended
@@ -799,7 +798,7 @@ Polymer_DirMixin.prototype.disconnectedCallback = function(){};
 /**
 * @override
 */
-Polymer_DirMixin._processStyleText = function(is, template, baseURI){};
+Polymer_DirMixin._processStyleText = function(cssText, baseURI){};
 /**
 * @param {string} text CSS text to replace DIR
 * @return {string}
diff --git a/lib/utils/style-gather.html b/lib/utils/style-gather.html
index c0f9632c4d..602d052e9d 100644
--- a/lib/utils/style-gather.html
+++ b/lib/utils/style-gather.html
@@ -43,7 +43,7 @@
      * @memberof Polymer.StyleGather
      * @param {string} moduleIds List of dom-module id's within which to
      * search for css.
-     * @return {array} Array of contained <style> elements
+     * @return {Array} Array of contained <style> elements
      * @this {StyleGather}
      */
      stylesFromModules(moduleIds) {
@@ -63,7 +63,7 @@
      *
      * @memberof Polymer.StyleGather
      * @param {string} moduleId dom-module id to gather styles from
-     * @return {array} Array of contained styles.
+     * @return {Array} Array of contained styles.
      * @this {StyleGather}
      */
     stylesFromModule(moduleId) {
@@ -92,7 +92,7 @@
      * @memberof Polymer.StyleGather
      * @param {HTMLTemplateElement} template Template to gather styles from
      * @param {string} baseURI baseURI for style content
-     * @return {array} Array of styles
+     * @return {Array} Array of styles
      * @this {StyleGather}
      */
     stylesFromTemplate(template, baseURI) {
@@ -126,7 +126,7 @@
      *
      * @memberof Polymer.StyleGather
      * @param {string} moduleId Id of `dom-module` to gather CSS from
-     * @return {array} Array of contained styles.
+     * @return {Array} Array of contained styles.
      * @this {StyleGather}
      */
      stylesFromModuleImports(moduleId) {
@@ -138,7 +138,7 @@
      * @memberof Polymer.StyleGather
      * @this {StyleGather}
      * @param {!HTMLElement} module dom-module element that could contain `<link rel="import" type="css">` styles
-     * @return {array} Array of contained styles
+     * @return {Array} Array of contained styles
      */
     _stylesFromModuleImports(module) {
       const styles = [];