diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
index f9ee455aea..6081f4d7b2 100644
--- a/lib/src/element_type.dart
+++ b/lib/src/element_type.dart
@@ -15,7 +15,9 @@ class ElementType {
   final ModelElement element;
   String _linkedName;
 
-  ElementType(this._type, this.element);
+  ElementType(this._type, this.element) {
+    assert(element != null);
+  }
 
   bool get isDynamic => _type.isDynamic;
 
@@ -82,7 +84,9 @@ class ElementType {
       } else {
         typeArguments = type.typeFormals.map((f) => f.type);
       }
-      return typeArguments.map(_getElementTypeFrom).toList();
+      return typeArguments
+          .map(_getElementTypeFrom)
+          .toList();
     } else {
       return (_type as ParameterizedType)
           .typeArguments
@@ -129,6 +133,11 @@ class ElementType {
     // can happen if element is dynamic
     if (f.element.library != null) {
       lib = new ModelElement.from(f.element.library, element.library);
+    } else {
+      // TODO(jcollins-g): Assigning libraries to dynamics doesn't make sense,
+      // really, but is needed for .package.
+      assert(f.element.kind == ElementKind.DYNAMIC);
+      lib = element.library;
     }
     return new ElementType(f, new ModelElement.from(f.element, lib));
   }
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index 61185acaa7..bfbb4344d8 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -53,6 +53,9 @@ class HtmlGeneratorInstance implements HtmlOptions {
     await _copyResources();
     if (faviconPath != null) {
       var bytes = new File(faviconPath).readAsBytesSync();
+      // Allow overwrite of favicon.
+      String filename = path.join(out.path, 'static-assets', 'favicon.png');
+      writtenFiles.remove(filename);
       _writeFile(path.join(out.path, 'static-assets', 'favicon.png'), bytes);
     }
   }
diff --git a/lib/src/model.dart b/lib/src/model.dart
index b0ae49b9eb..54fd815a45 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -206,6 +206,13 @@ class InheritableAccessor extends Accessor with Inheritable {
     }
     return _enclosingElement;
   }
+
+  @override
+  Set<String> get features {
+    Set<String> allFeatures = super.features;
+    if (isInherited) allFeatures.add('inherited');
+    return allFeatures;
+  }
 }
 
 /// Getters and setters.
@@ -217,18 +224,72 @@ class Accessor extends ModelElement
   Accessor(PropertyAccessorElement element, Library library)
       : super(element, library);
 
-  ModelElement get enclosingCombo => _enclosingCombo;
+  get linkedReturnType {
+    assert(isGetter);
+    return modelType.createLinkedReturnTypeName();
+  }
+
+  GetterSetterCombo get enclosingCombo {
+    if (_enclosingCombo == null) {
+      if (enclosingElement is Class) {
+        // TODO(jcollins-g): this side effect is rather hacky.  Make sure
+        // enclosingCombo always gets set at accessor creation time, somehow, to
+        // avoid this.
+        // TODO(jcollins-g): This also doesn't work for private accessors sometimes.
+        (enclosingElement as Class).allFields;
+      }
+      assert(_enclosingCombo != null);
+    }
+    return _enclosingCombo;
+  }
 
   /// Call exactly once to set the enclosing combo for this Accessor.
