Pending renames and cleanups after commits

pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart

Index: pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
index e64c99085a87eba3bab7c5663f9de4f3cd91f593..07b665a5e0ec689e385900c15f513cdacd797a0b 100644
--- a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
@@ -46,7 +46,7 @@ import '../../js_backend/js_backend.dart'
         JavaScriptConstantCompiler,
         Namer,
         SetterName,
-        TypeVariableHandler;
+        TypeVariableCodegenAnalysis;
 import '../../universe/call_structure.dart' show CallStructure;
 import '../../universe/selector.dart' show Selector;
 import '../../universe/world_builder.dart' show CodegenWorldBuilder;
@@ -139,7 +139,8 @@ class Emitter implements js_emitter.Emitter {
   final Set<jsAst.Name> recordedMangledNames = new Set<jsAst.Name>();
 
   JavaScriptBackend get backend => compiler.backend;
-  TypeVariableHandler get typeVariableHandler => backend.typeVariableHandler;
+  TypeVariableCodegenAnalysis get typeVariableCodegenAnalysis =>
+      backend.typeVariableCodegenAnalysis;
 
   String get _ => space;
   String get space => compiler.options.enableMinification ? "" : " ";