diff --git a/binding.js b/binding.js
deleted file mode 100644
index ec7943d..0000000
--- a/binding.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-(function() {
- function getBinding(element, name) {
-    if (element && element.bindings) {
-      var binding = element.bindings[name];
-      if (binding) {
-        return binding.path;
-      }
-    }
-  }
-  window.Bindings = {
-    getBinding: getBinding
-  }
-})();
diff --git a/x-dom-serializer.html b/x-dom-serializer.html
index 1e2c69e..ba5b42a 100644
--- a/x-dom-serializer.html
+++ b/x-dom-serializer.html
@@ -10,6 +10,7 @@
   <script>
     Polymer('x-serializer', {
       tab: '  ',
+      attributesBlacklist: ['style', 'tabindex', 'role'],
       dumpTag: function(node, indent) {
         if (node.dumpTag) {
           return node.dumpTag(this.dumpTab, indent, this.tab);
@@ -23,7 +24,8 @@
         Object.keys(attributes).forEach(function(k) {
           var v = attributes[k];
           if (v !== null && v !== undefined) {
-            html += ' ' + k + (v !== '' ? '="' + v + '"': '');
+            var sep = typeof v === 'string' && v.indexOf('"') >= 0 ? '\'' : '"';
+            html += ' ' + k + (v !== '' ? '=' + sep + v + sep: '');
           }
         })
         html += '>';
@@ -79,7 +81,11 @@
       },
       // special handling for certain attributes: style, class
       filterAttributes: function(attributes) {
-        attributes.style = null;
+        for (var i in attributes) {
+          if (this.attributesBlacklist.indexOf(i) >= 0 || i.match(/^aria/)) {
+            attributes[i] = null;
+          }
+        }
         var v = attributes['class'];
         v = v ? v.replace(/selected-element/g, '') : null;
         if (v && (v.trim() == 'selected')) {