-  void set enclosingCombo(GetterSetterCombo combo) {
-    assert(_enclosingCombo == null || combo == _enclosingCombo);
-    _enclosingCombo = combo;
+  set enclosingCombo(GetterSetterCombo combo) {
+      assert(_enclosingCombo == null || combo == _enclosingCombo);
+        assert(combo != null);
+      _enclosingCombo = combo;
+  }
+
+  bool get isSynthetic => element.isSynthetic;
+
+  @override
+  String get sourceCode {
+    if (_sourceCodeCache == null) {
+      if (isSynthetic) {
+        _sourceCodeCache =
+            sourceCodeFor((element as PropertyAccessorElement).variable);
+      } else {
+        _sourceCodeCache = super.sourceCode;
+      }
+    }
+    return _sourceCodeCache;
+  }
+
+  @override
+  List<ModelElement> get computeDocumentationFrom {
+    if (isSynthetic) return [this];
+    return super.computeDocumentationFrom;
   }
 
   @override
   String get computeDocumentationComment {
-    if (element.isSynthetic) {
-      return (element as PropertyAccessorElement).variable.documentationComment;
+    if (isSynthetic) {
+      String docComment = (element as PropertyAccessorElement).variable.documentationComment;
+      // If we're a setter, only display something if we have something different than the getter.
+      // TODO(jcollins-g): modify analyzer to do this itself?
+      if (isGetter ||
+          // TODO(jcollins-g): @nodoc reading from comments is at the wrong abstraction level here.
+          (docComment != null &&
+              (docComment.contains('<nodoc>') ||
+                  docComment.contains('@nodoc'))) ||
+          (isSetter &&
+              enclosingCombo.hasGetter &&
+              enclosingCombo.getter.computeDocumentationComment !=
+                  docComment)) {
+        return stripComments(docComment);
+      } else {
+        return '';
+      }
     }
     return stripComments(super.computeDocumentationComment);
   }
@@ -272,6 +333,7 @@ class Accessor extends ModelElement
   }
 
   bool get isGetter => _accessor.isGetter;
+  bool get isSetter => _accessor.isSetter;
 
   bool _overriddenElementIsSet = false;
   ModelElement _overriddenElement;
@@ -422,6 +484,15 @@ class Class extends ModelElement implements EnclosedElement {
   bool get allInstancePropertiesInherited =>
       instanceProperties.every((f) => f.isInherited);
 
+  Iterable<Accessor> get allAccessors {
+    return allInstanceProperties.expand((f) {
+      List<Accessor> getterSetters = [];
+      if (f.hasGetter) getterSetters.add(f.getter);
+      if (f.hasSetter) getterSetters.add(f.setter);
+      return getterSetters;
+    });
+  }
+
   List<Operator> get allOperators {
     if (_allOperators != null) return _allOperators;
     _allOperators = []
@@ -438,7 +509,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   List<Field> get constants {
     if (_constants != null) return _constants;
-    _constants = _allFields.where((f) => f.isConst).toList(growable: false)
+    _constants = allFields.where((f) => f.isConst).toList(growable: false)
       ..sort(byName);
 
     return _constants;
@@ -466,6 +537,7 @@ class Class extends ModelElement implements EnclosedElement {
       _allModelElements
         ..addAll(allInstanceMethods)
         ..addAll(allInstanceProperties)
+        ..addAll(allAccessors)
         ..addAll(allOperators)
         ..addAll(constants)
         ..addAll(constructors)
@@ -684,7 +756,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   List<Field> get inheritedProperties {
     if (_inheritedProperties == null) {
-      _inheritedProperties = _allFields.where((f) => f.isInherited).toList()
+      _inheritedProperties = allFields.where((f) => f.isInherited).toList()
         ..sort(byName);
     }
     return _inheritedProperties;
@@ -704,7 +776,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   List<Field> get instanceProperties {
     if (_instanceFields != null) return _instanceFields;
-    _instanceFields = _allFields
+    _instanceFields = allFields
         .where((f) => !f.isStatic && !f.isInherited && !f.isConst)
         .toList(growable: false)
           ..sort(byName);
@@ -814,7 +886,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   List<Field> get staticProperties {
     if (_staticFields != null) return _staticFields;
-    _staticFields = _allFields
+    _staticFields = allFields
         .where((f) => f.isStatic)
         .where((f) => !f.isConst)
         .toList(growable: false)
@@ -857,7 +929,7 @@ class Class extends ModelElement implements EnclosedElement {
 
   ElementType get supertype => _supertype;
 
-  List<Field> get _allFields {
+  List<Field> get allFields {
     if (_fields != null) return _fields;
     _fields = [];
     Map<String, ExecutableElement> cmap =
@@ -1186,7 +1258,7 @@ class EnumField extends Field {
 }
 
 class Field extends ModelElement
-    with GetterSetterCombo, Inheritable
+    with GetterSetterCombo, Inheritable, SourceCodeMixin
     implements EnclosedElement {
   String _constantValue;
   bool _isInherited = false;
@@ -1231,7 +1303,7 @@ class Field extends ModelElement
     var v = _field.computeNode().toSource();
     if (v == null) return null;
     var string = v.substring(v.indexOf('=') + 1, v.length).trim();
-    _constantValue = string.replaceAll(modelType.name, modelType.linkedName);
+    _constantValue = string.replaceAll("${modelType.name}", "${modelType.linkedName}");
 
     return _constantValue;
   }
@@ -1297,24 +1369,18 @@ class Field extends ModelElement
 
   @override
   Set<String> get features {
-    Set<String> all_features = super.features;
-    all_features.addAll(annotations);
-
-    /// final/const implies read-only, so don't display both strings.
-    if (readOnly && !isFinal && !isConst) all_features.add('read-only');
-    if (writeOnly) all_features.add('write-only');
-    if (readWrite) all_features.add('read / write');
+    Set<String> allFeatures = super.features..addAll(comboFeatures);
     if (hasPublicGetter && hasPublicSetter) {
       if (getter.isInherited && setter.isInherited) {
-        all_features.add('inherited');
+        allFeatures.add('inherited');
       } else {
-        if (getter.isInherited) all_features.add('inherited-getter');
-        if (setter.isInherited) all_features.add('inherited-setter');
+        if (getter.isInherited) allFeatures.add('inherited-getter');
+        if (setter.isInherited) allFeatures.add('inherited-setter');
       }
     } else {
-      if (isInherited) all_features.add('inherited');
+      if (isInherited) allFeatures.add('inherited');
     }
-    return all_features;
+    return allFeatures;
   }
 
   @override
@@ -1328,13 +1394,35 @@ class Field extends ModelElement
 
   String get _fileName => isConst ? '$name-constant.html' : '$name.html';
 
+  @override
+  String get sourceCode {
+    if (_sourceCodeCache == null) {
+      // We could use a set to figure the dupes out, but that would lose ordering.
+      String fieldSourceCode = sourceCodeFor(element) ?? '';
+      String getterSourceCode = getter?.sourceCode ?? '';
+      String setterSourceCode = setter?.sourceCode ?? '';
+      StringBuffer buffer = new StringBuffer();
+      if (fieldSourceCode.isNotEmpty) {
+        buffer.write(fieldSourceCode);
+      }
+      if (buffer.isNotEmpty) buffer.write('\n\n');
+      if (fieldSourceCode != getterSourceCode) {
+        if (getterSourceCode != setterSourceCode) {
+          buffer.write(getterSourceCode);
+          if (buffer.isNotEmpty) buffer.write('\n\n');
+        }
+      }
+      if (fieldSourceCode != setterSourceCode) {
+        buffer.write(setterSourceCode);
+      }
+      _sourceCodeCache = buffer.toString();
+    }
+    return _sourceCodeCache;
+  }
+
   void _setModelType() {
     if (hasGetter) {
-      var t = (getter.element as PropertyAccessorElement).returnType;
-      _modelType = new ElementType(
-          t,
-          new ModelElement.from(
-              t.element, _findOrCreateEnclosingLibraryFor(t.element)));
+      _modelType = getter.modelType;
     }
   }
 }
@@ -1343,6 +1431,17 @@ class Field extends ModelElement
 abstract class GetterSetterCombo implements ModelElement {
   Accessor get getter;
 
+  Set<String> get comboFeatures {
+    Set<String> allFeatures = new Set();
+    if (hasExplicitGetter) allFeatures.addAll(getter.features);
+    if (hasExplicitSetter) allFeatures.addAll(setter.features);
+    if (readOnly && !isFinal && !isConst) allFeatures.add('read-only');
+    if (writeOnly) allFeatures.add('write-only');
+    if (readWrite) allFeatures.add('read / write');
+    return allFeatures;
+  }
+
+
   @override
   ModelElement enclosingElement;
   bool get isInherited;
@@ -1367,12 +1466,10 @@ abstract class GetterSetterCombo implements ModelElement {
     if (_documentationFrom == null) {
       _documentationFrom = [];
       if (hasPublicGetter) {
-        _documentationFrom.addAll(getter.documentationFrom.where((e) =>
-            e.computeDocumentationComment != computeDocumentationComment));
+        _documentationFrom.addAll(getter.documentationFrom);
+      } else if (hasPublicSetter) {
+        _documentationFrom.addAll(setter.documentationFrom);
       }
-      if (hasPublicSetter)
-        _documentationFrom.addAll(setter.documentationFrom.where((e) =>
-            e.computeDocumentationComment != computeDocumentationComment));
       if (_documentationFrom.length == 0 ||
           _documentationFrom.every((e) => e.documentation == ''))
         _documentationFrom = computeDocumentationFrom;
@@ -1380,24 +1477,22 @@ abstract class GetterSetterCombo implements ModelElement {
     return _documentationFrom;
   }
 
+  bool get hasAccessorsWithDocs =>
+      (hasPublicGetter && getter.documentation.isNotEmpty ||
+          hasPublicSetter && setter.documentation.isNotEmpty);
+  bool get getterSetterBothAvailable => (hasPublicGetter &&
+      getter.documentation.isNotEmpty &&
+      hasPublicSetter &&
+      setter.documentation.isNotEmpty);
+
   String _oneLineDoc;
   @override
   String get oneLineDoc {
     if (_oneLineDoc == null) {
-      bool hasAccessorsWithDocs =
-          (hasPublicGetter && getter.oneLineDoc.isNotEmpty ||
-              hasPublicSetter && setter.oneLineDoc.isNotEmpty);
       if (!hasAccessorsWithDocs) {
         _oneLineDoc = _documentation.asOneLiner;
       } else {
         StringBuffer buffer = new StringBuffer();
-        bool getterSetterBothAvailable = false;
-        if (hasPublicGetter &&
-            getter.oneLineDoc.isNotEmpty &&
-            hasPublicSetter &&
-            setter.oneLineDoc.isNotEmpty) {
-          getterSetterBothAvailable = true;
-        }
         if (hasPublicGetter && getter.oneLineDoc.isNotEmpty) {
           buffer.write('${getter.oneLineDoc}');
         }
@@ -1413,7 +1508,7 @@ abstract class GetterSetterCombo implements ModelElement {
   String get getterSetterDocumentationComment {
     var buffer = new StringBuffer();
 
-    if (hasPublicGetter && !getter.element.isSynthetic) {
+    if (hasPublicGetter && !getter.isSynthetic) {
       assert(getter.documentationFrom.length == 1);
       // We have to check against dropTextFrom here since documentationFrom
       // doesn't yield the real elements for GetterSetterCombos.
@@ -1425,7 +1520,7 @@ abstract class GetterSetterCombo implements ModelElement {
       }
     }
 
-    if (hasPublicSetter && !setter.element.isSynthetic) {
+    if (hasPublicSetter && !setter.isSynthetic) {
       assert(setter.documentationFrom.length == 1);
       if (!config.dropTextFrom
           .contains(setter.documentationFrom.first.element.library.name)) {
@@ -1441,8 +1536,11 @@ abstract class GetterSetterCombo implements ModelElement {
   }
 
   String get linkedReturnType {
-    if (hasGetter) return modelType.linkedName;
-    return null;
+    if (hasGetter) {
+      return getter.linkedReturnType;
+    } else {
+      return setter.linkedParamsNoMetadataOrNames;
+    }
   }
 
   @override
@@ -1463,14 +1561,16 @@ abstract class GetterSetterCombo implements ModelElement {
     return null;
   }
 
-  bool get hasExplicitGetter => hasPublicGetter && !getter.element.isSynthetic;
+  bool get hasExplicitGetter => hasPublicGetter && !getter.isSynthetic;
 
-  bool get hasExplicitSetter => hasPublicSetter && !setter.element.isSynthetic;
-  bool get hasImplicitSetter => hasPublicSetter && setter.element.isSynthetic;
+  bool get hasExplicitSetter => hasPublicSetter && !setter.isSynthetic;
+  bool get hasImplicitSetter => hasPublicSetter && setter.isSynthetic;
+  bool get hasImplicitGetter => hasPublicGetter && getter.isSynthetic;
 
   bool get hasGetter => getter != null;
 
-  bool get hasNoGetterSetter => !hasExplicitGetter && !hasExplicitSetter;
+  bool get hasNoGetterSetter => !hasGetterOrSetter;
+  bool get hasGetterOrSetter => hasExplicitGetter || hasExplicitSetter;
 
   bool get hasSetter => setter != null;
 
@@ -2022,9 +2122,9 @@ class Method extends ModelElement
 
   @override
   Set<String> get features {
-    Set<String> all_features = super.features;
-    if (isInherited) all_features.add('inherited');
-    return all_features;
+    Set<String> allFeatures = super.features;
+    if (isInherited) allFeatures.add('inherited');
+    return allFeatures;
   }
 
   @override
@@ -2426,25 +2526,25 @@ abstract class ModelElement extends Nameable
   }
 
   Set<String> get features {
-    Set<String> all_features = new Set<String>();
-    all_features.addAll(annotations);
+    Set<String> allFeatures = new Set<String>();
+    allFeatures.addAll(annotations);
 
     // override as an annotation should be replaced with direct information
     // from the analyzer if we decide to display it at this level.
-    all_features.remove('@override');
+    allFeatures.remove('@override');
 
     // Drop the plain "deprecated" annotation, that's indicated via
     // strikethroughs. Custom @Deprecated() will still appear.
-    all_features.remove('@deprecated');
+    allFeatures.remove('@deprecated');
     // const and static are not needed here because const/static elements get
     // their own sections in the doc.
-    if (isFinal) all_features.add('final');
-    return all_features;
+    if (isFinal) allFeatures.add('final');
+    return allFeatures;
   }
 
   String get featuresAsString {
-    List<String> all_features = features.toList()..sort(byFeatureOrdering);
-    return all_features.join(', ');
+    List<String> allFeatures = features.toList()..sort(byFeatureOrdering);
+    return allFeatures.join(', ');
   }
 
   bool get canHaveParameters =>
@@ -2758,7 +2858,25 @@ abstract class ModelElement extends Nameable
     return linkedParams(showMetadata: false, showNames: false);
   }
 
-  ElementType get modelType => _modelType;
+  ElementType get modelType {
+    if (_modelType == null) {
+      if (element is ExecutableElement ||
+          element is FunctionTypedElement ||
+          element is ParameterElement ||
+          element is TypeDefiningElement ||
+          element is PropertyInducingElement) {
+        Library lib;
+        // TODO(jcollins-g): get rid of dynamic special casing
+        if (element.kind != ElementKind.DYNAMIC) {
+          lib = _findOrCreateEnclosingLibraryFor((element as dynamic).type.element);
+        }
+        _modelType = new ElementType(
+            (element as dynamic).type, new ModelElement.from((element as dynamic).type.element, lib));
+      }
+    }
+    return _modelType;
+  }
+
 
   @override
   String get name => element.name;
@@ -3303,6 +3421,9 @@ class ModelFunctionTyped extends ModelElement
     return '&lt;${typeParameters.map((t) => t.name).join(', ')}&gt;';
   }
 
+  // Food for mustache. TODO(jcollins-g): what about enclosing elements?
+  bool get isInherited => false;
+
   FunctionTypedElement get _func => (element as FunctionTypedElement);
 }
 
@@ -3742,6 +3863,7 @@ class Package extends Nameable with Documentable, Warnable {
       // only here, but since the warnings that depend on this debug
       // canonicalization problems, don't limit ourselves in case an href is
       // generated for something non-canonical.
+      if (modelElement is Dynamic) continue;
       if (modelElement.href == null) continue;
       hrefMap.putIfAbsent(modelElement.href, () => new Set());
       hrefMap[modelElement.href].add(modelElement);
@@ -4162,37 +4284,41 @@ abstract class SourceCodeMixin {
 
   Library get library;
 
-  String get sourceCode {
-    if (_sourceCodeCache == null) {
-      String contents = getFileContentsFor(element);
-      var node = element.computeNode();
-      if (node != null) {
-        // Find the start of the line, so that we can line up all the indents.
-        int i = node.offset;
-        while (i > 0) {
-          i -= 1;
-          if (contents[i] == '\n' || contents[i] == '\r') {
-            i += 1;
-            break;
-          }
+  String sourceCodeFor(Element element) {
+    String contents = getFileContentsFor(element);
+    var node = element.computeNode();
+    if (node != null) {
+      // Find the start of the line, so that we can line up all the indents.
+      int i = node.offset;
+      while (i > 0) {
+        i -= 1;
+        if (contents[i] == '\n' || contents[i] == '\r') {
+          i += 1;
+          break;
         }
+      }
 
-        // Trim the common indent from the source snippet.
-        var start = node.offset - (node.offset - i);
-        String source = contents.substring(start, node.end);
-
-        if (config != null && config.addCrossdart) {
-          source = crossdartifySource(_crossdartJson, source, element, start);
-        } else {
-          source = const HtmlEscape().convert(source);
-        }
-        source = stripIndentFromSource(source);
-        source = stripDartdocCommentsFromSource(source);
+      // Trim the common indent from the source snippet.
+      var start = node.offset - (node.offset - i);
+      String source = contents.substring(start, node.end);
 
-        _sourceCodeCache = source.trim();
+      if (config != null && config.addCrossdart) {
+        source = crossdartifySource(_crossdartJson, source, element, start);
       } else {
-        _sourceCodeCache = '';
+        source = const HtmlEscape().convert(source);
       }
+      source = stripIndentFromSource(source);
+      source = stripDartdocCommentsFromSource(source);
+
+      return source.trim();
+    } else {
+      return '';
+    }
+  }
+
+  String get sourceCode {
+    if (_sourceCodeCache == null) {
+      _sourceCodeCache = sourceCodeFor(element);
     }
 
     return _sourceCodeCache;
@@ -4253,7 +4379,7 @@ abstract class SourceCodeMixin {
 
 /// Top-level variables. But also picks up getters and setters?
 class TopLevelVariable extends ModelElement
-    with GetterSetterCombo
+    with GetterSetterCombo, SourceCodeMixin
     implements EnclosedElement {
   @override
   final Accessor getter;
@@ -4263,22 +4389,14 @@ class TopLevelVariable extends ModelElement
   TopLevelVariable(TopLevelVariableElement element, Library library,
       this.getter, this.setter)
       : super(element, library) {
-    if (hasGetter) {
-      var t = _variable.getter.returnType;
-
-      _modelType = new ElementType(
-          t,
-          new ModelElement.from(
-              t.element, package.findOrCreateLibraryFor(t.element)));
-    } else {
-      var s = _variable.setter.parameters.first.type;
-      _modelType = new ElementType(
-          s,
-          new ModelElement.from(
-              s.element, package.findOrCreateLibraryFor(s.element)));
+    if (getter != null) {
+      getter.enclosingCombo = this;
+      assert(getter.enclosingCombo != null);
+    }
+    if (setter != null) {
+      setter.enclosingCombo = this;
+      assert(setter.enclosingCombo != null);
     }
-    if (getter != null) getter.enclosingCombo = this;
-    if (setter != null) setter.enclosingCombo = this;
   }
 
   @override
@@ -4328,15 +4446,7 @@ class TopLevelVariable extends ModelElement
   String get kind => 'top-level property';
 
   @override
-  Set<String> get features {
-    Set<String> all_features = super.features;
-
-    /// final/const implies read-only, so don't display both strings.
-    if (readOnly && !isFinal && !isConst) all_features.add('read-only');
-    if (writeOnly) all_features.add('write-only');
-    if (readWrite) all_features.add('read / write');
-    return all_features;
-  }
+  Set<String> get features => super.features..addAll(comboFeatures);
 
   @override
   String get computeDocumentationComment {
@@ -4383,6 +4493,9 @@ class Typedef extends ModelElement
     return '${canonicalLibrary.dirName}/$fileName';
   }
 
+  // Food for mustache.
+  bool get isInherited => false;
+
   @override
   String get kind => 'typedef';
 
diff --git a/lib/templates/_accessor_getter.html b/lib/templates/_accessor_getter.html
index 123bc635b4..4bc9e08e2d 100644
--- a/lib/templates/_accessor_getter.html
+++ b/lib/templates/_accessor_getter.html
@@ -1,9 +1,13 @@
+{{#getter}}
 <section id="getter">
 
 <section class="multi-line-signature">
   <span class="returntype">{{{ linkedReturnType }}}</span>
   {{>name_summary}}
+  {{>features}}
 </section>
 
 {{>documentation}}
+{{>source_code}}
 </section>
+{{/getter}}
diff --git a/lib/templates/_accessor_setter.html b/lib/templates/_accessor_setter.html
index 7eca23fccd..7e0bd49bb5 100644
--- a/lib/templates/_accessor_setter.html
+++ b/lib/templates/_accessor_setter.html
@@ -1,9 +1,13 @@
+{{#setter}}
 <section id="setter">
 
 <section class="multi-line-signature">
   <span class="returntype">void</span>
   {{>name_summary}}<span class="signature">(<wbr>{{{ linkedParamsNoMetadata }}})</span>
+  {{>features}}
 </section>
 
 {{>documentation}}
+{{>source_code}}
 </section>
+{{/setter}}
diff --git a/lib/templates/_property.html b/lib/templates/_property.html
index 4d88ba4bbc..184be87084 100644
--- a/lib/templates/_property.html
+++ b/lib/templates/_property.html
@@ -1,16 +1,7 @@
-{{ #hasPublicSetter }}
-<dt id="{{htmlId}}" class="property{{ #isInherited }} inherited{{ /isInherited}}">
-  <span class="name{{#isDeprecated}} deprecated{{/isDeprecated}}">{{{linkedName}}}</span><span class="signature">{{{genericParameters}}}
-    <span class="returntype parameter">{{{ arrow }}} {{ #hasExplicitSetter }} {{{ linkedParamsNoMetadata }}} {{/hasExplicitSetter}} {{#hasImplicitSetter}} {{{linkedParamsNoMetadataOrNames}}} {{/hasImplicitSetter}}</span>
-  </span>
-</dt>
-{{ /hasPublicSetter }}
-{{ #hasPublicGetterNoSetter }}
 <dt id="{{htmlId}}" class="property{{ #isInherited }} inherited{{ /isInherited}}">
   <span class="name">{{{linkedName}}}</span>
   <span class="signature">{{{ arrow }}} {{{ linkedReturnType }}}</span>
 </dt>
-{{ /hasPublicGetterNoSetter }}
 <dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
   {{{ oneLineDoc }}}
   {{>features}}
diff --git a/lib/templates/_source_code.html b/lib/templates/_source_code.html
index 831540f9af..007041c47c 100644
--- a/lib/templates/_source_code.html
+++ b/lib/templates/_source_code.html
@@ -1,5 +1,5 @@
 {{#hasSourceCode}}
 <section class="summary source-code" id="source">
   <h2><span>Source</span> {{{crossdartHtmlTag}}}</h2>
-  <pre class="prettyprint language-dart">{{{ sourceCode }}}</pre>
+  <pre class="language-dart"><code class="language-dart">{{{ sourceCode }}}</code></pre>
 </section>{{/hasSourceCode}}
diff --git a/lib/templates/property.html b/lib/templates/property.html
index cbae158a64..0bcf2448ab 100644
--- a/lib/templates/property.html
+++ b/lib/templates/property.html
@@ -6,31 +6,27 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    {{#property.hasNoGetterSetter}}
-    <section class="multi-line-signature">
-      <span class="returntype">{{{ linkedReturnType }}}</span>
-        {{>name_summary}}
-        {{>features}}
-    </section>
-
-    {{>documentation}}
-    {{/property.hasNoGetterSetter}}
-
-    {{#property.hasExplicitGetter}}
-    {{#property.getter}}
-      {{>accessor_getter}}
-      {{>source_code}}
-    {{/property.getter}}
-    {{/property.hasExplicitGetter}}
-
-    {{#property.hasExplicitSetter}}
-    {{#property.setter}}
-      {{>accessor_setter}}
-      {{>source_code}}
-    {{/property.setter}}
-    {{/property.hasExplicitSetter}}
-
+    {{#self}}
+      {{#hasNoGetterSetter}}
+        <section class="multi-line-signature">
+          <span class="returntype">{{{ linkedReturnType }}}</span>
+          {{>name_summary}}
+          {{>features}}
+        </section>
+        {{>documentation}}
+        {{>source_code}}
+      {{/hasNoGetterSetter}}
+
+      {{#hasGetterOrSetter}}
+        {{#hasGetter}}
+        {{>accessor_getter}}
+        {{/hasGetter}}
+
+        {{#hasSetter}}
+        {{>accessor_setter}}
+        {{/hasSetter}}
+      {{/hasGetterOrSetter}}
+    {{/self}}
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/lib/templates/top_level_constant.html b/lib/templates/top_level_constant.html
index 6a5abfb018..4a3b581ede 100644
--- a/lib/templates/top_level_constant.html
+++ b/lib/templates/top_level_constant.html
@@ -7,19 +7,17 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
+    {{#self}}
     <section class="multi-line-signature">
-      {{#property}}
-        {{>name_summary}}
-        =
-        <span class="constant-value">{{{ constantValue }}}</span>
-        {{>features}}
-      {{/property}}
+      {{>name_summary}}
+      =
+      <span class="constant-value">{{{ constantValue }}}</span>
+      {{>features}}
     </section>
 
-    {{#property}}
-      {{>documentation}}
-      {{>source_code}}
-    {{/property}}
+    {{>documentation}}
+    {{>source_code}}
+    {{/self}}
 
   </div> <!-- /.main-content -->
 
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index fb79c2d426..55a8b70fe2 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -6,35 +6,29 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    {{#property.hasNoGetterSetter}}
-      <section class="multi-line-signature">
-        <span class="returntype">{{{ linkedReturnType }}}</span>
-        {{>name_summary}}
-        {{>features}}
-      </section>
-
-      {{>documentation}}
-    {{/property.hasNoGetterSetter}}
-
-    {{#property.hasExplicitGetter}}
-    {{#property.getter}}
-      {{>accessor_getter}}
-      {{>source_code}}
-    {{/property.getter}}
-    {{/property.hasExplicitGetter}}
-
-    {{#property.hasExplicitSetter}}
-    {{#property.setter}}
-      {{>accessor_setter}}
-      {{>source_code}}
-    {{/property.setter}}
-    {{/property.hasExplicitSetter}}
-
+    {{#self}}
+    {{#hasNoGetterSetter}}
+    <section class="multi-line-signature">
+      <span class="returntype">{{{ linkedReturnType }}}</span>
+      {{>name_summary}}
+      {{>features}}
+    </section>
+    {{>documentation}}
+    {{>source_code}}
+    {{/hasNoGetterSetter}}
+
+    {{#hasExplicitGetter}}
+    {{>accessor_getter}}
+    {{/hasExplicitGetter}}
+
+    {{#hasExplicitSetter}}
+    {{>accessor_setter}}
+    {{/hasExplicitSetter}}
+    {{/self}}
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>{{self.kind}} {{self.name}}</h5>
   </div><!--/.sidebar-offcanvas-->
 
-{{>footer}}
+{{>footer}}
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index e0e550ebfa..46a165396d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -174,7 +174,7 @@ packages:
       name: mustache4dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "2.1.0"
   node_preamble:
     description:
       name: node_preamble
diff --git a/pubspec.yaml b/pubspec.yaml
index 0d522590ce..a4b6f94cfb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   http_parser: '>=3.0.3 <4.0.0'
   logging: ^0.11.3+1
   markdown: ^0.11.2
-  mustache4dart: ^1.1.0
+  mustache4dart: ^2.1.0
   package_config: '>=0.1.5 <2.0.0'
   path: ^1.3.0
   resource: ^1.1.0
diff --git a/test/model_test.dart b/test/model_test.dart
index 2ef588ad96..d39a34a2b2 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1297,6 +1297,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     Field sFromApple, mFromApple, mInB, autoCompress;
     Field isEmpty;
     Field implicitGetterExplicitSetter, explicitGetterImplicitSetter;
+    Field explicitGetterSetter;
     Field explicitNonDocumentedInBaseClassGetter;
     Field documentedPartialFieldInSubclassOnly;
     Field ExtraSpecialListLength;
@@ -1316,6 +1317,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((e) => e.name == 'implicitGetterExplicitSetter');
       explicitGetterImplicitSetter = UnusualProperties.allModelElements
           .firstWhere((e) => e.name == 'explicitGetterImplicitSetter');
+      explicitGetterSetter = UnusualProperties.allModelElements
+          .firstWhere((e) => e.name == 'explicitGetterSetter');
       explicitNonDocumentedInBaseClassGetter =
           UnusualProperties.allModelElements.firstWhere(
               (e) => e.name == 'explicitNonDocumentedInBaseClassGetter');
@@ -1356,6 +1359,20 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((f) => f.name == 'length');
     });
 
+    test('annotations from getters and setters are accumulated in Fields', () {
+      expect(
+          explicitGetterSetter.featuresAsString.contains('a Getter Annotation'),
+          isTrue);
+      expect(
+          explicitGetterSetter.featuresAsString.contains('a Setter Annotation'),
+          isTrue);
+    });
+
+    test('Docs from inherited implicit accessors are preserved', () {
+      expect(explicitGetterImplicitSetter.setter.computeDocumentationComment,
+          isNot(''));
+    });
+
     test('@nodoc on simple property works', () {
       Field simpleHidden = UnusualProperties.allModelElements
           .firstWhere((e) => e.name == 'simpleHidden', orElse: () => null);
@@ -1428,10 +1445,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(explicitGetterImplicitSetter.oneLineDoc,
           equals('Getter doc for explicitGetterImplicitSetter'));
       // Even though we have some new setter docs, getter still takes priority.
-      expect(
-          explicitGetterImplicitSetter.documentation,
-          equals(
-              'Docs for explicitGetterImplicitSetter from ImplicitProperties.'));
+      expect(explicitGetterImplicitSetter.documentation,
+          equals('Getter doc for explicitGetterImplicitSetter'));
     });
 
     test('has a fully qualified name', () {
@@ -1502,11 +1517,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           equals('Only a setter, with a single param, of type double.'));
     });
 
-    test('explicit getter and setter docs are unified', () {
-      expect(lengthX.documentation, contains('Sets the length.'));
-      expect(lengthX.documentation, contains('Returns a length.'));
-    });
-
     test('Field with no explicit getter/setter has documentation', () {
       expect(autoCompress.documentation,
           contains('To enable, set `autoCompress` to `true`'));
@@ -1683,11 +1693,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           equals('Just a setter. No partner getter.'));
     });
 
-    test('a distinct getter and setters docs appear in the propertys docs', () {
-      expect(setAndGet.documentation, contains('The getter for setAndGet.'));
-      expect(setAndGet.documentation, contains('The setter for setAndGet.'));
-    });
-
     test('has a getter accessor', () {
       expect(setAndGet.getter, isNotNull);
       expect(setAndGet.getter.name, equals('setAndGet'));
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 7b07e5259c..04b77690a2 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -255,6 +255,7 @@ class ClassWithUnusualProperties extends ImplicitProperties {
   String get explicitNonDocumentedInBaseClassGetter => "something else";
 
   /// Getter doc for explicitGetterSetter.
+  @Annotation('a Getter Annotation')
   myCoolTypedef get explicitGetterSetter {
     return _aFunction;
   }
@@ -269,6 +270,7 @@ class ClassWithUnusualProperties extends ImplicitProperties {
   String get explicitNodocGetterSetter => "something";
 
   /// This property is not synthetic, so it might reference [f] -- display it.
+  @Annotation('a Setter Annotation')
   set explicitGetterSetter(myCoolTypedef f) => _aFunction = f;
 
   /// This property only has a getter and no setter; no parameters to print.
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index d5761a2cb3..715a19926c 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -67,9 +67,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="theOnlyThingInTheLibrary" class="property">
-          <span class="name"><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="theOnlyThingInTheLibrary=-param-_theOnlyThingInTheLibrary"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
index 27b2bac8c9..b1cf684cf6 100644
--- a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
@@ -50,13 +50,11 @@ <h5>library css</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">theOnlyThingInTheLibrary</span>        <div class="features">read / write</div>
-      </section>
-
-      
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">theOnlyThingInTheLibrary</span>      <div class="features">read / write</div>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/ex/Animal/hashCode.html b/testing/test_package_docs/ex/Animal/hashCode.html
index 6bdd6504ea..192bc2ff53 100644
--- a/testing/test_package_docs/ex/Animal/hashCode.html
+++ b/testing/test_package_docs/ex/Animal/hashCode.html
@@ -66,17 +66,16 @@ <h5>enum Animal</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Animal/runtimeType.html b/testing/test_package_docs/ex/Animal/runtimeType.html
index f3b388300c..866fa30adf 100644
--- a/testing/test_package_docs/ex/Animal/runtimeType.html
+++ b/testing/test_package_docs/ex/Animal/runtimeType.html
@@ -66,17 +66,16 @@ <h5>enum Animal</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html
index 8115cebf7e..71d02f2089 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -154,18 +154,16 @@ <h2>Properties</h2>
           <div class="features">final</div>
 </dd>
         <dt id="m" class="property">
-          <span class="name"><a href="ex/Apple/m.html">m</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="m=-param-_m"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/Apple/m.html">m</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           The read-write field <code>m</code>.
           <div class="features">read / write</div>
 </dd>
         <dt id="s" class="property">
-          <span class="name"><a href="ex/Apple/s.html">s</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>  </span>
-          </span>
+          <span class="name"><a href="ex/Apple/s.html">s</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           The getter for <code>s</code>
@@ -297,9 +295,8 @@ <h2>Static Properties</h2>
 
       <dl class="properties">
         <dt id="string" class="property">
-          <span class="name"><a href="ex/Apple/string.html">string</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="string=-param-_string"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/Apple/string.html">string</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
index 54a5f27c91..a91d0df1a9 100644
--- a/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
+++ b/testing/test_package_docs/ex/Apple/fieldWithTypedef.html
@@ -76,17 +76,14 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;bool&gt;</span>
-        <span class="name ">fieldWithTypedef</span>        <div class="features">final</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>fieldWithTypedef docs here</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;bool&gt;</span>
+          <span class="name ">fieldWithTypedef</span>          <div class="features">final</div>
+        </section>
+        <section class="desc markdown">
+          <p>fieldWithTypedef docs here</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Apple/hashCode.html b/testing/test_package_docs/ex/Apple/hashCode.html
index aaaa1158f4..253dc5e949 100644
--- a/testing/test_package_docs/ex/Apple/hashCode.html
+++ b/testing/test_package_docs/ex/Apple/hashCode.html
@@ -77,17 +77,16 @@ <h5>class Apple</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Apple/m.html b/testing/test_package_docs/ex/Apple/m.html
index 63482b829a..047642490c 100644
--- a/testing/test_package_docs/ex/Apple/m.html
+++ b/testing/test_package_docs/ex/Apple/m.html
@@ -76,17 +76,14 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">m</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>The read-write field <code>m</code>.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">m</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>The read-write field <code>m</code>.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Apple/runtimeType.html b/testing/test_package_docs/ex/Apple/runtimeType.html
index 290638dfcc..5b7b603680 100644
--- a/testing/test_package_docs/ex/Apple/runtimeType.html
+++ b/testing/test_package_docs/ex/Apple/runtimeType.html
@@ -77,17 +77,16 @@ <h5>class Apple</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Apple/s.html b/testing/test_package_docs/ex/Apple/s.html
index ab396e5a31..8335240ecf 100644
--- a/testing/test_package_docs/ex/Apple/s.html
+++ b/testing/test_package_docs/ex/Apple/s.html
@@ -77,33 +77,33 @@ <h5>class Apple</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">s</span></section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">s</span>  
+</section>
+        
+        <section class="desc markdown">
   <p>The getter for <code>s</code></p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">s=</span><span class="signature">(<wbr><span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>)</span>
+          
 </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">s=</span><span class="signature">(<wbr><span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        
+        <section class="desc markdown">
   <p>The setter for <code>s</code></p>
 </section>
-</section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property s</h5>
diff --git a/testing/test_package_docs/ex/Apple/string.html b/testing/test_package_docs/ex/Apple/string.html
index 951d3d87a7..2c3f092d3f 100644
--- a/testing/test_package_docs/ex/Apple/string.html
+++ b/testing/test_package_docs/ex/Apple/string.html
@@ -76,14 +76,11 @@ <h5>class Apple</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">string</span>        <div class="features">read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">string</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html
index eb0e71ceeb..6b8494ad57 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -145,9 +145,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="autoCompress" class="property">
-          <span class="name"><a href="ex/B/autoCompress.html">autoCompress</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="autoCompress=-param-_autoCompress"><span class="type-annotation">bool</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/B/autoCompress.html">autoCompress</a></span>
+          <span class="signature">&#8596; bool</span>
         </dt>
         <dd>
           The default value is <code>false</code> (compression disabled).
@@ -160,25 +159,23 @@ <h2>Properties</h2>
         </dt>
         <dd>
           
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="list" class="property">
-          <span class="name"><a href="ex/B/list.html">list</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="list=-param-_list"><span class="type-annotation">List&lt;String&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/B/list.html">list</a></span>
+          <span class="signature">&#8596; List&lt;String&gt;</span>
         </dt>
         <dd>
           A list of Strings
           <div class="features">read / write</div>
 </dd>
         <dt id="s" class="property">
-          <span class="name"><a href="ex/B/s.html">s</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>  </span>
-          </span>
+          <span class="name"><a href="ex/B/s.html">s</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           The getter for <code>s</code>
-          <div class="features">@override, inherited-setter, read / write</div>
+          <div class="features">inherited-setter, read / write, inherited</div>
 </dd>
         <dt id="fieldWithTypedef" class="property inherited">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
@@ -197,9 +194,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="m" class="property inherited">
-          <span class="name"><a href="ex/Apple/m.html">m</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="m=-param-_m"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/Apple/m.html">m</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           The read-write field <code>m</code>.
diff --git a/testing/test_package_docs/ex/B/autoCompress.html b/testing/test_package_docs/ex/B/autoCompress.html
index a0b7f44d17..9633956601 100644
--- a/testing/test_package_docs/ex/B/autoCompress.html
+++ b/testing/test_package_docs/ex/B/autoCompress.html
@@ -77,18 +77,15 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">bool</span>
-        <span class="name ">autoCompress</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>The default value is <code>false</code> (compression disabled).
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">autoCompress</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>The default value is <code>false</code> (compression disabled).
 To enable, set <code>autoCompress</code> to <code>true</code>.</p>
-    </section>
-    
-
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/B/isImplemented.html b/testing/test_package_docs/ex/B/isImplemented.html
index 69d20ce2d2..3a61c752f1 100644
--- a/testing/test_package_docs/ex/B/isImplemented.html
+++ b/testing/test_package_docs/ex/B/isImplemented.html
@@ -78,17 +78,16 @@ <h5>class B</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isImplemented</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isImplemented</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/B/list.html b/testing/test_package_docs/ex/B/list.html
index e1dfca56e4..f7b6c6b637 100644
--- a/testing/test_package_docs/ex/B/list.html
+++ b/testing/test_package_docs/ex/B/list.html
@@ -77,17 +77,14 @@ <h5>class B</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">List&lt;String&gt;</span>
-        <span class="name ">list</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>A list of Strings</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">List&lt;String&gt;</span>
+          <span class="name ">list</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>A list of Strings</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/B/s.html b/testing/test_package_docs/ex/B/s.html
index 5380f58afc..5ec4a3563c 100644
--- a/testing/test_package_docs/ex/B/s.html
+++ b/testing/test_package_docs/ex/B/s.html
@@ -78,33 +78,33 @@ <h5>class B</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">s</span></section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">s</span>  
+</section>
+        
+        <section class="desc markdown">
   <p>The getter for <code>s</code></p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">s=</span><span class="signature">(<wbr><span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>)</span>
+          <div class="features">inherited</div>
 </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">s=</span><span class="signature">(<wbr><span class="parameter" id="s=-param-something"><span class="type-annotation">String</span> <span class="parameter-name">something</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        
+        <section class="desc markdown">
   <p>The setter for <code>s</code></p>
 </section>
-</section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property s</h5>
diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html
index 1e84fec5b2..9afb328a39 100644
--- a/testing/test_package_docs/ex/COLOR-constant.html
+++ b/testing/test_package_docs/ex/COLOR-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">COLOR</span>        =
-        <span class="constant-value">&#39;red&#39;</span>
-        
+      <span class="name ">COLOR</span>      =
+      <span class="constant-value">&#39;red&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
index 2ba22a1dfe..3df672a5aa 100644
--- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">COLOR_GREEN</span>        =
-        <span class="constant-value">&#39;green&#39;</span>
-        
+      <span class="name ">COLOR_GREEN</span>      =
+      <span class="constant-value">&#39;green&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
index 5e683d3ddf..ad14a92c16 100644
--- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">COLOR_ORANGE</span>        =
-        <span class="constant-value">&#39;orange&#39;</span>
-        
+      <span class="name ">COLOR_ORANGE</span>      =
+      <span class="constant-value">&#39;orange&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
index 73ac941d1a..bef1d7e7dc 100644
--- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">COMPLEX_COLOR</span>        =
-        <span class="constant-value">&#39;red&#39; + &#39;-&#39; + &#39;green&#39; + &#39;-&#39; + &#39;blue&#39;</span>
-        
+      <span class="name ">COMPLEX_COLOR</span>      =
+      <span class="constant-value">&#39;red&#39; + &#39;-&#39; + &#39;green&#39; + &#39;-&#39; + &#39;blue&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Cat/hashCode.html b/testing/test_package_docs/ex/Cat/hashCode.html
index 5b456e5531..ccd0fc86d2 100644
--- a/testing/test_package_docs/ex/Cat/hashCode.html
+++ b/testing/test_package_docs/ex/Cat/hashCode.html
@@ -64,17 +64,16 @@ <h5>class Cat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Cat/isImplemented.html b/testing/test_package_docs/ex/Cat/isImplemented.html
index 0a71897057..9fb706d810 100644
--- a/testing/test_package_docs/ex/Cat/isImplemented.html
+++ b/testing/test_package_docs/ex/Cat/isImplemented.html
@@ -64,17 +64,16 @@ <h5>class Cat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isImplemented</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isImplemented</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Cat/runtimeType.html b/testing/test_package_docs/ex/Cat/runtimeType.html
index 302a4ad411..50731e2589 100644
--- a/testing/test_package_docs/ex/Cat/runtimeType.html
+++ b/testing/test_package_docs/ex/Cat/runtimeType.html
@@ -64,17 +64,16 @@ <h5>class Cat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/CatString/hashCode.html b/testing/test_package_docs/ex/CatString/hashCode.html
index 9ec5198e33..0ae215829f 100644
--- a/testing/test_package_docs/ex/CatString/hashCode.html
+++ b/testing/test_package_docs/ex/CatString/hashCode.html
@@ -70,17 +70,16 @@ <h5>class CatString</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/CatString/isEmpty.html b/testing/test_package_docs/ex/CatString/isEmpty.html
index fd0b2f7ae2..1e38759386 100644
--- a/testing/test_package_docs/ex/CatString/isEmpty.html
+++ b/testing/test_package_docs/ex/CatString/isEmpty.html
@@ -70,17 +70,16 @@ <h5>class CatString</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isEmpty</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isEmpty</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/CatString/isNotEmpty.html b/testing/test_package_docs/ex/CatString/isNotEmpty.html
index 7c2b902b2f..a0fd01d316 100644
--- a/testing/test_package_docs/ex/CatString/isNotEmpty.html
+++ b/testing/test_package_docs/ex/CatString/isNotEmpty.html
@@ -70,17 +70,16 @@ <h5>class CatString</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isNotEmpty</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isNotEmpty</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/CatString/length.html b/testing/test_package_docs/ex/CatString/length.html
index 4ec39d1613..9f3c4f0492 100644
--- a/testing/test_package_docs/ex/CatString/length.html
+++ b/testing/test_package_docs/ex/CatString/length.html
@@ -70,17 +70,16 @@ <h5>class CatString</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">length</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">length</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/CatString/runtimeType.html b/testing/test_package_docs/ex/CatString/runtimeType.html
index 94489a5e3d..c72949712e 100644
--- a/testing/test_package_docs/ex/CatString/runtimeType.html
+++ b/testing/test_package_docs/ex/CatString/runtimeType.html
@@ -70,17 +70,16 @@ <h5>class CatString</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html
index 55399e1aa9..8f58de8a8c 100644
--- a/testing/test_package_docs/ex/ConstantCat-class.html
+++ b/testing/test_package_docs/ex/ConstantCat-class.html
@@ -142,7 +142,7 @@ <h2>Properties</h2>
         </dt>
         <dd>
           
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="name" class="property">
           <span class="name"><a href="ex/ConstantCat/name.html">name</a></span>
diff --git a/testing/test_package_docs/ex/ConstantCat/hashCode.html b/testing/test_package_docs/ex/ConstantCat/hashCode.html
index c8012d1a1e..4f2a31a685 100644
--- a/testing/test_package_docs/ex/ConstantCat/hashCode.html
+++ b/testing/test_package_docs/ex/ConstantCat/hashCode.html
@@ -65,17 +65,16 @@ <h5>class ConstantCat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ConstantCat/isImplemented.html b/testing/test_package_docs/ex/ConstantCat/isImplemented.html
index 38e55fb2e6..cf45297ad3 100644
--- a/testing/test_package_docs/ex/ConstantCat/isImplemented.html
+++ b/testing/test_package_docs/ex/ConstantCat/isImplemented.html
@@ -65,17 +65,16 @@ <h5>class ConstantCat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isImplemented</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isImplemented</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ConstantCat/name.html b/testing/test_package_docs/ex/ConstantCat/name.html
index c73963357f..77890c3ad3 100644
--- a/testing/test_package_docs/ex/ConstantCat/name.html
+++ b/testing/test_package_docs/ex/ConstantCat/name.html
@@ -64,14 +64,11 @@ <h5>class ConstantCat</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">name</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">name</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/ConstantCat/runtimeType.html b/testing/test_package_docs/ex/ConstantCat/runtimeType.html
index ebd03f9333..3675082281 100644
--- a/testing/test_package_docs/ex/ConstantCat/runtimeType.html
+++ b/testing/test_package_docs/ex/ConstantCat/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class ConstantCat</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Deprecated/expires.html b/testing/test_package_docs/ex/Deprecated/expires.html
index af4805ccb8..e00d8206e9 100644
--- a/testing/test_package_docs/ex/Deprecated/expires.html
+++ b/testing/test_package_docs/ex/Deprecated/expires.html
@@ -62,14 +62,11 @@ <h5>class Deprecated</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">expires</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">expires</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Deprecated/hashCode.html b/testing/test_package_docs/ex/Deprecated/hashCode.html
index 5db949cbbc..9a48e8174b 100644
--- a/testing/test_package_docs/ex/Deprecated/hashCode.html
+++ b/testing/test_package_docs/ex/Deprecated/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Deprecated</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Deprecated/runtimeType.html b/testing/test_package_docs/ex/Deprecated/runtimeType.html
index 399a5f8b6c..9cb7062b1a 100644
--- a/testing/test_package_docs/ex/Deprecated/runtimeType.html
+++ b/testing/test_package_docs/ex/Deprecated/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Deprecated</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index 06991b933f..f8eaede6f1 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -182,13 +182,12 @@ <h2>Properties</h2>
           <div class="features">@protected, final</div>
 </dd>
         <dt id="deprecatedField" class="property">
-          <span class="name deprecated"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="deprecatedField=-param-_deprecatedField"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           
-          <div class="features">@deprecated, read / write</div>
+          <div class="features">read / write</div>
 </dd>
         <dt id="deprecatedGetter" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
@@ -196,16 +195,15 @@ <h2>Properties</h2>
         </dt>
         <dd>
           
-          <div class="features">@deprecated, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="deprecatedSetter" class="property">
-          <span class="name deprecated"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>  </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
         </dt>
         <dd>
           
-          <div class="features">@deprecated, write-only</div>
+          <div class="features">write-only</div>
 </dd>
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/Dog/isImplemented.html">isImplemented</a></span>
@@ -213,12 +211,11 @@ <h2>Properties</h2>
         </dt>
         <dd>
           
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="name" class="property">
-          <span class="name"><a href="ex/Dog/name.html">name</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="name=-param-_name"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/Dog/name.html">name</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           
@@ -376,9 +373,8 @@ <h2>Static Properties</h2>
           <div class="features">final</div>
 </dd>
         <dt id="staticGetterSetter" class="property">
-          <span class="name"><a href="ex/Dog/staticGetterSetter.html">staticGetterSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="staticGetterSetter=-param-x"><span class="parameter-name">x</span></span>  </span>
-          </span>
+          <span class="name"><a href="ex/Dog/staticGetterSetter.html">staticGetterSetter</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/ex/Dog/aFinalField.html b/testing/test_package_docs/ex/Dog/aFinalField.html
index 7b621f2a76..3eb6fe637a 100644
--- a/testing/test_package_docs/ex/Dog/aFinalField.html
+++ b/testing/test_package_docs/ex/Dog/aFinalField.html
@@ -86,14 +86,11 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">aFinalField</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">aFinalField</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html b/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
index 1c6fc38d73..b6829d3afd 100644
--- a/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
+++ b/testing/test_package_docs/ex/Dog/aGetterReturningRandomThings.html
@@ -87,17 +87,16 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">aGetterReturningRandomThings</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">aGetterReturningRandomThings</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog/aProtectedFinalField.html b/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
index 66c4a7b840..3a4dd10e7a 100644
--- a/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
+++ b/testing/test_package_docs/ex/Dog/aProtectedFinalField.html
@@ -86,14 +86,11 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">aProtectedFinalField</span>        <div class="features">@protected, final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">aProtectedFinalField</span>          <div class="features">@protected, final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Dog/deprecatedField.html b/testing/test_package_docs/ex/Dog/deprecatedField.html
index 26175ee1d2..4d4fd698df 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedField.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedField.html
@@ -86,14 +86,11 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name deprecated">deprecatedField</span>        <div class="features">@deprecated, read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name deprecated">deprecatedField</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Dog/deprecatedGetter.html b/testing/test_package_docs/ex/Dog/deprecatedGetter.html
index 37d38023bf..ee27beb87e 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedGetter.html
@@ -87,17 +87,16 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name deprecated">deprecatedGetter</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name deprecated">deprecatedGetter</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog/deprecatedSetter.html b/testing/test_package_docs/ex/Dog/deprecatedSetter.html
index a6396a93a6..30508d1bc4 100644
--- a/testing/test_package_docs/ex/Dog/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/Dog/deprecatedSetter.html
@@ -88,18 +88,17 @@ <h5>class Dog</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name deprecated">deprecatedSetter=</span><span class="signature">(<wbr><span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
-      </section>
-      
-      </section>
-      
-
-  </div> <!-- /.main-content -->
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name deprecated">deprecatedSetter=</span><span class="signature">(<wbr><span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
+          
+</section>
+        
+        
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property deprecatedSetter</h5>
diff --git a/testing/test_package_docs/ex/Dog/hashCode.html b/testing/test_package_docs/ex/Dog/hashCode.html
index b5fe2967eb..5582be020d 100644
--- a/testing/test_package_docs/ex/Dog/hashCode.html
+++ b/testing/test_package_docs/ex/Dog/hashCode.html
@@ -87,17 +87,16 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog/isImplemented.html b/testing/test_package_docs/ex/Dog/isImplemented.html
index 5962fa034f..408f996a51 100644
--- a/testing/test_package_docs/ex/Dog/isImplemented.html
+++ b/testing/test_package_docs/ex/Dog/isImplemented.html
@@ -87,17 +87,16 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isImplemented</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isImplemented</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog/name.html b/testing/test_package_docs/ex/Dog/name.html
index 500a817af5..b3a9665cf8 100644
--- a/testing/test_package_docs/ex/Dog/name.html
+++ b/testing/test_package_docs/ex/Dog/name.html
@@ -86,14 +86,11 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">name</span>        <div class="features">read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">name</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Dog/runtimeType.html b/testing/test_package_docs/ex/Dog/runtimeType.html
index ebb47a30e7..529d65f4ca 100644
--- a/testing/test_package_docs/ex/Dog/runtimeType.html
+++ b/testing/test_package_docs/ex/Dog/runtimeType.html
@@ -87,17 +87,16 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Dog/somethingTasty.html b/testing/test_package_docs/ex/Dog/somethingTasty.html
index 3fc762e3a1..f8a3df9722 100644
--- a/testing/test_package_docs/ex/Dog/somethingTasty.html
+++ b/testing/test_package_docs/ex/Dog/somethingTasty.html
@@ -86,17 +86,14 @@ <h5>class Dog</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">somethingTasty</span>        <div class="features">final</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>A tasty static + final property.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">somethingTasty</span>          <div class="features">final</div>
+        </section>
+        <section class="desc markdown">
+          <p>A tasty static + final property.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/Dog/staticGetterSetter.html b/testing/test_package_docs/ex/Dog/staticGetterSetter.html
index 0b0a4d3523..f2c5898ffc 100644
--- a/testing/test_package_docs/ex/Dog/staticGetterSetter.html
+++ b/testing/test_package_docs/ex/Dog/staticGetterSetter.html
@@ -87,27 +87,27 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">staticGetterSetter</span></section>
-      
-      </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">staticGetterSetter=</span><span class="signature">(<wbr><span class="parameter" id="staticGetterSetter=-param-x"><span class="parameter-name">x</span></span>)</span>
-      </section>
-      
-      </section>
-      
-
-  </div> <!-- /.main-content -->
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">staticGetterSetter</span>  
+</section>
+        
+        
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">staticGetterSetter=</span><span class="signature">(<wbr><span class="parameter" id="staticGetterSetter=-param-x"><span class="parameter-name">x</span></span>)</span>
+          
+</section>
+        
+        
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property staticGetterSetter</h5>
diff --git a/testing/test_package_docs/ex/E/hashCode.html b/testing/test_package_docs/ex/E/hashCode.html
index 9bc6c3962e..b835a09e99 100644
--- a/testing/test_package_docs/ex/E/hashCode.html
+++ b/testing/test_package_docs/ex/E/hashCode.html
@@ -62,17 +62,16 @@ <h5>class E</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/E/runtimeType.html b/testing/test_package_docs/ex/E/runtimeType.html
index 4d93e63b3a..b4149f87dc 100644
--- a/testing/test_package_docs/ex/E/runtimeType.html
+++ b/testing/test_package_docs/ex/E/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class E</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index 20f88f28e0..0d4828e636 100644
--- a/testing/test_package_docs/ex/F-class.html
+++ b/testing/test_package_docs/ex/F-class.html
@@ -160,13 +160,12 @@ <h2>Properties</h2>
           <div class="features">@protected, final, inherited</div>
 </dd>
         <dt id="deprecatedField" class="property inherited">
-          <span class="name deprecated"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="deprecatedField=-param-_deprecatedField"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           
-          <div class="features">@deprecated, read / write, inherited</div>
+          <div class="features">read / write, inherited</div>
 </dd>
         <dt id="deprecatedGetter" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
@@ -174,16 +173,15 @@ <h2>Properties</h2>
         </dt>
         <dd class="inherited">
           
-          <div class="features">@deprecated, read-only, inherited</div>
+          <div class="features">read-only, inherited</div>
 </dd>
         <dt id="deprecatedSetter" class="property inherited">
-          <span class="name deprecated"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>  </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
         </dt>
         <dd class="inherited">
           
-          <div class="features">@deprecated, write-only, inherited</div>
+          <div class="features">write-only, inherited</div>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Dog/hashCode.html">hashCode</a></span>
@@ -199,12 +197,11 @@ <h2>Properties</h2>
         </dt>
         <dd class="inherited">
           
-          <div class="features">@override, read-only, inherited</div>
+          <div class="features">read-only, inherited</div>
 </dd>
         <dt id="name" class="property inherited">
-          <span class="name"><a href="ex/Dog/name.html">name</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="name=-param-_name"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/Dog/name.html">name</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/ex/ForAnnotation/hashCode.html b/testing/test_package_docs/ex/ForAnnotation/hashCode.html
index 579372a26d..9f96790248 100644
--- a/testing/test_package_docs/ex/ForAnnotation/hashCode.html
+++ b/testing/test_package_docs/ex/ForAnnotation/hashCode.html
@@ -63,17 +63,16 @@ <h5>class ForAnnotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ForAnnotation/runtimeType.html b/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
index a273b92e08..e558bd39d3 100644
--- a/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
+++ b/testing/test_package_docs/ex/ForAnnotation/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class ForAnnotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ForAnnotation/value.html b/testing/test_package_docs/ex/ForAnnotation/value.html
index e911014da9..52ce265d69 100644
--- a/testing/test_package_docs/ex/ForAnnotation/value.html
+++ b/testing/test_package_docs/ex/ForAnnotation/value.html
@@ -62,14 +62,11 @@ <h5>class ForAnnotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">value</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">value</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/HasAnnotation/hashCode.html b/testing/test_package_docs/ex/HasAnnotation/hashCode.html
index 0d7ac64f38..d3d817a7a0 100644
--- a/testing/test_package_docs/ex/HasAnnotation/hashCode.html
+++ b/testing/test_package_docs/ex/HasAnnotation/hashCode.html
@@ -62,17 +62,16 @@ <h5>class HasAnnotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/HasAnnotation/runtimeType.html b/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
index 3a8af48595..5c014fb563 100644
--- a/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
+++ b/testing/test_package_docs/ex/HasAnnotation/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class HasAnnotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Helper/hashCode.html b/testing/test_package_docs/ex/Helper/hashCode.html
index 81131b13fc..8ecb61734e 100644
--- a/testing/test_package_docs/ex/Helper/hashCode.html
+++ b/testing/test_package_docs/ex/Helper/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Helper</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Helper/runtimeType.html b/testing/test_package_docs/ex/Helper/runtimeType.html
index 40dfbea96e..2695d02a58 100644
--- a/testing/test_package_docs/ex/Helper/runtimeType.html
+++ b/testing/test_package_docs/ex/Helper/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Helper</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Klass/hashCode.html b/testing/test_package_docs/ex/Klass/hashCode.html
index 41983a4dbd..d74d577a02 100644
--- a/testing/test_package_docs/ex/Klass/hashCode.html
+++ b/testing/test_package_docs/ex/Klass/hashCode.html
@@ -67,17 +67,16 @@ <h5>class Klass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/Klass/runtimeType.html b/testing/test_package_docs/ex/Klass/runtimeType.html
index 2aeaa61f69..1c41cafa50 100644
--- a/testing/test_package_docs/ex/Klass/runtimeType.html
+++ b/testing/test_package_docs/ex/Klass/runtimeType.html
@@ -67,17 +67,16 @@ <h5>class Klass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html
index 85ed83a31e..80b2db7e9e 100644
--- a/testing/test_package_docs/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs/ex/MY_CAT-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">MY_CAT</span>        =
-        <span class="constant-value">const <a href="ex/ConstantCat-class.html">ConstantCat</a>(&#39;tabby&#39;)</span>
-        
+      <span class="name ">MY_CAT</span>      =
+      <span class="constant-value">const <a href="ex/ConstantCat-class.html">ConstantCat</a>(&#39;tabby&#39;)</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/MyError/hashCode.html b/testing/test_package_docs/ex/MyError/hashCode.html
index e6c1d6cebb..f876cd84bb 100644
--- a/testing/test_package_docs/ex/MyError/hashCode.html
+++ b/testing/test_package_docs/ex/MyError/hashCode.html
@@ -63,17 +63,16 @@ <h5>class MyError</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyError/runtimeType.html b/testing/test_package_docs/ex/MyError/runtimeType.html
index 6a9e5de3a3..53665fa2aa 100644
--- a/testing/test_package_docs/ex/MyError/runtimeType.html
+++ b/testing/test_package_docs/ex/MyError/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class MyError</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyError/stackTrace.html b/testing/test_package_docs/ex/MyError/stackTrace.html
index 16b2c7645a..9bb3b0ad92 100644
--- a/testing/test_package_docs/ex/MyError/stackTrace.html
+++ b/testing/test_package_docs/ex/MyError/stackTrace.html
@@ -63,17 +63,16 @@ <h5>class MyError</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">StackTrace</span>
-        <span class="name ">stackTrace</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">StackTrace</span>
+          <span class="name ">stackTrace</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html
index 840e87bafa..0ccaacecb5 100644
--- a/testing/test_package_docs/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs/ex/MyErrorImplements-class.html
@@ -141,7 +141,7 @@ <h2>Properties</h2>
         </dt>
         <dd>
           
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyErrorImplements/hashCode.html">hashCode</a></span>
diff --git a/testing/test_package_docs/ex/MyErrorImplements/hashCode.html b/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
index 4eae2ac83d..92656e83c7 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/hashCode.html
@@ -63,17 +63,16 @@ <h5>class MyErrorImplements</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html b/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
index 118ce19da4..e9a8a5e6f5 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class MyErrorImplements</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html b/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
index ae147ab0cb..dfe0247063 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/stackTrace.html
@@ -63,17 +63,16 @@ <h5>class MyErrorImplements</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">StackTrace</span>
-        <span class="name ">stackTrace</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">StackTrace</span>
+          <span class="name ">stackTrace</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyException/hashCode.html b/testing/test_package_docs/ex/MyException/hashCode.html
index 14ffd00058..c23a0d85eb 100644
--- a/testing/test_package_docs/ex/MyException/hashCode.html
+++ b/testing/test_package_docs/ex/MyException/hashCode.html
@@ -62,17 +62,16 @@ <h5>class MyException</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyException/runtimeType.html b/testing/test_package_docs/ex/MyException/runtimeType.html
index 00bfdab302..3d02a3bc36 100644
--- a/testing/test_package_docs/ex/MyException/runtimeType.html
+++ b/testing/test_package_docs/ex/MyException/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class MyException</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html b/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
index b56431d41d..036c7ff6c8 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/hashCode.html
@@ -62,17 +62,16 @@ <h5>class MyExceptionImplements</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html b/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
index 36ef81c421..cb142e8854 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class MyExceptionImplements</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
index 52f3bf5a59..d2f7e4a87b 100644
--- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">PRETTY_COLORS</span>        =
-        <span class="constant-value">const &lt;String&gt; [COLOR_GREEN, COLOR_ORANGE, &#39;blue&#39;]</span>
-        
+      <span class="name ">PRETTY_COLORS</span>      =
+      <span class="constant-value">const &lt;String&gt; [COLOR_GREEN, COLOR_ORANGE, &#39;blue&#39;]</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
index 6421541c50..80f7718299 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/hashCode.html
@@ -63,17 +63,16 @@ <h5>class PublicClassExtendsPrivateClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
index 9da999f76c..40885593ea 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class PublicClassExtendsPrivateClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
index 7c1ef0e57a..20cdffb489 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/hashCode.html
@@ -63,17 +63,16 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
index 6bb0485f92..d19215938c 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html
index a2e3b4f601..a42cf5d02c 100644
--- a/testing/test_package_docs/ex/ShapeType-class.html
+++ b/testing/test_package_docs/ex/ShapeType-class.html
@@ -208,7 +208,7 @@ <h2>Constants</h2>
           
           
   <div>
-            <span class="signature"><code>const <a href="ex/ShapeType-class.html">ShapeType</a>._internal("Ellipse")</code></span>
+            <span class="signature"><code>const ShapeType._internal("Ellipse")</code></span>
           </div>
         </dd>
         <dt id="rect" class="constant">
@@ -219,7 +219,7 @@ <h2>Constants</h2>
           
           
   <div>
-            <span class="signature"><code>const <a href="ex/ShapeType-class.html">ShapeType</a>._internal("Rect")</code></span>
+            <span class="signature"><code>const ShapeType._internal("Rect")</code></span>
           </div>
         </dd>
       </dl>
diff --git a/testing/test_package_docs/ex/ShapeType/ellipse-constant.html b/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
index 4f95d74482..6016e80d91 100644
--- a/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
+++ b/testing/test_package_docs/ex/ShapeType/ellipse-constant.html
@@ -67,7 +67,7 @@ <h5>class ShapeType</h5>
     <section class="multi-line-signature">
         <span class="returntype"><a href="ex/ShapeType-class.html">ShapeType</a></span>
         <span class="name ">ellipse</span>        =
-        <span class="constant-value">const <a href="ex/ShapeType-class.html">ShapeType</a>._internal("Ellipse")</span>
+        <span class="constant-value">const ShapeType._internal("Ellipse")</span>
     </section>
 
         
diff --git a/testing/test_package_docs/ex/ShapeType/hashCode.html b/testing/test_package_docs/ex/ShapeType/hashCode.html
index 1c558c4efc..e67c12e6a1 100644
--- a/testing/test_package_docs/ex/ShapeType/hashCode.html
+++ b/testing/test_package_docs/ex/ShapeType/hashCode.html
@@ -64,17 +64,16 @@ <h5>class ShapeType</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/ShapeType/name.html b/testing/test_package_docs/ex/ShapeType/name.html
index a699312fb7..fa3294ff16 100644
--- a/testing/test_package_docs/ex/ShapeType/name.html
+++ b/testing/test_package_docs/ex/ShapeType/name.html
@@ -63,14 +63,11 @@ <h5>class ShapeType</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">name</span>        <div class="features">final, inherited</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">name</span>          <div class="features">final, inherited</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/ShapeType/rect-constant.html b/testing/test_package_docs/ex/ShapeType/rect-constant.html
index ac05543084..d3ec27916a 100644
--- a/testing/test_package_docs/ex/ShapeType/rect-constant.html
+++ b/testing/test_package_docs/ex/ShapeType/rect-constant.html
@@ -67,7 +67,7 @@ <h5>class ShapeType</h5>
     <section class="multi-line-signature">
         <span class="returntype"><a href="ex/ShapeType-class.html">ShapeType</a></span>
         <span class="name ">rect</span>        =
-        <span class="constant-value">const <a href="ex/ShapeType-class.html">ShapeType</a>._internal("Rect")</span>
+        <span class="constant-value">const ShapeType._internal("Rect")</span>
     </section>
 
         
diff --git a/testing/test_package_docs/ex/ShapeType/runtimeType.html b/testing/test_package_docs/ex/ShapeType/runtimeType.html
index 8dfe476eaa..a36f06eaf5 100644
--- a/testing/test_package_docs/ex/ShapeType/runtimeType.html
+++ b/testing/test_package_docs/ex/ShapeType/runtimeType.html
@@ -64,17 +64,16 @@ <h5>class ShapeType</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/hashCode.html b/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
index dff1b85e8c..fd09eb2f83 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/hashCode.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inDays.html b/testing/test_package_docs/ex/SpecializedDuration/inDays.html
index 9d62236a98..8f7fbbdd93 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inDays.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inDays.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inDays</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inDays</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inHours.html b/testing/test_package_docs/ex/SpecializedDuration/inHours.html
index 7f9994188a..ba1ec5e9ec 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inHours.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inHours.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inHours</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inHours</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html b/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
index 629cd9e1b9..2e0678eebb 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMicroseconds.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inMicroseconds</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inMicroseconds</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html b/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
index d0ba7d0843..f1081f04f6 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMilliseconds.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inMilliseconds</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inMilliseconds</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html b/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
index 70e971aa50..e7bf981bb5 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inMinutes.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inMinutes</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inMinutes</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html b/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
index d267ec6b8a..b3493f7233 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/inSeconds.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">inSeconds</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">inSeconds</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/isNegative.html b/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
index 3a0546ffe1..91a15bc669 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/isNegative.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isNegative</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isNegative</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html b/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
index 0bd43dfda0..9cf045ef9f 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/runtimeType.html
@@ -80,17 +80,16 @@ <h5>class SpecializedDuration</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
index 009e7fe24d..0c35ef08f7 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/hashCode.html
@@ -65,17 +65,16 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
index ee697dbaf3..e873b51f3b 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index 471c98ccca..4b4ca9a701 100644
--- a/testing/test_package_docs/ex/WithGeneric-class.html
+++ b/testing/test_package_docs/ex/WithGeneric-class.html
@@ -134,9 +134,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="prop" class="property">
-          <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="prop=-param-_prop"><span class="type-annotation">T</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
+          <span class="signature">&#8596; T</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/ex/WithGeneric/hashCode.html b/testing/test_package_docs/ex/WithGeneric/hashCode.html
index 2a2c34734b..806ec3cf22 100644
--- a/testing/test_package_docs/ex/WithGeneric/hashCode.html
+++ b/testing/test_package_docs/ex/WithGeneric/hashCode.html
@@ -63,17 +63,16 @@ <h5>class WithGeneric</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/WithGeneric/prop.html b/testing/test_package_docs/ex/WithGeneric/prop.html
index bd86450bea..0f9926d320 100644
--- a/testing/test_package_docs/ex/WithGeneric/prop.html
+++ b/testing/test_package_docs/ex/WithGeneric/prop.html
@@ -62,14 +62,11 @@ <h5>class WithGeneric</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">T</span>
-        <span class="name ">prop</span>        <div class="features">read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">prop</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/WithGeneric/runtimeType.html b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
index fb5ddabc21..b4420e2e97 100644
--- a/testing/test_package_docs/ex/WithGeneric/runtimeType.html
+++ b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class WithGeneric</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html
index 9f1f85f4a5..5040b44f07 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -144,9 +144,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="prop" class="property inherited">
-          <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="prop=-param-_prop"><span class="type-annotation">T</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
+          <span class="signature">&#8596; T</span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/ex/aThingToDo/hashCode.html b/testing/test_package_docs/ex/aThingToDo/hashCode.html
index 83db6b68e1..21dc2f8caf 100644
--- a/testing/test_package_docs/ex/aThingToDo/hashCode.html
+++ b/testing/test_package_docs/ex/aThingToDo/hashCode.html
@@ -64,17 +64,16 @@ <h5>class aThingToDo</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/aThingToDo/runtimeType.html b/testing/test_package_docs/ex/aThingToDo/runtimeType.html
index cbc9511a9e..c7e5f58239 100644
--- a/testing/test_package_docs/ex/aThingToDo/runtimeType.html
+++ b/testing/test_package_docs/ex/aThingToDo/runtimeType.html
@@ -64,17 +64,16 @@ <h5>class aThingToDo</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/aThingToDo/what.html b/testing/test_package_docs/ex/aThingToDo/what.html
index 209fc460cf..9fa7b4684e 100644
--- a/testing/test_package_docs/ex/aThingToDo/what.html
+++ b/testing/test_package_docs/ex/aThingToDo/what.html
@@ -63,14 +63,11 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">what</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">what</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/aThingToDo/who.html b/testing/test_package_docs/ex/aThingToDo/who.html
index 140b6bf870..bbeff4cafa 100644
--- a/testing/test_package_docs/ex/aThingToDo/who.html
+++ b/testing/test_package_docs/ex/aThingToDo/who.html
@@ -63,14 +63,11 @@ <h5>class aThingToDo</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">who</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">who</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html
index af699e4653..90ffe974c7 100644
--- a/testing/test_package_docs/ex/deprecated-constant.html
+++ b/testing/test_package_docs/ex/deprecated-constant.html
@@ -103,12 +103,12 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">deprecated</span>        =
-        <span class="constant-value">const <a href="ex/Deprecated-class.html">Deprecated</a>(&quot;next release&quot;)</span>
-        
+      <span class="name ">deprecated</span>      =
+      <span class="constant-value">const <a href="ex/Deprecated-class.html">Deprecated</a>(&quot;next release&quot;)</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html
index 33605ce7ac..a852eb356a 100644
--- a/testing/test_package_docs/ex/deprecatedField.html
+++ b/testing/test_package_docs/ex/deprecatedField.html
@@ -101,13 +101,11 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name deprecated">deprecatedField</span>        <div class="features">read / write</div>
-      </section>
-
-      
+    <section class="multi-line-signature">
+      <span class="returntype">int</span>
+      <span class="name deprecated">deprecatedField</span>      <div class="features">read / write</div>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html
index c2d89ef8ae..1dccc7d4bb 100644
--- a/testing/test_package_docs/ex/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/deprecatedGetter.html
@@ -102,17 +102,16 @@ <h5>library ex</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name deprecated">deprecatedGetter</span></section>
-      
-      </section>
-      
-
-
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">int</span>
+      <span class="name deprecated">deprecatedGetter</span>  
+</section>
+    
+    
+</section>
+    
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html
index b5c50b87d7..0249a20670 100644
--- a/testing/test_package_docs/ex/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/deprecatedSetter.html
@@ -103,18 +103,17 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name deprecated">deprecatedSetter=</span><span class="signature">(<wbr><span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
-      </section>
-      
-      </section>
+    <section id="setter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">void</span>
+        <span class="name deprecated">deprecatedSetter=</span><span class="signature">(<wbr><span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
       
-
-  </div> <!-- /.main-content -->
+</section>
+    
+    
+</section>
+      </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>top-level property deprecatedSetter</h5>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index 98c9dd7118..54712b3767 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -312,9 +312,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="deprecatedField" class="property">
-          <span class="name deprecated"><a class="deprecated" href="ex/deprecatedField.html">deprecatedField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="deprecatedField=-param-_deprecatedField"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/deprecatedField.html">deprecatedField</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           
@@ -329,18 +328,16 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="deprecatedSetter" class="property">
-          <span class="name deprecated"><a class="deprecated" href="ex/deprecatedSetter.html">deprecatedSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>  </span>
-          </span>
+          <span class="name"><a class="deprecated" href="ex/deprecatedSetter.html">deprecatedSetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
         </dt>
         <dd>
           
           <div class="features">write-only</div>
 </dd>
         <dt id="number" class="property">
-          <span class="name"><a href="ex/number.html">number</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="number=-param-_number"><span class="type-annotation">double</span></span> </span>
-          </span>
+          <span class="name"><a href="ex/number.html">number</a></span>
+          <span class="signature">&#8596; double</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html
index 859242e4d4..b0ceda6572 100644
--- a/testing/test_package_docs/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html
@@ -103,15 +103,15 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">incorrectDocReference</span>        =
-        <span class="constant-value">&#39;same name as const from fake&#39;</span>
-        
+      <span class="name ">incorrectDocReference</span>      =
+      <span class="constant-value">&#39;same name as const from fake&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>This is the same name as a top-level const from the fake lib.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>This is the same name as a top-level const from the fake lib.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
index 55ea247966..920436deec 100644
--- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
@@ -103,15 +103,15 @@ <h5>library ex</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">incorrectDocReferenceFromEx</span>        =
-        <span class="constant-value">&#39;doh&#39;</span>
-        
+      <span class="name ">incorrectDocReferenceFromEx</span>      =
+      <span class="constant-value">&#39;doh&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>This should <code>not work</code>.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>This should <code>not work</code>.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html
index 7207925de4..c95af63112 100644
--- a/testing/test_package_docs/ex/number.html
+++ b/testing/test_package_docs/ex/number.html
@@ -101,13 +101,11 @@ <h5>library ex</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">double</span>
-        <span class="name ">number</span>        <div class="features">read / write</div>
-      </section>
-
-      
+    <section class="multi-line-signature">
+      <span class="returntype">double</span>
+      <span class="name ">number</span>      <div class="features">read / write</div>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html
index 0f014e893e..3f394be507 100644
--- a/testing/test_package_docs/ex/y.html
+++ b/testing/test_package_docs/ex/y.html
@@ -102,17 +102,16 @@ <h5>library ex</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">dynamic</span>
-        <span class="name ">y</span></section>
-      
-      </section>
-      
-
-
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">y</span>  
+</section>
+    
+    
+</section>
+    
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Annotation/hashCode.html b/testing/test_package_docs/fake/Annotation/hashCode.html
index 34edde85d7..3dd26966cc 100644
--- a/testing/test_package_docs/fake/Annotation/hashCode.html
+++ b/testing/test_package_docs/fake/Annotation/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Annotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Annotation/runtimeType.html b/testing/test_package_docs/fake/Annotation/runtimeType.html
index 0c3f57ae4d..e540e110a2 100644
--- a/testing/test_package_docs/fake/Annotation/runtimeType.html
+++ b/testing/test_package_docs/fake/Annotation/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Annotation</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Annotation/value.html b/testing/test_package_docs/fake/Annotation/value.html
index c4151415be..e294a07924 100644
--- a/testing/test_package_docs/fake/Annotation/value.html
+++ b/testing/test_package_docs/fake/Annotation/value.html
@@ -62,14 +62,11 @@ <h5>class Annotation</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">value</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">value</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/AnotherInterface/hashCode.html b/testing/test_package_docs/fake/AnotherInterface/hashCode.html
index 8e50a9bce2..1748378028 100644
--- a/testing/test_package_docs/fake/AnotherInterface/hashCode.html
+++ b/testing/test_package_docs/fake/AnotherInterface/hashCode.html
@@ -62,17 +62,16 @@ <h5>class AnotherInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/AnotherInterface/runtimeType.html b/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
index 496ea7aa20..128de8a2ff 100644
--- a/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
+++ b/testing/test_package_docs/fake/AnotherInterface/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class AnotherInterface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseForDocComments/hashCode.html b/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
index 43d3684605..1fd4b7dad3 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/hashCode.html
@@ -64,17 +64,16 @@ <h5>class BaseForDocComments</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html b/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
index b46905e7bb..679014f0ae 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/runtimeType.html
@@ -64,17 +64,16 @@ <h5>class BaseForDocComments</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 43ddb99cce..f78f7a263f 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -165,9 +165,8 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="aImplementingThingyField" class="property">
-          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="aImplementingThingyField=-param-_aImplementingThingyField"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span></span> </span>
-          </span>
+          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html b/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
index 3fd0379c7a..a273bd6df4 100644
--- a/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy/aImplementingThingy.html
@@ -65,17 +65,16 @@ <h5>class BaseThingy</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
-        <span class="name ">aImplementingThingy</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="name ">aImplementingThingy</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
index 2a3afc4a10..dbb5e825d3 100644
--- a/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
+++ b/testing/test_package_docs/fake/BaseThingy/aImplementingThingyField.html
@@ -64,14 +64,11 @@ <h5>class BaseThingy</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
-        <span class="name ">aImplementingThingyField</span>        <div class="features">read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="name ">aImplementingThingyField</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/BaseThingy/hashCode.html b/testing/test_package_docs/fake/BaseThingy/hashCode.html
index f64ff1449a..bbd0b6e7b7 100644
--- a/testing/test_package_docs/fake/BaseThingy/hashCode.html
+++ b/testing/test_package_docs/fake/BaseThingy/hashCode.html
@@ -65,17 +65,16 @@ <h5>class BaseThingy</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy/runtimeType.html b/testing/test_package_docs/fake/BaseThingy/runtimeType.html
index 4a17d71170..47b8473beb 100644
--- a/testing/test_package_docs/fake/BaseThingy/runtimeType.html
+++ b/testing/test_package_docs/fake/BaseThingy/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class BaseThingy</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index da2f817b31..d76e25cc06 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -170,12 +170,11 @@ <h2>Properties</h2>
         </dt>
         <dd>
           BaseThingy2's doc for aImplementingThingy.
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
-          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="aImplementingThingyField=-param-_aImplementingThingyField"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span></span> </span>
-          </span>
+          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html b/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
index 7862a177ae..91693c8a8f 100644
--- a/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy2/aImplementingThingy.html
@@ -65,20 +65,19 @@ <h5>class BaseThingy2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype"><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
-        <span class="name ">aImplementingThingy</span></section>
-      
-      <section class="desc markdown">
-  <p>BaseThingy2's doc for aImplementingThingy.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="name ">aImplementingThingy</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>BaseThingy2's doc for aImplementingThingy.</p>
 </section>
-      
-
 
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy2/hashCode.html b/testing/test_package_docs/fake/BaseThingy2/hashCode.html
index 4c08afeedb..5a611bcb76 100644
--- a/testing/test_package_docs/fake/BaseThingy2/hashCode.html
+++ b/testing/test_package_docs/fake/BaseThingy2/hashCode.html
@@ -65,17 +65,16 @@ <h5>class BaseThingy2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/BaseThingy2/runtimeType.html b/testing/test_package_docs/fake/BaseThingy2/runtimeType.html
index 0390332ce7..c612080b86 100644
--- a/testing/test_package_docs/fake/BaseThingy2/runtimeType.html
+++ b/testing/test_package_docs/fake/BaseThingy2/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class BaseThingy2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index fbd9d80fce..e2353a4de2 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -125,12 +125,12 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">CUSTOM_CLASS</span>        =
-        <span class="constant-value">const <a href="fake/ConstantClass-class.html">ConstantClass</a>(&#39;custom&#39;)</span>
-        
+      <span class="name ">CUSTOM_CLASS</span>      =
+      <span class="constant-value">const <a href="fake/ConstantClass-class.html">ConstantClass</a>(&#39;custom&#39;)</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index 26da383b17..99897fcb20 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -168,7 +168,7 @@ <h2>Properties</h2>
         </dt>
         <dd>
           This getter is documented, so we should see a read-only property here.
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="explicitGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetter.html">explicitGetter</a></span>
@@ -179,22 +179,20 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="explicitGetterImplicitSetter" class="property">
-          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="explicitGetterImplicitSetter=-param-_explicitGetterImplicitSetter"><span class="type-annotation">List&lt;int&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
+          <span class="signature">&#8596; List&lt;int&gt;</span>
         </dt>
         <dd>
           Getter doc for explicitGetterImplicitSetter
-          <div class="features">@override, inherited-setter, read / write</div>
+          <div class="features">inherited-setter, read / write</div>
 </dd>
         <dt id="explicitGetterSetter" class="property">
-          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterSetter.html">explicitGetterSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="explicitGetterSetter=-param-f"><span class="type-annotation"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> <span class="parameter-name">f</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterSetter.html">explicitGetterSetter</a></span>
+          <span class="signature">&#8596; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
         </dt>
         <dd>
           Getter doc for explicitGetterSetter.
-          <div class="features">read / write</div>
+          <div class="features">@<a href="fake/Annotation-class.html">Annotation</a>(&#39;a Getter Annotation&#39;), @<a href="fake/Annotation-class.html">Annotation</a>(&#39;a Setter Annotation&#39;), read / write</div>
 </dd>
         <dt id="explicitNonDocumentedInBaseClassGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html">explicitNonDocumentedInBaseClassGetter</a></span>
@@ -202,12 +200,11 @@ <h2>Properties</h2>
         </dt>
         <dd>
           Since I have a different doc, I should be documented.
-          <div class="features">@override, read-only</div>
+          <div class="features">read-only</div>
 </dd>
         <dt id="explicitSetter" class="property">
-          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitSetter.html">explicitSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span> <span class="parameter-name">bar</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">baz</span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List&lt;int&gt;</span> <span class="parameter-name">macTruck</span></span>)</span>  </span>
-          </span>
+          <span class="name"><a href="fake/ClassWithUnusualProperties/explicitSetter.html">explicitSetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List&lt;int&gt;</span></span>)</span></span>
         </dt>
         <dd>
           Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.
@@ -222,27 +219,24 @@ <h2>Properties</h2>
           <div class="features">final</div>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
-          <span class="name"><a href="fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="implicitGetterExplicitSetter=-param-x"><span class="type-annotation">String</span> <span class="parameter-name">x</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
-          <div class="features">@override, inherited-getter, read / write</div>
+          <div class="features">inherited-getter, read / write</div>
 </dd>
         <dt id="implicitReadWrite" class="property">
-          <span class="name"><a href="fake/ClassWithUnusualProperties/implicitReadWrite.html">implicitReadWrite</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="implicitReadWrite=-param-_implicitReadWrite"><span class="type-annotation">Map</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ClassWithUnusualProperties/implicitReadWrite.html">implicitReadWrite</a></span>
+          <span class="signature">&#8596; Map</span>
         </dt>
         <dd>
           
           <div class="features">read / write</div>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property inherited">
-          <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="explicitGetterSetterForInheriting=-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           Explicit getter for inheriting.
@@ -257,9 +251,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="forInheriting" class="property inherited">
-          <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="forInheriting=-param-_forInheriting"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           A simple property to inherit.
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
index dd11bae93f..d740ebe8b3 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html
@@ -75,21 +75,33 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">documentedPartialFieldInSubclassOnly</span></section>
-      
-      <section class="desc markdown">
-  <p>This getter is documented, so we should see a read-only property here.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">documentedPartialFieldInSubclassOnly</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>This getter is documented, so we should see a read-only property here.</p>
 </section>
-      
 
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">documentedPartialFieldInSubclassOnly=</span><span class="signature">(<wbr><span class="parameter" id="documentedPartialFieldInSubclassOnly=-param-_documentedPartialFieldInSubclassOnly"><span class="type-annotation">String</span> <span class="parameter-name">_documentedPartialFieldInSubclassOnly</span></span>)</span>
+          <div class="features">inherited</div>
+</section>
+        
+        <section class="desc markdown">
+  <p>@nodoc here, you should never see this</p>
+</section>
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property documentedPartialFieldInSubclassOnly</h5>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
index 86df2fbe08..5baa6abeac 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetter.html
@@ -75,20 +75,19 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
-        <span class="name ">explicitGetter</span></section>
-      
-      <section class="desc markdown">
-  <p>This property only has a getter and no setter; no parameters to print.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="name ">explicitGetter</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>This property only has a getter and no setter; no parameters to print.</p>
 </section>
-      
-
 
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
index b526f8009c..523123238f 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html
@@ -75,21 +75,33 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">List&lt;int&gt;</span>
-        <span class="name ">explicitGetterImplicitSetter</span></section>
-      
-      <section class="desc markdown">
-  <p>Getter doc for explicitGetterImplicitSetter</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">List&lt;int&gt;</span>
+          <span class="name ">explicitGetterImplicitSetter</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>Getter doc for explicitGetterImplicitSetter</p>
 </section>
-      
 
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">explicitGetterImplicitSetter=</span><span class="signature">(<wbr><span class="parameter" id="explicitGetterImplicitSetter=-param-_explicitGetterImplicitSetter"><span class="type-annotation">List&lt;int&gt;</span> <span class="parameter-name">_explicitGetterImplicitSetter</span></span>)</span>
+          <div class="features">inherited</div>
+</section>
+        
+        <section class="desc markdown">
+  <p>Docs for explicitGetterImplicitSetter from ImplicitProperties.</p>
+</section>
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property explicitGetterImplicitSetter</h5>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
index 28f653217d..a7a06dafeb 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitGetterSetter.html
@@ -75,33 +75,33 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
-        <span class="name ">explicitGetterSetter</span></section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="name ">explicitGetterSetter</span>  <div class="features">@<a href="fake/Annotation-class.html">Annotation</a>(&#39;a Getter Annotation&#39;)</div>
+</section>
+        
+        <section class="desc markdown">
   <p>Getter doc for explicitGetterSetter.</p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">explicitGetterSetter=</span><span class="signature">(<wbr><span class="parameter" id="explicitGetterSetter=-param-f"><span class="type-annotation"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> <span class="parameter-name">f</span></span>)</span>
+          <div class="features">@<a href="fake/Annotation-class.html">Annotation</a>(&#39;a Setter Annotation&#39;)</div>
 </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">explicitGetterSetter=</span><span class="signature">(<wbr><span class="parameter" id="explicitGetterSetter=-param-f"><span class="type-annotation"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> <span class="parameter-name">f</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        
+        <section class="desc markdown">
   <p>This property is not synthetic, so it might reference <code>f</code> -- display it.</p>
 </section>
-</section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property explicitGetterSetter</h5>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
index 8e7b8baa5b..d12b31fd6f 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html
@@ -75,20 +75,19 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">explicitNonDocumentedInBaseClassGetter</span></section>
-      
-      <section class="desc markdown">
-  <p>Since I have a different doc, I should be documented.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">explicitNonDocumentedInBaseClassGetter</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>Since I have a different doc, I should be documented.</p>
 </section>
-      
-
 
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
index cde0fab0d8..f389b9db94 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/explicitSetter.html
@@ -76,21 +76,20 @@ <h5>class ClassWithUnusualProperties</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">explicitSetter=</span><span class="signature">(<wbr><span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span> <span class="parameter-name">bar</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">baz</span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List&lt;int&gt;</span> <span class="parameter-name">macTruck</span></span>)</span>)</span>
-      </section>
-      
-      <section class="desc markdown">
-  <p>Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.</p>
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">explicitSetter=</span><span class="signature">(<wbr><span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span> <span class="parameter-name">bar</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">baz</span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List&lt;int&gt;</span> <span class="parameter-name">macTruck</span></span>)</span>)</span>
+          
 </section>
+        
+        <section class="desc markdown">
+  <p>Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property explicitSetter</h5>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
index c72e3698bf..cbff8299cd 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/finalProperty.html
@@ -74,17 +74,14 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">Set</span>
-        <span class="name ">finalProperty</span>        <div class="features">final</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>This property has some docs, too.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">Set</span>
+          <span class="name ">finalProperty</span>          <div class="features">final</div>
+        </section>
+        <section class="desc markdown">
+          <p>This property has some docs, too.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
index dfacd4c57d..e7dc9c6556 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html
@@ -75,22 +75,33 @@ <h5>class ClassWithUnusualProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">implicitGetterExplicitSetter=</span><span class="signature">(<wbr><span class="parameter" id="implicitGetterExplicitSetter=-param-x"><span class="type-annotation">String</span> <span class="parameter-name">x</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">implicitGetterExplicitSetter</span>  <div class="features">inherited</div>
+</section>
+        
+        <section class="desc markdown">
   <p>Docs for implicitGetterExplicitSetter from ImplicitProperties.</p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">implicitGetterExplicitSetter=</span><span class="signature">(<wbr><span class="parameter" id="implicitGetterExplicitSetter=-param-x"><span class="type-annotation">String</span> <span class="parameter-name">x</span></span>)</span>
+          
+</section>
+        
+        <section class="desc markdown">
+  <p>Docs for implicitGetterExplicitSetter from ImplicitProperties.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property implicitGetterExplicitSetter</h5>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
index 5d640d2770..d3e6e8c182 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/implicitReadWrite.html
@@ -74,14 +74,11 @@ <h5>class ClassWithUnusualProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">Map</span>
-        <span class="name ">implicitReadWrite</span>        <div class="features">read / write</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">Map</span>
+          <span class="name ">implicitReadWrite</span>          <div class="features">read / write</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Color/hashCode.html b/testing/test_package_docs/fake/Color/hashCode.html
index 8380dd31b8..7d34e6e77e 100644
--- a/testing/test_package_docs/fake/Color/hashCode.html
+++ b/testing/test_package_docs/fake/Color/hashCode.html
@@ -70,17 +70,16 @@ <h5>enum Color</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Color/runtimeType.html b/testing/test_package_docs/fake/Color/runtimeType.html
index b575fbe93e..bcb4aed0e1 100644
--- a/testing/test_package_docs/fake/Color/runtimeType.html
+++ b/testing/test_package_docs/fake/Color/runtimeType.html
@@ -70,17 +70,16 @@ <h5>enum Color</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ConstantClass/hashCode.html b/testing/test_package_docs/fake/ConstantClass/hashCode.html
index 1763a1c9e9..69ab809fc2 100644
--- a/testing/test_package_docs/fake/ConstantClass/hashCode.html
+++ b/testing/test_package_docs/fake/ConstantClass/hashCode.html
@@ -65,17 +65,16 @@ <h5>class ConstantClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ConstantClass/runtimeType.html b/testing/test_package_docs/fake/ConstantClass/runtimeType.html
index b8490adeca..a66f7d16f1 100644
--- a/testing/test_package_docs/fake/ConstantClass/runtimeType.html
+++ b/testing/test_package_docs/fake/ConstantClass/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class ConstantClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ConstantClass/value.html b/testing/test_package_docs/fake/ConstantClass/value.html
index 938a423929..36f6463b5e 100644
--- a/testing/test_package_docs/fake/ConstantClass/value.html
+++ b/testing/test_package_docs/fake/ConstantClass/value.html
@@ -64,14 +64,11 @@ <h5>class ConstantClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">value</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">value</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Cool/hashCode.html b/testing/test_package_docs/fake/Cool/hashCode.html
index f729518257..3c407a3cab 100644
--- a/testing/test_package_docs/fake/Cool/hashCode.html
+++ b/testing/test_package_docs/fake/Cool/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Cool</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Cool/runtimeType.html b/testing/test_package_docs/fake/Cool/runtimeType.html
index 3e00947f11..7eae5586b1 100644
--- a/testing/test_package_docs/fake/Cool/runtimeType.html
+++ b/testing/test_package_docs/fake/Cool/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Cool</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index f21084dc31..a4a226e280 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name deprecated">DOWN</span>        =
-        <span class="constant-value">&#39;down&#39;</span>
-        
+      <span class="name deprecated">DOWN</span>      =
+      <span class="constant-value">&#39;down&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>Dynamic-typed down.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>Dynamic-typed down.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Doh/hashCode.html b/testing/test_package_docs/fake/Doh/hashCode.html
index 66d4da0e70..68eb91eb2f 100644
--- a/testing/test_package_docs/fake/Doh/hashCode.html
+++ b/testing/test_package_docs/fake/Doh/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Doh</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Doh/runtimeType.html b/testing/test_package_docs/fake/Doh/runtimeType.html
index f76a91d3bb..bfc5e8110c 100644
--- a/testing/test_package_docs/fake/Doh/runtimeType.html
+++ b/testing/test_package_docs/fake/Doh/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Doh</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Doh/stackTrace.html b/testing/test_package_docs/fake/Doh/stackTrace.html
index a83dc689a2..5c7a9876be 100644
--- a/testing/test_package_docs/fake/Doh/stackTrace.html
+++ b/testing/test_package_docs/fake/Doh/stackTrace.html
@@ -63,17 +63,16 @@ <h5>class Doh</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">StackTrace</span>
-        <span class="name ">stackTrace</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">StackTrace</span>
+          <span class="name ">stackTrace</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index d970415663..40929af8fb 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -210,9 +210,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="length" class="property inherited">
-          <span class="name"><a href="fake/SpecialList/length.html">length</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="length=-param-length"><span class="type-annotation">int</span> <span class="parameter-name">length</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index cafbf67311..f20f2cd302 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -227,7 +227,7 @@ <h2>Constants</h2>
           
           
   <div>
-            <span class="signature"><code>const <a href="fake/Foo2-class.html">Foo2</a>(0)</code></span>
+            <span class="signature"><code>const Foo2(0)</code></span>
           </div>
         </dd>
         <dt id="BAZ" class="constant">
@@ -238,7 +238,7 @@ <h2>Constants</h2>
           
           
   <div>
-            <span class="signature"><code>const <a href="fake/Foo2-class.html">Foo2</a>(1)</code></span>
+            <span class="signature"><code>const Foo2(1)</code></span>
           </div>
         </dd>
       </dl>
diff --git a/testing/test_package_docs/fake/Foo2/BAR-constant.html b/testing/test_package_docs/fake/Foo2/BAR-constant.html
index daca7c2d1d..a98c445f3b 100644
--- a/testing/test_package_docs/fake/Foo2/BAR-constant.html
+++ b/testing/test_package_docs/fake/Foo2/BAR-constant.html
@@ -69,7 +69,7 @@ <h5>class Foo2</h5>
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/Foo2-class.html">Foo2</a></span>
         <span class="name ">BAR</span>        =
-        <span class="constant-value">const <a href="fake/Foo2-class.html">Foo2</a>(0)</span>
+        <span class="constant-value">const Foo2(0)</span>
     </section>
 
         
diff --git a/testing/test_package_docs/fake/Foo2/BAZ-constant.html b/testing/test_package_docs/fake/Foo2/BAZ-constant.html
index 16da8e44b5..cdc98176ee 100644
--- a/testing/test_package_docs/fake/Foo2/BAZ-constant.html
+++ b/testing/test_package_docs/fake/Foo2/BAZ-constant.html
@@ -69,7 +69,7 @@ <h5>class Foo2</h5>
     <section class="multi-line-signature">
         <span class="returntype"><a href="fake/Foo2-class.html">Foo2</a></span>
         <span class="name ">BAZ</span>        =
-        <span class="constant-value">const <a href="fake/Foo2-class.html">Foo2</a>(1)</span>
+        <span class="constant-value">const Foo2(1)</span>
     </section>
 
         
diff --git a/testing/test_package_docs/fake/Foo2/hashCode.html b/testing/test_package_docs/fake/Foo2/hashCode.html
index ff599b48cf..fc0f16a4cc 100644
--- a/testing/test_package_docs/fake/Foo2/hashCode.html
+++ b/testing/test_package_docs/fake/Foo2/hashCode.html
@@ -66,17 +66,16 @@ <h5>class Foo2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Foo2/index.html b/testing/test_package_docs/fake/Foo2/index.html
index e8796ba42b..ff211d19fc 100644
--- a/testing/test_package_docs/fake/Foo2/index.html
+++ b/testing/test_package_docs/fake/Foo2/index.html
@@ -65,14 +65,11 @@ <h5>class Foo2</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">index</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">index</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Foo2/runtimeType.html b/testing/test_package_docs/fake/Foo2/runtimeType.html
index 14fab32851..5578f05cbc 100644
--- a/testing/test_package_docs/fake/Foo2/runtimeType.html
+++ b/testing/test_package_docs/fake/Foo2/runtimeType.html
@@ -66,17 +66,16 @@ <h5>class Foo2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
index 81677df88c..9badb35a59 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
@@ -62,17 +62,16 @@ <h5>class HasGenericWithExtends</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
index df97a0109e..33da8e941d 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class HasGenericWithExtends</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/HasGenerics/hashCode.html b/testing/test_package_docs/fake/HasGenerics/hashCode.html
index baacf2a41c..4fe354ca66 100644
--- a/testing/test_package_docs/fake/HasGenerics/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenerics/hashCode.html
@@ -66,17 +66,16 @@ <h5>class HasGenerics</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/HasGenerics/runtimeType.html b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
index 08ca1b8ab3..477bdb64bc 100644
--- a/testing/test_package_docs/fake/HasGenerics/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
@@ -66,17 +66,16 @@ <h5>class HasGenerics</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index bd94401108..b9ee8d13ca 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -170,9 +170,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
-          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="aImplementingThingyField=-param-_aImplementingThingyField"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span></span> </span>
-          </span>
+          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/fake/ImplementingThingy/hashCode.html b/testing/test_package_docs/fake/ImplementingThingy/hashCode.html
index 8ad7e28d69..30c427677c 100644
--- a/testing/test_package_docs/fake/ImplementingThingy/hashCode.html
+++ b/testing/test_package_docs/fake/ImplementingThingy/hashCode.html
@@ -65,17 +65,16 @@ <h5>class ImplementingThingy</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplementingThingy/runtimeType.html b/testing/test_package_docs/fake/ImplementingThingy/runtimeType.html
index f1916638fa..079c3557d0 100644
--- a/testing/test_package_docs/fake/ImplementingThingy/runtimeType.html
+++ b/testing/test_package_docs/fake/ImplementingThingy/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class ImplementingThingy</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index 5fc8690fe7..c606fbdbb3 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -164,12 +164,11 @@ <h2>Properties</h2>
         </dt>
         <dd class="inherited">
           BaseThingy2's doc for aImplementingThingy.
-          <div class="features">@override, read-only, inherited</div>
+          <div class="features">read-only, inherited</div>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
-          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="aImplementingThingyField=-param-_aImplementingThingyField"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span></span> </span>
-          </span>
+          <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
         </dt>
         <dd class="inherited">
           
diff --git a/testing/test_package_docs/fake/ImplementingThingy2/hashCode.html b/testing/test_package_docs/fake/ImplementingThingy2/hashCode.html
index 35dc75480b..681bee1115 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2/hashCode.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2/hashCode.html
@@ -65,17 +65,16 @@ <h5>class ImplementingThingy2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplementingThingy2/runtimeType.html b/testing/test_package_docs/fake/ImplementingThingy2/runtimeType.html
index b650366ea6..3c7625c08d 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2/runtimeType.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class ImplementingThingy2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index 191f641353..56f2bbf121 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -160,18 +160,16 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="explicitGetterImplicitSetter" class="property">
-          <span class="name"><a href="fake/ImplicitProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="explicitGetterImplicitSetter=-param-_explicitGetterImplicitSetter"><span class="type-annotation">List&lt;int&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
+          <span class="signature">&#8596; List&lt;int&gt;</span>
         </dt>
         <dd>
           Docs for explicitGetterImplicitSetter from ImplicitProperties.
           <div class="features">read / write</div>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property">
-          <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="explicitGetterSetterForInheriting=-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           Explicit getter for inheriting.
@@ -186,18 +184,16 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="forInheriting" class="property">
-          <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="forInheriting=-param-_forInheriting"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           A simple property to inherit.
           <div class="features">read / write</div>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
-          <span class="name"><a href="fake/ImplicitProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="implicitGetterExplicitSetter=-param-_implicitGetterExplicitSetter"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/ImplicitProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
index 10185aac46..997746e5ea 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterImplicitSetter.html
@@ -66,17 +66,14 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">List&lt;int&gt;</span>
-        <span class="name ">explicitGetterImplicitSetter</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>Docs for explicitGetterImplicitSetter from ImplicitProperties.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">List&lt;int&gt;</span>
+          <span class="name ">explicitGetterImplicitSetter</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Docs for explicitGetterImplicitSetter from ImplicitProperties.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
index d379502c4a..677ea43f3f 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitGetterSetterForInheriting.html
@@ -67,33 +67,33 @@ <h5>class ImplicitProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">explicitGetterSetterForInheriting</span></section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">explicitGetterSetterForInheriting</span>  
+</section>
+        
+        <section class="desc markdown">
   <p>Explicit getter for inheriting.</p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">explicitGetterSetterForInheriting=</span><span class="signature">(<wbr><span class="parameter" id="explicitGetterSetterForInheriting=-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)</span>
+          
 </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">explicitGetterSetterForInheriting=</span><span class="signature">(<wbr><span class="parameter" id="explicitGetterSetterForInheriting=-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        
+        <section class="desc markdown">
   <p>Explicit setter for inheriting.</p>
 </section>
-</section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property explicitGetterSetterForInheriting</h5>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html b/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
index 945379f5bd..53016b325d 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/explicitPartiallyDocumentedField.html
@@ -67,21 +67,33 @@ <h5>class ImplicitProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">double</span>
-        <span class="name ">explicitPartiallyDocumentedField</span></section>
-      
-      <section class="desc markdown">
-  <p>but documented here.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">double</span>
+          <span class="name ">explicitPartiallyDocumentedField</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>but documented here.</p>
 </section>
-      
 
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">explicitPartiallyDocumentedField=</span><span class="signature">(<wbr><span class="parameter" id="explicitPartiallyDocumentedField=-param-foo"><span class="type-annotation">double</span> <span class="parameter-name">foo</span></span>)</span>
+          
+</section>
+        
+        <section class="desc markdown">
+  <p>@nodoc here, you should never see this</p>
+</section>
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property explicitPartiallyDocumentedField</h5>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html b/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
index f3fec00967..bf723defa9 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/forInheriting.html
@@ -66,17 +66,14 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">forInheriting</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>A simple property to inherit.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">forInheriting</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>A simple property to inherit.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/ImplicitProperties/hashCode.html b/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
index d8b2b20add..cfae57c538 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/hashCode.html
@@ -67,17 +67,16 @@ <h5>class ImplicitProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html b/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
index accf352ba0..4c69ece05d 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/implicitGetterExplicitSetter.html
@@ -66,17 +66,14 @@ <h5>class ImplicitProperties</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">implicitGetterExplicitSetter</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>Docs for implicitGetterExplicitSetter from ImplicitProperties.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">implicitGetterExplicitSetter</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Docs for implicitGetterExplicitSetter from ImplicitProperties.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html b/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
index f868ff1be5..7c7ef91e8c 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/runtimeType.html
@@ -67,17 +67,16 @@ <h5>class ImplicitProperties</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Interface/hashCode.html b/testing/test_package_docs/fake/Interface/hashCode.html
index 9a320c4f8a..df9883194a 100644
--- a/testing/test_package_docs/fake/Interface/hashCode.html
+++ b/testing/test_package_docs/fake/Interface/hashCode.html
@@ -62,17 +62,16 @@ <h5>class Interface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Interface/runtimeType.html b/testing/test_package_docs/fake/Interface/runtimeType.html
index 928e6bc9aa..ea044ca560 100644
--- a/testing/test_package_docs/fake/Interface/runtimeType.html
+++ b/testing/test_package_docs/fake/Interface/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class Interface</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 52d1ccdce0..b724e55468 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -190,9 +190,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="aStringProperty" class="property">
-          <span class="name"><a href="fake/LongFirstLine/aStringProperty.html">aStringProperty</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="aStringProperty=-param-_aStringProperty"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/LongFirstLine/aStringProperty.html">aStringProperty</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           An instance string property. Readable and writable.
@@ -207,9 +206,8 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="onlySetter" class="property">
-          <span class="name"><a href="fake/LongFirstLine/onlySetter.html">onlySetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span> <span class="parameter-name">d</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/LongFirstLine/onlySetter.html">onlySetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span></span></span>
         </dt>
         <dd>
           Only a setter, with a single param, of type double.
@@ -224,9 +222,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="powers" class="property inherited">
-          <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="powers=-param-_powers"><span class="type-annotation">List&lt;String&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
+          <span class="signature">&#8596; List&lt;String&gt;</span>
         </dt>
         <dd class="inherited">
           In the super class.
@@ -359,9 +356,8 @@ <h2>Static Properties</h2>
 
       <dl class="properties">
         <dt id="meaningOfLife" class="property">
-          <span class="name"><a href="fake/LongFirstLine/meaningOfLife.html">meaningOfLife</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="meaningOfLife=-param-_meaningOfLife"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/LongFirstLine/meaningOfLife.html">meaningOfLife</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           A static int property.
@@ -376,9 +372,8 @@ <h2>Static Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="staticOnlySetter" class="property">
-          <span class="name"><a href="fake/LongFirstLine/staticOnlySetter.html">staticOnlySetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span> <span class="parameter-name">thing</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/LongFirstLine/staticOnlySetter.html">staticOnlySetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span></span></span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html b/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
index fa4ff0390f..e40be6000b 100644
--- a/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
+++ b/testing/test_package_docs/fake/LongFirstLine/aStringProperty.html
@@ -85,17 +85,14 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">aStringProperty</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>An instance string property. Readable and writable.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">aStringProperty</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>An instance string property. Readable and writable.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html b/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
index 11c57642d4..09254463b3 100644
--- a/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/dynamicGetter.html
@@ -86,20 +86,19 @@ <h5>class LongFirstLine</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">dynamic</span>
-        <span class="name ">dynamicGetter</span></section>
-      
-      <section class="desc markdown">
-  <p>Dynamic getter. Readable only.</p>
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">dynamic</span>
+          <span class="name ">dynamicGetter</span>  
 </section>
+        
+        <section class="desc markdown">
+  <p>Dynamic getter. Readable only.</p>
 </section>
-      
-
 
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html b/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
index ca7ac620b9..95254b19e4 100644
--- a/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
+++ b/testing/test_package_docs/fake/LongFirstLine/meaningOfLife.html
@@ -85,17 +85,14 @@ <h5>class LongFirstLine</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">int</span>
-        <span class="name ">meaningOfLife</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>A static int property.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">meaningOfLife</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>A static int property.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/LongFirstLine/onlySetter.html b/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
index 7af7c50da2..3003b184c1 100644
--- a/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/onlySetter.html
@@ -87,21 +87,20 @@ <h5>class LongFirstLine</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">onlySetter=</span><span class="signature">(<wbr><span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span> <span class="parameter-name">d</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
-  <p>Only a setter, with a single param, of type double.</p>
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">onlySetter=</span><span class="signature">(<wbr><span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span> <span class="parameter-name">d</span></span>)</span>
+          
 </section>
+        
+        <section class="desc markdown">
+  <p>Only a setter, with a single param, of type double.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property onlySetter</h5>
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticGetter.html b/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
index 5f5c13c850..6dbc1aa403 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticGetter.html
@@ -86,17 +86,16 @@ <h5>class LongFirstLine</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">staticGetter</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">staticGetter</span>  
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html b/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
index 6992cb128d..1f6a9da727 100644
--- a/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
+++ b/testing/test_package_docs/fake/LongFirstLine/staticOnlySetter.html
@@ -87,18 +87,17 @@ <h5>class LongFirstLine</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">staticOnlySetter=</span><span class="signature">(<wbr><span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span> <span class="parameter-name">thing</span></span>)</span>
-      </section>
-      
-      </section>
-      
-
-  </div> <!-- /.main-content -->
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">staticOnlySetter=</span><span class="signature">(<wbr><span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span> <span class="parameter-name">thing</span></span>)</span>
+          
+</section>
+        
+        
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property staticOnlySetter</h5>
diff --git a/testing/test_package_docs/fake/MixMeIn/hashCode.html b/testing/test_package_docs/fake/MixMeIn/hashCode.html
index f78cd98128..ec37863248 100644
--- a/testing/test_package_docs/fake/MixMeIn/hashCode.html
+++ b/testing/test_package_docs/fake/MixMeIn/hashCode.html
@@ -62,17 +62,16 @@ <h5>class MixMeIn</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/MixMeIn/runtimeType.html b/testing/test_package_docs/fake/MixMeIn/runtimeType.html
index e4e6dbc83c..5b0d85b74d 100644
--- a/testing/test_package_docs/fake/MixMeIn/runtimeType.html
+++ b/testing/test_package_docs/fake/MixMeIn/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class MixMeIn</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index e028d79242..4258efeb15 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -125,12 +125,12 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">NAME_SINGLEUNDERSCORE</span>        =
-        <span class="constant-value">&#39;yay bug hunting&#39;</span>
-        
+      <span class="name ">NAME_SINGLEUNDERSCORE</span>      =
+      <span class="constant-value">&#39;yay bug hunting&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index 1ca4397f7b..be616e133b 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -125,12 +125,12 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">NAME_WITH_TWO_UNDERSCORES</span>        =
-        <span class="constant-value">&#39;episode seven better be good; episode seven better be good; episode seven better be good; episode seven better be good&#39;</span>
-        
+      <span class="name ">NAME_WITH_TWO_UNDERSCORES</span>      =
+      <span class="constant-value">&#39;episode seven better be good; episode seven better be good; episode seven better be good; episode seven better be good&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Oops/hashCode.html b/testing/test_package_docs/fake/Oops/hashCode.html
index f151ed22ba..a9594fd9f5 100644
--- a/testing/test_package_docs/fake/Oops/hashCode.html
+++ b/testing/test_package_docs/fake/Oops/hashCode.html
@@ -63,17 +63,16 @@ <h5>class Oops</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/Oops/message.html b/testing/test_package_docs/fake/Oops/message.html
index 1b5caf4b35..9020e56907 100644
--- a/testing/test_package_docs/fake/Oops/message.html
+++ b/testing/test_package_docs/fake/Oops/message.html
@@ -62,14 +62,11 @@ <h5>class Oops</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">String</span>
-        <span class="name ">message</span>        <div class="features">final</div>
-    </section>
-
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">message</span>          <div class="features">final</div>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/Oops/runtimeType.html b/testing/test_package_docs/fake/Oops/runtimeType.html
index d4e0f2cd47..276aa7b2bf 100644
--- a/testing/test_package_docs/fake/Oops/runtimeType.html
+++ b/testing/test_package_docs/fake/Oops/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class Oops</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html b/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
index 6d7a9f261f..76f4b5e426 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class OperatorReferenceClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html b/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
index a447382a23..04642bc9e7 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class OperatorReferenceClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
index 2719bdcdaa..b680751dc2 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
@@ -63,17 +63,16 @@ <h5>class OtherGenericsThing</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
index 2f30c31a24..f06fbc0f4a 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class OtherGenericsThing</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index 7c5ec91bc4..7e84d68ff5 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">PI</span>        =
-        <span class="constant-value">3.14159</span>
-        
+      <span class="name ">PI</span>      =
+      <span class="constant-value">3.14159</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>Constant property.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>Constant property.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index f6b044da41..0e5f80fe51 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -165,9 +165,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="length" class="property">
-          <span class="name"><a href="fake/SpecialList/length.html">length</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="length=-param-length"><span class="type-annotation">int</span> <span class="parameter-name">length</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/fake/SpecialList/first.html b/testing/test_package_docs/fake/SpecialList/first.html
index 99622da0c8..22a8324768 100644
--- a/testing/test_package_docs/fake/SpecialList/first.html
+++ b/testing/test_package_docs/fake/SpecialList/first.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">E</span>
-        <span class="name ">first</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">E</span>
+          <span class="name ">first</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/hashCode.html b/testing/test_package_docs/fake/SpecialList/hashCode.html
index b4d1aa5f25..73dc9a3c04 100644
--- a/testing/test_package_docs/fake/SpecialList/hashCode.html
+++ b/testing/test_package_docs/fake/SpecialList/hashCode.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index 55b80e035c..fae4dd8157 100644
--- a/testing/test_package_docs/fake/SpecialList/isEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isEmpty.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isEmpty</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isEmpty</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
index 24d4a88720..c072c0aa30 100644
--- a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">isNotEmpty</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">bool</span>
+          <span class="name ">isNotEmpty</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/iterator.html b/testing/test_package_docs/fake/SpecialList/iterator.html
index 68fd7ffcf0..a04505a4ea 100644
--- a/testing/test_package_docs/fake/SpecialList/iterator.html
+++ b/testing/test_package_docs/fake/SpecialList/iterator.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Iterator&lt;E&gt;</span>
-        <span class="name ">iterator</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Iterator&lt;E&gt;</span>
+          <span class="name ">iterator</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/last.html b/testing/test_package_docs/fake/SpecialList/last.html
index f09e494bb1..ed97f26b72 100644
--- a/testing/test_package_docs/fake/SpecialList/last.html
+++ b/testing/test_package_docs/fake/SpecialList/last.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">E</span>
-        <span class="name ">last</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">E</span>
+          <span class="name ">last</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/length.html b/testing/test_package_docs/fake/SpecialList/length.html
index 6486ca45d4..7340aa1019 100644
--- a/testing/test_package_docs/fake/SpecialList/length.html
+++ b/testing/test_package_docs/fake/SpecialList/length.html
@@ -114,27 +114,27 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">length</span></section>
-      
-      </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">length=</span><span class="signature">(<wbr><span class="parameter" id="length=-param-length"><span class="type-annotation">int</span> <span class="parameter-name">length</span></span>)</span>
-      </section>
-      
-      </section>
-      
-
-  </div> <!-- /.main-content -->
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">length</span>  
+</section>
+        
+        
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">length=</span><span class="signature">(<wbr><span class="parameter" id="length=-param-length"><span class="type-annotation">int</span> <span class="parameter-name">length</span></span>)</span>
+          
+</section>
+        
+        
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property length</h5>
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index cd8a6825fa..89dddf0c9b 100644
--- a/testing/test_package_docs/fake/SpecialList/reversed.html
+++ b/testing/test_package_docs/fake/SpecialList/reversed.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Iterable&lt;E&gt;</span>
-        <span class="name ">reversed</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Iterable&lt;E&gt;</span>
+          <span class="name ">reversed</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/runtimeType.html b/testing/test_package_docs/fake/SpecialList/runtimeType.html
index f31f4c0a87..b78cbd79d8 100644
--- a/testing/test_package_docs/fake/SpecialList/runtimeType.html
+++ b/testing/test_package_docs/fake/SpecialList/runtimeType.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SpecialList/single.html b/testing/test_package_docs/fake/SpecialList/single.html
index cc75ceec9e..d8f3451044 100644
--- a/testing/test_package_docs/fake/SpecialList/single.html
+++ b/testing/test_package_docs/fake/SpecialList/single.html
@@ -114,17 +114,16 @@ <h5>class SpecialList</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">E</span>
-        <span class="name ">single</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">E</span>
+          <span class="name ">single</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 4267551d86..a51581267a 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -163,9 +163,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="powers" class="property">
-          <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="powers=-param-_powers"><span class="type-annotation">List&lt;String&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
+          <span class="signature">&#8596; List&lt;String&gt;</span>
         </dt>
         <dd>
           In the super class.
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html b/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
index 5b0e08ea83..1e5a716a83 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/hashCode.html
@@ -65,17 +65,16 @@ <h5>class SuperAwesomeClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
index 688deb294d..f384414362 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/powers.html
@@ -64,17 +64,14 @@ <h5>class SuperAwesomeClass</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-    <section class="multi-line-signature">
-      <span class="returntype">List&lt;String&gt;</span>
-        <span class="name ">powers</span>        <div class="features">read / write</div>
-    </section>
-
-    <section class="desc markdown">
-      <p>In the super class.</p>
-    </section>
-    
-
+        <section class="multi-line-signature">
+          <span class="returntype">List&lt;String&gt;</span>
+          <span class="name ">powers</span>          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>In the super class.</p>
+        </section>
+                
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html b/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
index 642d387e90..b4d9d182fa 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/runtimeType.html
@@ -65,17 +65,16 @@ <h5>class SuperAwesomeClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index e7d1119154..e012cfcadd 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -125,16 +125,16 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">UP</span>        =
-        <span class="constant-value">&#39;up&#39;</span>
-        
+      <span class="name ">UP</span>      =
+      <span class="constant-value">&#39;up&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>Up is a direction.</p>
+    <section class="desc markdown">
+      <p>Up is a direction.</p>
 <p>Getting up in the morning can be hard.</p>
-      </section>
-            
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index c0c6882d85..7ebaf8a00d 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -159,9 +159,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="lengthX" class="property">
-          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="lengthX=-param-_length"><span class="type-annotation">int</span> <span class="parameter-name">_length</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html b/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
index 7ba321ca36..a226f5b4e2 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/hashCode.html
@@ -63,17 +63,16 @@ <h5>class WithGetterAndSetter</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html b/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
index af2c80eb8d..fdbcd4db97 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/lengthX.html
@@ -63,35 +63,35 @@ <h5>class WithGetterAndSetter</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">lengthX</span></section>
-      
-      <section class="desc markdown">
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">lengthX</span>  
+</section>
+        
+        <section class="desc markdown">
   <p>Returns a length.</p>
 <p>Throws some exception if used in the fourth dimension.</p>
 </section>
+
+</section>
+        
+        <section id="setter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">void</span>
+            <span class="name ">lengthX=</span><span class="signature">(<wbr><span class="parameter" id="lengthX=-param-_length"><span class="type-annotation">int</span> <span class="parameter-name">_length</span></span>)</span>
+          
 </section>
-      
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">lengthX=</span><span class="signature">(<wbr><span class="parameter" id="lengthX=-param-_length"><span class="type-annotation">int</span> <span class="parameter-name">_length</span></span>)</span>
-      </section>
-      
-      <section class="desc markdown">
+        
+        <section class="desc markdown">
   <p>Sets the length.</p>
 <p>Throws if set to an imaginary number.</p>
 </section>
-</section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+          </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>property lengthX</h5>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html b/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
index 5cea4bd4f3..34a7d41eec 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/runtimeType.html
@@ -63,17 +63,16 @@ <h5>class WithGetterAndSetter</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index ae57245ec1..48e9b33d5e 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -125,16 +125,16 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">ZERO</span>        =
-        <span class="constant-value">0</span>
-        
+      <span class="name ">ZERO</span>      =
+      <span class="constant-value">0</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>A constant integer value,
+    <section class="desc markdown">
+      <p>A constant integer value,
 which is a bit redundant.</p>
-      </section>
-            
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index 41f9c79781..05fb0e1c80 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -124,20 +124,19 @@ <h5>library fake</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">dynamic</span>
-        <span class="name ">dynamicGetter</span></section>
-      
-      <section class="desc markdown">
-  <p>A dynamic getter.</p>
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">dynamicGetter</span>  
 </section>
+    
+    <section class="desc markdown">
+  <p>A dynamic getter.</p>
 </section>
-      
-
 
+</section>
+    
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index bb5b05387b..7ee37e7253 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -384,9 +384,8 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="getterSetterNodocGetter" class="property">
-          <span class="name"><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="getterSetterNodocGetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></span>
+          <span class="signature">&#8592; int</span>
         </dt>
         <dd>
           Setter docs should be shown.
@@ -409,18 +408,16 @@ <h2>Properties</h2>
           <div class="features">read-only</div>
 </dd>
         <dt id="justSetter" class="property">
-          <span class="name"><a href="fake/justSetter.html">justSetter</a></span><span class="signature">
-            <span class="returntype parameter">&#8592;  <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/justSetter.html">justSetter</a></span>
+          <span class="signature">&#8592; <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span></span></span>
         </dt>
         <dd>
           Just a setter. No partner getter.
           <div class="features">write-only</div>
 </dd>
         <dt id="mapWithDynamicKeys" class="property">
-          <span class="name"><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="mapWithDynamicKeys=-param-_mapWithDynamicKeys"><span class="type-annotation">Map&lt;dynamic, String&gt;</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></span>
+          <span class="signature">&#8596; Map&lt;dynamic, String&gt;</span>
         </dt>
         <dd>
           
@@ -435,18 +432,16 @@ <h2>Properties</h2>
           <div class="features">final</div>
 </dd>
         <dt id="setAndGet" class="property">
-          <span class="name"><a href="fake/setAndGet.html">setAndGet</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="setAndGet=-param-thing"><span class="type-annotation">String</span> <span class="parameter-name">thing</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/setAndGet.html">setAndGet</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           The getter for setAndGet.
           <div class="features">read / write</div>
 </dd>
         <dt id="simpleProperty" class="property">
-          <span class="name"><a href="fake/simpleProperty.html">simpleProperty</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="simpleProperty=-param-_simpleProperty"><span class="type-annotation">String</span></span> </span>
-          </span>
+          <span class="name"><a href="fake/simpleProperty.html">simpleProperty</a></span>
+          <span class="signature">&#8596; String</span>
         </dt>
         <dd>
           Simple property
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index 8c861189c3..4921ac0870 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -125,21 +125,20 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">getterSetterNodocGetter=</span><span class="signature">(<wbr><span class="parameter" id="getterSetterNodocGetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
-      </section>
+    <section id="setter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">void</span>
+        <span class="name ">getterSetterNodocGetter=</span><span class="signature">(<wbr><span class="parameter" id="getterSetterNodocGetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
       
-      <section class="desc markdown">
-  <p>Setter docs should be shown.</p>
 </section>
+    
+    <section class="desc markdown">
+  <p>Setter docs should be shown.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+      </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>top-level property getterSetterNodocGetter</h5>
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index 7380582121..87b31dc31e 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -124,20 +124,19 @@ <h5>library fake</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">getterSetterNodocSetter</span></section>
-      
-      <section class="desc markdown">
-  <p>Getter docs should be shown.</p>
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">int</span>
+      <span class="name ">getterSetterNodocSetter</span>  
 </section>
+    
+    <section class="desc markdown">
+  <p>Getter docs should be shown.</p>
 </section>
-      
-
 
+</section>
+    
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index d0d590852d..ec2f505cd7 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">greatAnnotation</span>        =
-        <span class="constant-value">&#39;great&#39;</span>
-        
+      <span class="name ">greatAnnotation</span>      =
+      <span class="constant-value">&#39;great&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>This is a great thing.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>This is a great thing.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index 4438043913..14325ef37b 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">greatestAnnotation</span>        =
-        <span class="constant-value">&#39;greatest&#39;</span>
-        
+      <span class="name ">greatestAnnotation</span>      =
+      <span class="constant-value">&#39;greatest&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>This is the greatest thing.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>This is the greatest thing.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 93aa3b07fb..69055d0ff9 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">incorrectDocReference</span>        =
-        <span class="constant-value">&#39;doh&#39;</span>
-        
+      <span class="name ">incorrectDocReference</span>      =
+      <span class="constant-value">&#39;doh&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>Referencing something that <code>doesn't exist</code>.</p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>Referencing something that <code>doesn't exist</code>.</p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index 73ee6585f8..fc74afd0df 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -124,20 +124,19 @@ <h5>library fake</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">bool</span>
-        <span class="name ">justGetter</span></section>
-      
-      <section class="desc markdown">
-  <p>Just a getter. No partner setter.</p>
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">justGetter</span>  
 </section>
+    
+    <section class="desc markdown">
+  <p>Just a getter. No partner setter.</p>
 </section>
-      
-
 
+</section>
+    
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index fed1a7a0d7..56ac01c913 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -125,21 +125,20 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
 
-
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">justSetter=</span><span class="signature">(<wbr><span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
-      </section>
+    <section id="setter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">void</span>
+        <span class="name ">justSetter=</span><span class="signature">(<wbr><span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)</span>
       
-      <section class="desc markdown">
-  <p>Just a setter. No partner getter.</p>
 </section>
+    
+    <section class="desc markdown">
+  <p>Just a setter. No partner getter.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+      </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>top-level property justSetter</h5>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index fe35eecebc..1b252662ab 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -123,13 +123,11 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">Map&lt;dynamic, String&gt;</span>
-        <span class="name ">mapWithDynamicKeys</span>        <div class="features">read / write</div>
-      </section>
-
-      
+    <section class="multi-line-signature">
+      <span class="returntype">Map&lt;dynamic, String&gt;</span>
+      <span class="name ">mapWithDynamicKeys</span>      <div class="features">read / write</div>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index 8f23a0b56b..e0a340086f 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -123,16 +123,14 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name deprecated">meaningOfLife</span>        <div class="features">final</div>
-      </section>
-
-      <section class="desc markdown">
-        <p>Final property.</p>
-      </section>
-      
+    <section class="multi-line-signature">
+      <span class="returntype">int</span>
+      <span class="name deprecated">meaningOfLife</span>      <div class="features">final</div>
+    </section>
+    <section class="desc markdown">
+      <p>Final property.</p>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index 2466374466..930fc2eccf 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -125,12 +125,12 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">required</span>        =
-        <span class="constant-value">&#39;required&#39;</span>
-        
+      <span class="name ">required</span>      =
+      <span class="constant-value">&#39;required&#39;</span>
+      
     </section>
 
-            
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index 6a367b4520..261fabeeac 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -124,33 +124,33 @@ <h5>library fake</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">setAndGet</span></section>
-      
-      <section class="desc markdown">
-  <p>The getter for setAndGet.</p>
+    <section id="getter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">setAndGet</span>  
 </section>
+    
+    <section class="desc markdown">
+  <p>The getter for setAndGet.</p>
 </section>
-      
 
-      <section id="setter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">void</span>
-          <span class="name ">setAndGet=</span><span class="signature">(<wbr><span class="parameter" id="setAndGet=-param-thing"><span class="type-annotation">String</span> <span class="parameter-name">thing</span></span>)</span>
-      </section>
+</section>
+    
+    <section id="setter">
+    
+    <section class="multi-line-signature">
+      <span class="returntype">void</span>
+        <span class="name ">setAndGet=</span><span class="signature">(<wbr><span class="parameter" id="setAndGet=-param-thing"><span class="type-annotation">String</span> <span class="parameter-name">thing</span></span>)</span>
       
-      <section class="desc markdown">
-  <p>The setter for setAndGet.</p>
 </section>
+    
+    <section class="desc markdown">
+  <p>The setter for setAndGet.</p>
 </section>
-      
 
-  </div> <!-- /.main-content -->
+</section>
+      </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>top-level property setAndGet</h5>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index 3c30d3a635..1036ebcd0c 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -123,16 +123,14 @@ <h5>library fake</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">String</span>
-        <span class="name ">simpleProperty</span>        <div class="features">read / write</div>
-      </section>
-
-      <section class="desc markdown">
-        <p>Simple property</p>
-      </section>
-      
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">simpleProperty</span>      <div class="features">read / write</div>
+    </section>
+    <section class="desc markdown">
+      <p>Simple property</p>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index 526fb6b526..ce30c1a60b 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -125,15 +125,15 @@ <h5>library fake</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
     <section class="multi-line-signature">
-        <span class="name ">testingCodeSyntaxInOneLiners</span>        =
-        <span class="constant-value">&#39;fantastic&#39;</span>
-        
+      <span class="name ">testingCodeSyntaxInOneLiners</span>      =
+      <span class="constant-value">&#39;fantastic&#39;</span>
+      
     </section>
 
-      <section class="desc markdown">
-        <p>These are code syntaxes: <code>true</code> and <code>false</code></p>
-      </section>
-            
+    <section class="desc markdown">
+      <p>These are code syntaxes: <code>true</code> and <code>false</code></p>
+    </section>
+        
 
   </div> <!-- /.main-content -->
 
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
index 44e18b2ea3..e7c1bf91ce 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class SomeOtherClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
index efa384e6cc..ed781e7341 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class SomeOtherClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
index 397d8565b5..56400a2f65 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class AUnicornClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
index e7e08c4c33..65bcbb5c34 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class AUnicornClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
index 0d025a25f9..f0d85fd882 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class SomeClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
index 960f3873c2..9a57b20099 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class SomeClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
index 6804fce1b2..c4a876ac4d 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class YetAnotherClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
index 8952b7cb66..074b480616 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class YetAnotherClass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
index f54ebb5f23..6c99073808 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
@@ -62,17 +62,16 @@ <h5>class Whataclass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
index f29f88fd0d..949ad24bd6 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class Whataclass</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
index adc3756dbf..094bd76ff6 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/hashCode.html
@@ -62,17 +62,16 @@ <h5>class Whataclass2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">hashCode</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
index b51b98f000..07cc715195 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/runtimeType.html
@@ -62,17 +62,16 @@ <h5>class Whataclass2</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
 
-
-      <section id="getter">
-      
-      <section class="multi-line-signature">
-        <span class="returntype">Type</span>
-        <span class="name ">runtimeType</span></section>
-      
-      </section>
-      
-
-
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
diff --git a/testing/test_package_docs/two_exports/BaseClass-class.html b/testing/test_package_docs/two_exports/BaseClass-class.html
index e6a41ee2f6..ddf976811c 100644
--- a/testing/test_package_docs/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs/two_exports/BaseClass-class.html
@@ -100,9 +100,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="lengthX" class="property inherited">
-          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="lengthX=-param-_length"><span class="type-annotation">int</span> <span class="parameter-name">_length</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
diff --git a/testing/test_package_docs/two_exports/ExtendingClass-class.html b/testing/test_package_docs/two_exports/ExtendingClass-class.html
index 5da0568e2c..fbf56e2c6d 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass-class.html
@@ -102,9 +102,8 @@ <h2>Properties</h2>
           <div class="features">read-only, inherited</div>
 </dd>
         <dt id="lengthX" class="property inherited">
-          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;  <span class="parameter" id="lengthX=-param-_length"><span class="type-annotation">int</span> <span class="parameter-name">_length</span></span>  </span>
-          </span>
+          <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
diff --git a/testing/test_package_docs/two_exports/topLevelVariable.html b/testing/test_package_docs/two_exports/topLevelVariable.html
index ed6fb0875c..3e1642be18 100644
--- a/testing/test_package_docs/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs/two_exports/topLevelVariable.html
@@ -53,13 +53,11 @@ <h5>library two_exports</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-
-      <section class="multi-line-signature">
-        <span class="returntype">int</span>
-        <span class="name ">topLevelVariable</span>        <div class="features">read / write</div>
-      </section>
-
-      
+    <section class="multi-line-signature">
+      <span class="returntype">int</span>
+      <span class="name ">topLevelVariable</span>      <div class="features">read / write</div>
+    </section>
+        
 
 
   </div> <!-- /.main-content -->
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index aa70a8d9ff..a0fa138335 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -81,9 +81,8 @@ <h2>Properties</h2>
 
       <dl class="properties">
         <dt id="topLevelVariable" class="property">
-          <span class="name"><a href="two_exports/topLevelVariable.html">topLevelVariable</a></span><span class="signature">
-            <span class="returntype parameter">&#8596;   <span class="parameter" id="topLevelVariable=-param-_topLevelVariable"><span class="type-annotation">int</span></span> </span>
-          </span>
+          <span class="name"><a href="two_exports/topLevelVariable.html">topLevelVariable</a></span>
+          <span class="signature">&#8596; int</span>
         </dt>
         <dd>