diff --git a/src/babel/transformation/transformers/es6/classes.js b/src/babel/transformation/transformers/es6/classes.js
index 46126e45dd..add480ac59 100644
--- a/src/babel/transformation/transformers/es6/classes.js
+++ b/src/babel/transformation/transformers/es6/classes.js
@@ -33,7 +33,7 @@ var verifyConstructorVisitor = traverse.explode({
 
   CallExpression: {
     enter(node, parent, scope, state) {
-      if (t.isIdentifier(node.callee, { name: "super" })) {
+      if (this.get("callee").isIdentifier({ name: "super" })) {
         state.hasBareSuper = true;
 
         if (!state.hasSuper) {
@@ -208,7 +208,7 @@ class ClassTransformer {
       }
     }
 
-    // we have no constructor, we have a super, and the super doesn't appear to be falsy
+    // we have no constructor, but we're a derived class
     if (!this.hasConstructor && this.hasSuper) {
       var helperName = "class-super-constructor-call";
       if (this.isLoose) helperName += "-loose";
diff --git a/src/babel/transformation/transformers/es6/template-literals.js b/src/babel/transformation/transformers/es6/template-literals.js
index 9bee577561..537f57bde1 100644
--- a/src/babel/transformation/transformers/es6/template-literals.js
+++ b/src/babel/transformation/transformers/es6/template-literals.js
@@ -9,11 +9,11 @@ export function check(node) {
 }
 
 export function TaggedTemplateExpression(node, parent, scope, file) {
-  var args = [];
   var quasi = node.quasi;
+  var args  = [];
 
   var strings = [];
-  var raw = [];
+  var raw     = [];
 
   for (var i = 0; i < quasi.quasis.length; i++) {
     var elem = quasi.quasis[i];