anchor.diff:  }
   
   class ConstructorTemplateData extends TemplateData {
  -  Library _library;
  -  Class _class;
  -  Constructor _constructor;
  +  final Library library;
  +  final Class clazz;
  +  final Constructor constructor;
   
     ConstructorTemplateData(HtmlOptions htmlOptions, Package package,
  -      this._library, this._class, this._constructor)
  -      : super(htmlOptions, package);
  -
  -  Constructor get self => _constructor;
  -  Library get library => _library;
  -  Class get clazz => _class;
  -  Constructor get constructor => _constructor;
  +      this.library, this.clazz, this.constructor)
  +      : super(htmlOptions, package);
  +
  +  Constructor get self => constructor;
     String get layoutTitle => _layoutTitle(
         constructor.name, constructor.fullKind, constructor.isDeprecated);
  -  List get navLinks => [package, _library, clazz];
  +  List get navLinks => [package, library, clazz];
     List<Subnav> get subnavItems => _gatherSubnavForInvokable(constructor);
     String get htmlBase => '../..';
     String get title => '${constructor.name} constructor - ${clazz.name} class - '
  -      '${_library.name} library - Dart API';
  +      '${library.name} library - Dart API';
     String get metaDescription =>
         'API docs for the ${constructor.name} constructor from the '
  -      '${clazz} class from the ${_library.name} library, '
  +      '${clazz} class from the ${library.name} library, '
         'for the Dart programming language.';
   }
   
   class EnumTemplateData extends TemplateData {
  -  Library _library;
  -  Enum _enum;
  -
     EnumTemplateData(
  -      HtmlOptions htmlOptions, Package package, this._library, this._enum)
  -      : super(htmlOptions, package);
  -
  -  Library get library => _library;
  -  Enum get clazz => _enum;
  -  Enum get self => _enum;
  -  String get layoutTitle =>
  -      _layoutTitle(_enum.name, 'enum', _enum.isDeprecated);
  -  String get title => '${self.name} enum - ${_library.name} library - Dart API';
  -  String get metaDescription =>
  -      'API docs for the ${_enum.name} enum from the ${_library.name} library, '
  +      HtmlOptions htmlOptions, Package package, this.library, this.clazz)
  +      : super(htmlOptions, package);
  +
  +  final Library library;
  +  final Enum clazz;
  +  Enum get self => clazz;
  +  String get layoutTitle =>
  +      _layoutTitle(clazz.name, 'enum', clazz.isDeprecated);
  +  String get title => '${self.name} enum - ${library.name} library - Dart API';
  +  String get metaDescription =>
  +      'API docs for the ${clazz.name} enum from the ${library.name} library, '
         'for the Dart programming language.';
  -  List get navLinks => [package, _library];
  +  List get navLinks => [package, library];
     String get htmlBase => '..';
     List<Subnav> get subnavItems {
       return [
  -      new Subnav('Constants', '${_enum.href}#constants'),
  -      new Subnav('Properties', '${_enum.href}#properties')
  +      new Subnav('Constants', '${clazz.href}#constants'),
  +      new Subnav('Properties', '${clazz.href}#properties')
       ];
     }
   }
   
   class FunctionTemplateData extends TemplateData {
  -  ModelFunction _function;
  -  Library _library;
  +  final ModelFunction function;
  +  final Library library;
   
     FunctionTemplateData(
  -      HtmlOptions htmlOptions, Package package, this._library, this._function)
  -      : super(htmlOptions, package);
  -
  -  ModelFunction get self => _function;
  -  ModelFunction get function => _function;
  -  Library get library => _library;
  +      HtmlOptions htmlOptions, Package package, this.library, this.function)
  +      : super(htmlOptions, package);
  +
  +  ModelFunction get self => function;
     String get title =>
  -      '${function.name} function - ${_library.name} library - Dart API';
  +      '${function.name} function - ${library.name} library - Dart API';
     String get layoutTitle =>
         _layoutTitle(function.name, 'function', function.isDeprecated);
     String get metaDescription =>
         'API docs for the ${function.name} function from the '
  -      '${_library.name} library, for the Dart programming language.';
  -  List get navLinks => [package, _library];
  +      '${library.name} library, for the Dart programming language.';
  +  List get navLinks => [package, library];
     List<Subnav> get subnavItems => _gatherSubnavForInvokable(function);
     String get htmlBase => '..';
   }
   
   class MethodTemplateData extends TemplateData {
  -  Library _library;
  -  Method _method;
  -  Class _class;
  -
  -  MethodTemplateData(HtmlOptions htmlOptions, Package package, this._library,
  -      this._class, this._method)
  -      : super(htmlOptions, package);
  -
  -  Library get library => _library;
  -  Class get clazz => _class;
  -  Method get self => _method;
  -  Method get method => _method;
  +  final Library library;
  +  final Method method;
  +  final Class clazz;
  +
  +  MethodTemplateData(HtmlOptions htmlOptions, Package package, this.library,
  +      this.clazz, this.method)
  +      : super(htmlOptions, package);
  +
  +  Method get self => method;
     String get title => '${method.name} method - ${clazz.name} class - '
  -      '${_library.name} library - Dart API';
  +      '${library.name} library - Dart API';
     String get layoutTitle =>
         _layoutTitle(method.name, 'method', method.isDeprecated);
     String get metaDescription =>
         'API docs for the ${method.name} method from the ${clazz.name} class, '
         'for the Dart programming language.';
  -  List get navLinks => [package, _library, clazz];
  +  List get navLinks => [package, library, clazz];
     List<Subnav> get subnavItems => _gatherSubnavForInvokable(method);
     String get htmlBase => '../..';
   }
   
   class PropertyTemplateData extends TemplateData {
  -  Library _library;
  -  Class _class;
  -  Field _property;
  -
  -  PropertyTemplateData(HtmlOptions htmlOptions, Package package, this._library,
  -      this._class, this._property)
  -      : super(htmlOptions, package);
  -
  -  Library get library => _library;
  -  Class get clazz => _class;
  -  Field get self => _property;
  -  Field get property => _property;
  +  final Library library;
  +  final Class clazz;
  +  final Field property;
  +
  +  PropertyTemplateData(HtmlOptions htmlOptions, Package package, this.library,
  +      this.clazz, this.property)
  +      : super(htmlOptions, package);
  +
  +  Field get self => property;
   
     String get title => '${property.name} $type - ${clazz.name} class - '
  -      '${_library.name} library - Dart API';
  +      '${library.name} library - Dart API';
     String get layoutTitle =>
         _layoutTitle(property.name, type, property.isDeprecated);
     String get metaDescription =>
  
positive.code: }
  
  abstract class TemplateData {
    Package _package;
    Function _markdown = renderMarkdown;
    final HtmlOptions htmlOptions;
  
    TemplateData(this.htmlOptions, this._package, {Renderer markdown})
        : _markdown = markdown;
  
    Package get package => _package;
    String get documentation => self.documentation;
    String get oneLineDoc => self.oneLineDoc;
    String get title;
  
negative.code: }
  
  class TopLevelPropertyTemplateData extends TemplateData {
    final Library library;
    final TopLevelVariable property;
  
    TopLevelPropertyTemplateData(
        HtmlOptions htmlOptions, Package package, this.library, this.property)
        : super(htmlOptions, package);
  
    TopLevelVariable get self => property;
  
    String get title =>
        '${property.name} $_type - ${library.name} library - Dart API';
  