diff --git a/src/dmdoc/template/dm_module.html b/src/dmdoc/template/dm_module.html
index ba2197be..f831df00 100644
--- a/src/dmdoc/template/dm_module.html
+++ b/src/dmdoc/template/dm_module.html
@@ -22,7 +22,7 @@
             <tr><th>{% if item.type.substance -%}
                 <a href="{{ item.type.path | safe | substring(start=1) }}.html">{{item.type.path}}</a>
             {%- else -%}
-                {{ item.type.path | safe | linkify_type }}
+                {{ item.type.path | linkify_type | safe }}
             {%- endif %}</th><td>{{ item.type.teaser | safe }}</td></tr>
         {%- endif %}
     {%- endfor -%}
diff --git a/src/dmdoc/template/dm_type.html b/src/dmdoc/template/dm_type.html
index a24933b6..7fe817b4 100644
--- a/src/dmdoc/template/dm_type.html
+++ b/src/dmdoc/template/dm_type.html
@@ -11,11 +11,11 @@
 <h1>{% if path == "(global)" -%}
     (global)
 {%- elif details.name -%}
-    {{ details.name }} <aside>{{ path | safe | linkify_type }}</aside>
+    {{ details.name }} <aside>{{ path | linkify_type | safe }}</aside>
 {%- else -%}
-    {{ path | safe | linkify_type }}
+    {{ path | linkify_type | safe }}
 {%- endif %}
-{%- if details.parent_type %}<aside> inherits {{ details.parent_type | safe | linkify_type }}</aside>{% endif -%}
+{%- if details.parent_type %}<aside> inherits {{ details.parent_type | linkify_type | safe }}</aside>{% endif -%}
 {{ macros::git_link(env=env, item=details) }}</h1>
 
 {% if details.docs %}{{ details.docs.html | safe }}{% endif %}
@@ -50,7 +50,7 @@
             <aside>&ndash; {% if var.type.is_static %}/static{% endif -%}
                 {%- if var.type.is_const %}/const{% endif -%}
                 {%- if var.type.is_tmp %}/tmp{% endif -%}
-                {{ var.type.path | safe | linkify_type }}</aside>
+                {{ var.type.path | linkify_type | safe }}</aside>
         {%- endif -%}
         {{ macros::git_link(env=env, item=var) }}</h3>
         {{ var.docs.html | safe }}
@@ -67,7 +67,7 @@
             <a name="proc/{{ name }}">{{ name }}</a><aside>(
             {%- for param in proc.params -%}
                 {% if not loop.first %}, {% endif -%}
-                {% if param.type_path %}{{ param.type_path | safe | linkify_type }}/{% endif %}{{ param.name }}
+                {% if param.type_path %}{{ param.type_path | linkify_type | safe }}/{% endif %}{{ param.name }}
             {%- endfor -%}
             ) {{ macros::git_link(env=env, item=proc) }}</aside>
         </h3>