Pending renames and cleanups after commits

pkg/compiler/lib/src/parser/element_listener.dart

Index: pkg/compiler/lib/src/parser/element_listener.dart
diff --git a/pkg/compiler/lib/src/parser/element_listener.dart b/pkg/compiler/lib/src/parser/element_listener.dart
index be504f68da6e122903ec4fa7309d2ce4a9141a7b..6087178b9b7ba965633091b54daac9f27448b8ac 100644
--- a/pkg/compiler/lib/src/parser/element_listener.dart
+++ b/pkg/compiler/lib/src/parser/element_listener.dart
@@ -301,8 +301,8 @@ class ElementListener extends Listener {
       name = popNode();
       popNode(); // returnType
     } else {
-      popNode();  // Function type.
-      popNode();  // TODO(karlklose): do not throw away typeVariables.
+      popNode(); // Function type.
+      popNode(); // TODO(karlklose): do not throw away typeVariables.
       name = popNode();
     }
     pushElement(new PartialTypedefElement(
@@ -410,8 +410,8 @@ class ElementListener extends Listener {
   }
 
   @override
-  void handleNoConstructorReferenceContinuationAfterTypeArguments(Token token) {
-  }
+  void handleNoConstructorReferenceContinuationAfterTypeArguments(
+      Token token) {}
 
   @override
   void handleNoType(Token token) {
@@ -459,8 +459,8 @@ class ElementListener extends Listener {
 
   @override
   void handleFunctionType(Token functionToken, Token endToken) {
-    popNode();  // Type parameters.
-    popNode();  // Return type.
+    popNode(); // Type parameters.
+    popNode(); // Return type.
     pushNode(null);
   }