Fix for ellipsed subclasses

Change-Id: Ia27225adad4e5495bfea622781b3e750cb7cd237
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index 265130e..9a148f8 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -272,12 +272,14 @@
             <?cs /each ?>
           <?cs else ?>
             <?cs set:leftovers = subcount(classes) - #15 ?>
-            <?cs loop:i = #0, #15, #1 ?>
+            <?cs loop:i = #0, #14, #1 ?>
               <?cs with:cl=classes[i] ?>
-                <?cs call:type_link(cl.type) ?>, <?cs  if:(#i == #15) ?>and
-                <a href="#" onclick="return toggleInherited(document.getElementById('<?cs
-                   var:id ?>', null))"><?cs var:leftovers ?> others.<?cs /if ?></a>
+                <?cs call:type_link(cl.type) ?>,
               <?cs /with ?>
+              <?cs  if:(#i == #14) ?>and
+                <a href="#" onclick="return toggleInherited(document.getElementById('<?cs
+                   var:id ?>', null))"><?cs var:leftovers ?> others.</a>
+              <?cs /if ?>
             <?cs /loop ?>
           <?cs /if ?>
       </div>