diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 9824fd3743..8b1de4ab16 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -405,8 +405,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="expand" class="callable inherited">
-          <span class="name"><a href="fake/ExtraSpecialList/expand.html">expand</a></span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable</span>
+          <span class="name"><a href="fake/ExtraSpecialList/expand.html">expand</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable&lt;T&gt;</span>
           </span>
         </dt>
         <dd class="inherited">
@@ -433,8 +433,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="fold" class="callable inherited">
-          <span class="name"><a href="fake/ExtraSpecialList/fold.html">fold</a></span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; dynamic</span>
+          <span class="name"><a href="fake/ExtraSpecialList/fold.html">fold</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
         <dd class="inherited">
@@ -519,8 +519,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="map" class="callable inherited">
-          <span class="name"><a href="fake/ExtraSpecialList/map.html">map</a></span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable</span>
+          <span class="name"><a href="fake/ExtraSpecialList/map.html">map</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable&lt;T&gt;</span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/expand.html b/testing/test_package_docs/fake/ExtraSpecialList/expand.html
index 35e65a9c03..aa955f0846 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/expand.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/expand.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> expand
+            <span class="kind">method</span> expand&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable</span>
-      <span class="name ">expand</span>(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">Iterable&lt;T&gt;</span>
+      <span class="name ">expand</span>&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Expands each element of this <code>Iterable</code> into zero or more elements.</p>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/fold.html b/testing/test_package_docs/fake/ExtraSpecialList/fold.html
index 609a14deea..b38d64b524 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/fold.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/fold.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> fold
+            <span class="kind">method</span> fold&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">dynamic</span>
-      <span class="name ">fold</span>(<wbr><span class="parameter" id="fold-param-initialValue"><span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">T</span>
+      <span class="name ">fold</span>&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Reduces a collection to a single value by iteratively combining each
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/map.html b/testing/test_package_docs/fake/ExtraSpecialList/map.html
index bd04725b0a..096a7fe9f3 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/map.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/map.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> map
+            <span class="kind">method</span> map&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable</span>
-      <span class="name ">map</span>(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">Iterable&lt;T&gt;</span>
+      <span class="name ">map</span>&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Returns a new lazy <code>Iterable</code> with elements that are created by
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index d33c1182b3..744b54bbe1 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -406,8 +406,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="expand" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable</span>
+          <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable&lt;T&gt;</span>
           </span>
         </dt>
         <dd class="inherited">
@@ -434,8 +434,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="fold" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; dynamic</span>
+          <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; T</span>
           </span>
         </dt>
         <dd class="inherited">
@@ -520,8 +520,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="map" class="callable inherited">
-          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
-            <span class="returntype parameter">&#8594; Iterable</span>
+          <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+            <span class="returntype parameter">&#8594; Iterable&lt;T&gt;</span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/SpecialList/expand.html b/testing/test_package_docs/fake/SpecialList/expand.html
index ed3e5a0d2d..9bb98f432a 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> expand
+            <span class="kind">method</span> expand&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/SpecialList-class.html">SpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable</span>
-      <span class="name ">expand</span>(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">Iterable&lt;T&gt;</span>
+      <span class="name ">expand</span>&lt;T&gt;(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable&lt;T&gt;</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Expands each element of this <code>Iterable</code> into zero or more elements.</p>
diff --git a/testing/test_package_docs/fake/SpecialList/fold.html b/testing/test_package_docs/fake/SpecialList/fold.html
index 57e12da5c1..2dd580eaaf 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> fold
+            <span class="kind">method</span> fold&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/SpecialList-class.html">SpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">dynamic</span>
-      <span class="name ">fold</span>(<wbr><span class="parameter" id="fold-param-initialValue"><span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">T</span>
+      <span class="name ">fold</span>&lt;T&gt;(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Reduces a collection to a single value by iteratively combining each
diff --git a/testing/test_package_docs/fake/SpecialList/map.html b/testing/test_package_docs/fake/SpecialList/map.html
index bae4337ff8..3adc7b7253 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.html
@@ -55,7 +55,7 @@
         </ol>
         <div class="title-description">
           <h1 class="title">
-            <span class="kind">method</span> map
+            <span class="kind">method</span> map&lt;T&gt;
           </h1>
         </div>
       </div> <!-- /col -->
@@ -149,8 +149,8 @@ <h5><a href="fake/SpecialList-class.html">SpecialList</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
-      <span class="returntype">Iterable</span>
-      <span class="name ">map</span>(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
+      <span class="returntype">Iterable&lt;T&gt;</span>
+      <span class="name ">map</span>&lt;T&gt;(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
     </section>
     <section class="desc markdown">
       <p>Returns a new lazy <code>Iterable</code> with elements that are created by