Simplifying more code

src/js/parser/javascript/charset_range.js

@@ -6,19 +6,19 @@ export default _.extend({}, Base, {
   type: 'charset-range',
 
   _render() {
-    var hyphen = this.container.text()
+    var contents = [
-      .attr({
+      this.first,
-        text: '-'
+      this.container.text()
-      });
+        .attr({ text: '-' }),
+      this.last
+    ];
 
     return Q.all([
       this.first.render(this.container.group()),
       this.last.render(this.container.group())
     ])
-      .then((() => {
+      .then(this.spaceHorizontally.bind(this, contents, {
-        this.spaceHorizontally([this.first, hyphen, this.last], {
+        padding: 5
-          padding: 5
+      }));
-        });
-      }).bind(this));
   }
 });

src/js/parser/javascript/escape.js

@@ -13,12 +13,13 @@ export default _.extend({}, Base, {
   },
 
   _render() {
-    return this.renderLabel(_.result(this, this.code())).then(label => {
+    return this.renderLabel(_.result(this, this.code()))
-      label.select('rect').attr({
+      .then(label => {
-        rx: 3,
+        label.select('rect').attr({
-        ry: 3
+          rx: 3,
+          ry: 3
+        });
       });
-    });
   },
 
   // Escape code mappings

src/js/parser/javascript/literal.js

@@ -5,11 +5,12 @@ export default _.extend({}, Base, {
   type: 'literal',
 
   _render() {
-    return this.renderLabel('"' + this.literal.textValue + '"').then(label => {
+    return this.renderLabel('"' + this.literal.textValue + '"')
-      label.select('rect').attr({
+      .then(label => {
-        rx: 3,
+        label.select('rect').attr({
-        ry: 3
+          rx: 3,
+          ry: 3
+        });
       });
-    });
   }
 });

src/js/parser/javascript/match.js

@@ -11,15 +11,13 @@ export default _.extend({}, Base, {
         partPromises;
 
     if (this.anchorStart()) {
-      start = this.renderLabel('Start of line').then(label => {
+      start = this.renderLabel('Start of line')
-        return label.addClass('anchor');
+        .invoke('addClass', 'anchor');
-      });
     }
 
     if (this.anchorEnd()) {
-      end = this.renderLabel('End of line').then(label => {
+      end = this.renderLabel('End of line')
-        return label.addClass('anchor');
+        .invoke('addClass', 'anchor');
-      });
     }
 
     if (start || end || parts.length !== 1) {