Fix supertypes and annotations lists

Author: TheElectronWill

doc-tool/resources/_layouts/api-page.html

@@ -51,8 +51,7 @@ <h1>
             <h2>Supertypes</h2>
             <span>
                 {% for superT in entity.superTypes %}
-                    {% renderLink superT %}
-                    {% unless forloop.last %}, {% endunless %}
+                    {% renderLink superT %}{% unless forloop.last %}, {% endunless %}
                 {% endfor %}
             </span>
         </div>
@@ -63,8 +62,7 @@ <h2>Supertypes</h2>
             <h2>Annotations</h2>
             <span>
                 {% for annot in entity.annotations %}
-                    @{% renderLink annot %}
-                    {% unless forloop.last %}, {% endunless %}
+                    @{{ annot }}{% unless forloop.last %}, {% endunless %}
                 {% endfor %}
             </span>
         </div>