Pending renames and cleanups after commits

pkg/compiler/lib/src/serialization/equivalence.dart

Index: pkg/compiler/lib/src/serialization/equivalence.dart
diff --git a/pkg/compiler/lib/src/serialization/equivalence.dart b/pkg/compiler/lib/src/serialization/equivalence.dart
index 6f5bb94ee230e13fb15ee82921045f0405c9575d..e0a5d03dc1445b342cf50daf1374bd81825837e6 100644
--- a/pkg/compiler/lib/src/serialization/equivalence.dart
+++ b/pkg/compiler/lib/src/serialization/equivalence.dart
@@ -2056,10 +2056,10 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   bool visitFunctionTypeAnnotation(
       FunctionTypeAnnotation node1, FunctionTypeAnnotation node2) {
     return testNodes(
-        node1, node2, 'returnType', node1.returnType, node2.returnType) &&
+            node1, node2, 'returnType', node1.returnType, node2.returnType) &&
         testNodes(node1, node2, 'formals', node1.formals, node2.formals) &&
-            testNodes(node1, node2, 'typeParameters', node1.typeParameters,
-                node2.typeParameters);
+        testNodes(node1, node2, 'typeParameters', node1.typeParameters,
+            node2.typeParameters);
   }
 
   @override