@@ -318,7 +318,7 @@
 
 \indexdefn{program!ill-formed}%
 \definition{ill-formed program}{defns.ill.formed}
-program that is not well-formed\iref{defns.well.formed}
+program that is not \termref{defns.well.formed}{well-formed}{}
 
 \indexdefn{behavior!implementation-defined}%
 \definition{implementation-defined behavior}{defns.impl.defined}
@@ -464,7 +464,7 @@
 
 \indexdefn{property!of the implementation}%
 \definition{property of the implementation}{defns.impl.prop}
-behavior, for a well-formed program\iref{defns.well.formed}
+behavior, for a \termref{defns.well.formed}{well-formed program}{}
 construct and correct data, that depends on the implementation
 
 \definition{referenceable type}{defns.referenceable}
@@ -611,7 +611,7 @@
 \indexdefn{signature}%
 \definition{signature}{defns.signature.member.spec}
 \defncontext{class member function template specialization} \termref{defns.signature.member.templ}{signature}{} of the member function template
-of which it is a specialization and its template arguments (whether explicitly specified or deduced)
+of which it is a specialization and its template \termref{defns.argument.templ}{argument}{s} (whether explicitly specified or deduced)
 
 \indexdefn{signature}%
 \definition{signature}{defns.signature.template.head}