diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index e386ab95..3a1210a1 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -5,17 +5,25 @@
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
-<#assign linkedIndividual>
-    <#if statement.infoResource??>
-        <a href="${url(statement.infoResource)}">${statement.infoResourceName}</a>
-    <#else>
-        <#-- This shouldn't happen, but we must provide for it -->
-        <a href="${url(statement.authorship)}">${statement.authorshipName}</a> (no linked information resource)
+<@showAuthorship statement />
+
+<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+     statement -->
+<#macro showAuthorship statement>
+
+    <#local linkedIndividual>
+        <#if statement.infoResource??>
+            <a href="${url(statement.infoResource)}">${statement.infoResourceName}</a>
+        <#else>
+            <#-- This shouldn't happen, but we must provide for it -->
+            <a href="${url(statement.authorship)}">${statement.authorshipName}</a> (no linked information resource)
+        </#if>
+    </#local>
+    
+    <#if statement.dateTime??>
+        <#local year = dt.xsdDateTimeToYear(statement.dateTime)>
     </#if>
-</#assign>
+    
+    <@s.join [ linkedIndividual, year! ] />
 
-<#if statement.dateTime??>
-    <#assign year = dt.xsdDateTimeToYear(statement.dateTime)>
-</#if>
-
-<@s.join [ linkedIndividual, year! ] />
\ No newline at end of file
+</#macro>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index 3e123cbd..cc4ba4cb 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -5,23 +5,31 @@
 <#import "lib-sequence.ftl" as s>
 <#import "lib-datetime.ftl" as dt>
 
-<#assign degree>
-    <#if statement.degreeName??>
-        <@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " />
+<@showEducationalTraining statement />
+
+<#-- Use a macro to keep variable assignments local; otherwise the values get passed to the next
+     statement -->
+<#macro showEducationalTraining statement>
+
+    <#local degree>
+        <#if statement.degreeName??>
+            <@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " />
+        </#if>
+    </#local>
+    
+    <#local linkedIndividual>
+        <#if statement.org??>
+            <a href="${url(statement.org)}">${statement.orgName}</a>
+        <#else>
+            <#-- This shouldn't happen, but we must provide for it -->
+            <a href="${url(statement.edTraining)}">${statement.edTrainingName}</a> (no linked organization)
+        </#if>
+    </#local>
+    
+    <#if statement.dateTime??>
+        <#local year = dt.xsdDateTimeToYear(statement.dateTime)>
     </#if>
-</#assign>
+    
+    <@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info!, year! ] />
 
-<#assign linkedIndividual>
-    <#if statement.org??>
-        <a href="${url(statement.org)}">${statement.orgName}</a>
-    <#else>
-        <#-- This shouldn't happen, but we must provide for it -->
-        <a href="${url(statement.edTraining)}">${statement.edTrainingName}</a> (no linked organization)
-    </#if>
-</#assign>
-
-<#if statement.dateTime??>
-    <#assign year = dt.xsdDateTimeToYear(statement.dateTime)>
-</#if>
-
-<@s.join [ degree, linkedIndividual, statement.deptOrSchool!, statement.info!, year! ] />
+</#macro>
\ No newline at end of file