Pending renames and cleanups after commits

pkg/compiler/lib/src/diagnostics/messages.dart

Index: pkg/compiler/lib/src/diagnostics/messages.dart
diff --git a/pkg/compiler/lib/src/diagnostics/messages.dart b/pkg/compiler/lib/src/diagnostics/messages.dart
index 834cda536044011ea6458ac9a0a30c170deafc38..68e2a788f265dd1d64dd0e49219e000dd393520f 100644
--- a/pkg/compiler/lib/src/diagnostics/messages.dart
+++ b/pkg/compiler/lib/src/diagnostics/messages.dart
@@ -2034,7 +2034,7 @@ part of lib.bar;
           MessageKind.LIBRARY_URI_MISMATCH,
           "Expected URI of library '#{libraryUri}'.",
           howToFix: "Try changing the directive to 'part of "
-                    "\"#{libraryUri}\";'.",
+              "\"#{libraryUri}\";'.",
           examples: const [
             const {
               'main.dart': """
@@ -3294,13 +3294,14 @@ Please include the following information:
           "  <sdk>/lib/_internal/js_runtime/lib/preambles."),
 
       MessageKind.INVALID_INLINE_FUNCTION_TYPE: const MessageTemplate(
-          MessageKind.INVALID_INLINE_FUNCTION_TYPE,
-          "Invalid inline function type.",
-          howToFix: "Try changing the inline function type (as in 'int f()') to"
-             " a prefixed function type using the `Function` keyword (as in "
-             "'int Function() f').",
-          examples:
-              const ["typedef F = Function(int f(String x)); main() { F f; }"],
+        MessageKind.INVALID_INLINE_FUNCTION_TYPE,
+        "Invalid inline function type.",
+        howToFix: "Try changing the inline function type (as in 'int f()') to"
+            " a prefixed function type using the `Function` keyword (as in "
+            "'int Function() f').",
+        examples: const [
+          "typedef F = Function(int f(String x)); main() { F f; }"
+        ],
       ),
 
       MessageKind.INVALID_SYNC_MODIFIER: const MessageTemplate(