diff --git a/src/mpi/f90/xml/chasm-mpi-test.f90.xsl b/src/mpi/f90/xml/chasm-mpi-test.f90.xsl
index e51cff53d7..bd0c167226 100644
--- a/src/mpi/f90/xml/chasm-mpi-test.f90.xsl
+++ b/src/mpi/f90/xml/chasm-mpi-test.f90.xsl
@@ -294,6 +294,60 @@ echo
         <xsl:when test="@usertype = 'MPI_Status'">
           <xsl:text>integer(MPI_STATUS_SIZE)</xsl:text>
         </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Handler_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_File_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_query_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_free_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_cancel_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Copy_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Delete_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_User_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Datarep_conversion_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Datarep_extent_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Type_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Type_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
         <xsl:otherwise>
           <xsl:param name="prefix" select="substring-before(@usertype, '_')"/>
           <xsl:if test="$prefix = 'MPI'">
diff --git a/src/mpi/f90/xml/chasm-mpi.i.f90.xsl b/src/mpi/f90/xml/chasm-mpi.i.f90.xsl
index fb0452259a..78168826a2 100644
--- a/src/mpi/f90/xml/chasm-mpi.i.f90.xsl
+++ b/src/mpi/f90/xml/chasm-mpi.i.f90.xsl
@@ -256,7 +256,7 @@ echo
 
 
 <!--
-  - decl-type-spec <arg>
+  - decl-type-spec <type>
   -->
 <xsl:template name="decl-type-spec">
 
@@ -265,8 +265,15 @@ echo
     <!-- C++ types -->
 
     <xsl:when test="@kind = 'void'">
-      <xsl:text>integer(kind=MPI_INTEGER${kind}_KIND)</xsl:text>
-      <xsl:text>, dimension(${dim})</xsl:text>
+      <xsl:choose>
+        <xsl:when test="../../../../@template = 'yes'">
+          <xsl:text>integer(kind=MPI_INTEGER${kind}_KIND)</xsl:text>
+          <xsl:text>, dimension(${dim})</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>integer</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:when>
     <xsl:when test="@kind = 'bool'">
       <xsl:text>integer</xsl:text>
@@ -326,6 +333,60 @@ echo
         <xsl:when test="@usertype = 'MPI_Status'">
           <xsl:text>integer(MPI_STATUS_SIZE)</xsl:text>
         </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Comm_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Handler_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_File_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_query_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_free_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Grequest_cancel_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Copy_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Delete_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_User_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Datarep_conversion_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Datarep_extent_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Type_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Type_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_errhandler_fn'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_copy_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
+        <xsl:when test="@usertype = 'MPI_Win_delete_attr_function'">
+          <xsl:text>external</xsl:text>
+        </xsl:when>
         <xsl:otherwise>
           <xsl:param name="prefix" select="substring-before(@usertype, '_')"/>
           <xsl:if test="$prefix = 'MPI'">