diff --git a/StructFields.pm b/StructFields.pm
index 2d024d088..401da8259 100644
--- a/StructFields.pm
+++ b/StructFields.pm
@@ -73,6 +73,18 @@ sub get_container_item_type($;%) {
     }
 }
 
+sub get_internal_item_type($;$;%) {
+    my ($tag, $type, %flags) = @_;
+    my @items = $tag->findnodes($type);
+    if (@items) {
+        return get_struct_field_type($items[0], -local => $in_struct_body, %container_flags, %flags);
+    } elsif ($flags{-void}) {
+        return $flags{-void};
+    } else {
+        die "Container without $type: $tag\n";
+    }
+}
+
 sub get_variant_item_type($;%) {
     my ($tag, %flags) = @_;
     my ($rawtype) = $tag->getAttribute('raw-type');
@@ -152,6 +164,11 @@ my %custom_container_handlers = (
         header_ref("set");
         return "std::set<$item >";
     },
+    'stl-unordered-set' => sub {
+        my $item = get_container_item_type($_, -void => 'void*');
+        header_ref("unordered_set");
+        return "std::unordered_set<$item >";
+    },
     'stl-bit-vector' => sub {
         header_ref("vector");
         return "std::vector<bool>";
@@ -163,18 +180,16 @@ my %custom_container_handlers = (
         return "std::array<$item, $count>";
     },
     'stl-map' => sub {
-        # TODO: implement get_container_key_type?
-        my $key  = 'void*';
-        my $item = get_container_item_type($_, -void => 'void*');
+        my $key = get_internal_item_type($_, "key-type", -void => 'void*');
+        my $value = get_internal_item_type($_, "value-type", -void => 'void*');
         header_ref("map");
-        return "std::map<$key, $item>";
+        return "std::map<$key, $value>";
     },
     'stl-unordered-map' => sub {
-        # TODO: implement get_container_key_type?
-        my $key  = 'void*';
-        my $item = get_container_item_type($_, -void => 'void*');
+        my $key = get_internal_item_type($_, "key-type", -void => 'void*');
+        my $value = get_internal_item_type($_, "value-type", -void => 'void*');
         header_ref("unordered_map");
-        return "std::unordered_map<$key, $item>";
+        return "std::unordered_map<$key, $value>";
     },
     'stl-function' => sub {
         my $item = get_container_item_type($_, -void => 'void');
diff --git a/StructType.pm b/StructType.pm
index efa12cb37..8708dd546 100644
--- a/StructType.pm
+++ b/StructType.pm
@@ -316,7 +316,9 @@ sub render_struct_type {
                 emit 'friend struct ' . fully_qualified_name($types{$backref}, $backref) . ';';
             }
         }
+
     } $tag, "$typename$ispec", -export => 1;
+
 }
 
 1;
diff --git a/codegen.pl b/codegen.pl
index 874fdedd9..bcada51c5 100755
--- a/codegen.pl
+++ b/codegen.pl
@@ -36,14 +36,17 @@ BEGIN
 my $parser = XML::LibXML->new();
 my $xslt = XML::LibXSLT->new();
 my @transforms =
-    map { $xslt->parse_stylesheet_file("$script_root/$_"); }
+    map { [ $_, $xslt->parse_stylesheet_file("$script_root/$_") ]; }
     ('lower-1.xslt', 'lower-2.xslt');
 my @documents;
 
 for my $fn (sort { $a cmp $b } bsd_glob "$input_dir/df.*.xml") {
     local $filename = $fn;
     my $doc = $parser->parse_file($filename);
-    $doc = $_->transform($doc) for @transforms;
+    for my $t (@transforms) {
+#        print "Applying transform ", $t->[0], " to $filename\n";
+        $doc = $t->[1]->transform($doc);
+    }
 
     push @documents, $doc;
     add_type_to_hash $_ foreach $doc->findnodes('/ld:data-definition/ld:global-type');
diff --git a/data-definition.xsd b/data-definition.xsd
index 18271caa8..8b17d0161 100644
--- a/data-definition.xsd
+++ b/data-definition.xsd
@@ -221,6 +221,7 @@
             <xs:element name="stl-deque" type="StlDequeField" />
             <xs:element name="stl-array" type="StlArrayField" />
             <xs:element name="stl-set" type="StlSetField" />
+            <xs:element name="stl-unordered-set" type="StlSetField" />
             <xs:element name="stl-map" type="StlMapField" />
             <xs:element name="stl-unordered-map" type="StlMapField" />
             <xs:element name="stl-fstream" type="OpaqueField" />
@@ -417,10 +418,13 @@
         </xs:complexContent>
     </xs:complexType>
     <xs:complexType name="StlMapField">
-        <xs:complexContent>
-            <xs:extension base="ContainerFieldType">
-            </xs:extension>
-        </xs:complexContent>
+        <xs:sequence>
+            <xs:element name="key-type" minOccurs="1" maxOccurs="1" type="CompoundFieldType"/>
+            <xs:element name="value-type" minOccurs="1" maxOccurs="1" type="CompoundFieldType"/>
+        </xs:sequence>
+        <xs:attributeGroup ref="SharedAttributes" />
+        <xs:attribute name="name">
+        </xs:attribute>
     </xs:complexType>
     <xs:complexType name="StlOptionalField">
         <xs:complexContent>
diff --git a/df.creature.xml b/df.creature.xml
index 54d9667fc..8483c6916 100644
--- a/df.creature.xml
+++ b/df.creature.xml
@@ -1528,7 +1528,10 @@
 
         <stl-vector name='action_strings' pointer-type='stl-string' since='v0.40.01'/>
 
-        <stl-unordered-map name='hist_fig_to_creature_map' type-name='int32_t' comment='unordered_map&lt;int32_t,int32_t&gt;'/>
+        <stl-unordered-map name='hist_fig_to_creature_map'>
+            <key-type type-name='int32_t'/>
+            <value-type type-name='int32_t'/>
+        </stl-unordered-map>
 
         <virtual-methods>
             <vmethod name='getTile' ret-type='uint8_t'>
diff --git a/df.d_interface.xml b/df.d_interface.xml
index b2df01bbb..4ebd58a99 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -1975,7 +1975,7 @@
         <enum-item name='OTHER'/>
     </enum-type>
 
-    <struct-type type-name='labor_kitchen_interface_food_key'>
+    <struct-type type-name='labor_kitchen_interface_food_key' custom-methods='true'>
         <enum name='type' type-name='item_type'/>
         <int16_t name='subtype'/>
         <int16_t name='mat'/>
@@ -1989,11 +1989,14 @@
     </struct-type>
 
     <struct-type type-name='labor_kitchen_interface_food_entry'>
+        <extra-include filename="custom/hash/labor_kitchen_interface_food_key.h"/>
         <compound type-name='labor_kitchen_interface_food_key' name='first'/>
         <compound type-name='labor_kitchen_interface_food_value' name='second'/>
     </struct-type>
 
-    <struct-type type-name='labor_kitchen_interface_food_sort_entry' inherits-from='sort_entry'/>
+    <struct-type type-name='labor_kitchen_interface_food_sort_entry' inherits-from='sort_entry'>
+        <extra-include filename="custom/hash/labor_kitchen_interface_food_key.h"/>
+    </struct-type>
 
     <enum-type type-name='labor_kitchen_interface_type_filter' base-type='int8_t'> bay12: labor_kitchen_interface_type_filter
         <enum-item name='ALL' value='-1'/>
@@ -2005,9 +2008,15 @@
 
     <class-type type-name='labor_kitchen_interfacest' inherits-from='widget_container'>
         <enum type-name='kitchen_pref_category_type' name='current_category'/>
-        <stl-unordered-map type-name='labor_kitchen_interface_food_value' name='known' comment='std::unordered_map&lt;labor_kitchen_interface_food_key,labor_kitchen_interface_food_value&gt;'/>
+        <stl-unordered-map name='known'>
+            <key-type type-name='labor_kitchen_interface_food_key'/>
+            <value-type type-name='labor_kitchen_interface_food_value'/>
+        </stl-unordered-map>
         <stl-vector type-name='labor_kitchen_interface_food_sort_entry' name='sorting_by'/>
-        <stl-unordered-map type-name='int8_t' name='ascending_sort' comment='std::unordered_map&lt;std::string,bool&gt;'/>
+        <stl-unordered-map name='ascending_sort'>
+            <key-type type-name='stl-string'/>
+            <value-type type-name='int8_t'/>
+        </stl-unordered-map>
         <stl-vector name='filter_func'>
             <stl-function comment='std::function&lt;bool(labor_kitchen_interface_food_entry)&gt;'/>
         </stl-vector>
@@ -2370,9 +2379,18 @@
         <stl-vector pointer-type='organization_entryst' name='organization_entry'/>
         <stl-vector pointer-type='plot_entryst' name='plot_entry'/>
 
-        <stl-unordered-map type-name='int32_t' name='crimevals' comment='std::unordered_map&lt;unitst *,int32_t&gt;'/>
-        <stl-unordered-map type-name='justice_screen_interrogation_list_flag' name='crimeflag' comment='std::unordered_map&lt;unitst *,int32_t&gt;'/>
-        <stl-unordered-map type-name='int32_t' name='guardvals' comment='std::unordered_map&lt;unitst *,int32_t&gt;'/>
+        <stl-unordered-map name='crimevals'>
+            <key-type><pointer type-name='unit'/></key-type>
+            <value-type type-name='int32_t'/>
+        </stl-unordered-map>
+        <stl-unordered-map name='crimeflag'>
+            <key-type><pointer type-name='unit'/></key-type>
+            <value-type type-name='justice_screen_interrogation_list_flag'/>
+        </stl-unordered-map>
+        <stl-unordered-map name='guardvals'>
+            <key-type><pointer type-name='unit'/></key-type>
+            <value-type type-name='int32_t'/>
+        </stl-unordered-map>
 
         <bool name='do_init'/>
     </class-type>
diff --git a/df.g_src.ViewBase.xml b/df.g_src.ViewBase.xml
index 80b2cb6f2..e5fcc4381 100644
--- a/df.g_src.ViewBase.xml
+++ b/df.g_src.ViewBase.xml
@@ -139,7 +139,10 @@
     </class-type>
 
     <class-type type-name='widget_container' original-name='widgets::container' inherits-from='widget'>
-        <stl-map name='children_by_name' comment='std::map&lt;std::string,std::shared_ptr&lt;widget&gt;&gt;'/>
+        <stl-map name='children_by_name'>
+            <key-type type-name='stl-string'/>
+            <value-type><stl-shared-ptr type-name='widget'/></value-type>
+        </stl-map>
         <stl-vector name='children'>
             <stl-shared-ptr type-name='widget'/>
         </stl-vector>
@@ -185,7 +188,11 @@
         <pointer type-name='widget' name='selected'/>
         <int32_t name='selected_idx' init-value='0'/>
         <compound type-name='widget_scroll_rows' name='rows'/>
-        <stl-map name='select_callback' comment='std::map&lt;size_t, std::function&lt;void(widget *)&gt;&gt;'/>
+        <stl-map name='select_callback'>
+            <key-type type-name='size_t'/>
+            <value-type><stl-function comment='arguments are widget *'/></value-type>
+        </stl-map>
+
     </class-type>
 
     <class-type type-name='widget_table' original-name='widgets::table' inherits-from='widget_container'>
@@ -248,7 +255,9 @@
     <class-type type-name='widget_folder' original-name='widgets::folder' inherits-from='widget'>
         <compound type-name='widget' name='open'/>
         <bool name='last_visible'/>
-        <stl-unordered-map name='controlled_set' comment='std::unordered_set&lt;std::shared_ptr&lt;widget&gt;&gt;'/>
+        <stl-unordered-set name='controlled_set'>
+            <stl-shared-ptr type-name='widget'/>
+        </stl-unordered-set>
         <bool name='controlled_visible'/>
         <compound type-name='widget_text' name='label'/>
         <stl-weak-ptr type-name='widget_container'/>
@@ -256,7 +265,9 @@
 
     <struct-type type-name='filter_entry'>
         <stl-shared-ptr type-name='widget_text' name='label'/>
-        <stl-unordered-map name='filtered_set' comment='std::unordered_set&lt;std::shared_ptr&lt;widget&gt;&gt;'/>
+        <stl-unordered-set name='filtered_set'>
+            <stl-shared-ptr type-name='widget'/>
+        </stl-unordered-set>
     </struct-type>
 
     <class-type type-name='widget_filter' original-name='widgets::filter' inherits-from='widget'>
@@ -279,11 +290,27 @@
     </class-type>
 
     <struct-type type-name='widget_menu' original-name='widgets::menu'>
-        <stl-map name='lines'/>
+        <stl-map name='lines'>
+            <key-type type-name='int32_t'/>
+            <value-type>
+                <compound>
+                    <stl-string/>
+                    <int8_t comment='placeholder type'/>
+                </compound>
+            </value-type>
+        </stl-map>
         <int32_t name='selection'/>
         <int32_t name='last_displayheight'/>
         <bool name='bleached'/>
-        <stl-map name='colors'/>
+        <stl-map name='colors'>
+            <key-type type-name='int32_t'/>
+            <value-type>
+                <compound>
+                    <int32_t/>
+                    <int32_t/>
+                </compound>
+            </value-type>
+        </stl-map>
     </struct-type>
 
     <enum-type type-name='interface_breakdown_types'> bay12: InterfaceBreakdownTypes, no base type
diff --git a/df.g_src.enabler.xml b/df.g_src.enabler.xml
index d13189abd..2f204ccc6 100644
--- a/df.g_src.enabler.xml
+++ b/df.g_src.enabler.xml
@@ -45,7 +45,7 @@
         <flag-bit name='convert'/>
     </bitfield-type>
 
-    <struct-type type-name='texture_fullid'>
+    <struct-type type-name='texture_fullid' custom-methods='true'>
         <int32_t name='texpos'/>
         <s-float name='r'/>
         <s-float name='g'/>
diff --git a/df.g_src.music_and_sound_g.xml b/df.g_src.music_and_sound_g.xml
index 5a4fb7964..695f339fa 100644
--- a/df.g_src.music_and_sound_g.xml
+++ b/df.g_src.music_and_sound_g.xml
@@ -28,7 +28,13 @@
     -- Unused: Song
     -- Unused: SoundType
     -- Skipped: musicsound_info - platform-dependent implementation?
-    -- Unused: music_datast
+
+    <struct-type type-name='music_datast'>
+        <int32_t name='id'/>
+        <stl-string name='title'/>
+        <stl-string name='author'/>
+    </struct-type>
+
     -- Unused: loading_music_filest
 
     <struct-type type-name='musicsoundst'>
@@ -82,10 +88,19 @@
         <int32_t name='next_song_id'/>
         <int32_t name='next_sound_id'/>
 
-        <stl-unordered-map name='loaded_music' comment='unordered_map&lt;std::string, music_datast&gt;'/>
-        <stl-unordered-map name='music_by_id' comment='unordered_map&lt;int, music_datast&gt;'/>
-        <stl-unordered-map name='loaded_sounds' comment='unordered_map&lt;std::string, int&gt;'/>
-        <stl-vector name='loading_files' comment='std::ffuture&lt;loading_music_filest&gt;'/>
+        <stl-unordered-map name='loaded_music' comment='unordered_map&lt;std::string, music_datast&gt;'>
+            <key-type type-name='stl-string'/>
+            <value-type type-name='music_datast'/>
+        </stl-unordered-map>
+        <stl-unordered-map name='music_by_id'>
+            <key-type type-name='int32_t'/>
+            <value-type type-name='music_datast'/>
+        </stl-unordered-map>
+        <stl-unordered-map name='loaded_sounds'>
+            <key-type type-name='stl-string'/>
+            <value-type type-name='int32_t'/>
+        </stl-unordered-map>
+        <stl-vector name='loading_files' comment='std::future&lt;loading_music_filest&gt;'/>
 
         <pointer name='internal' comment='musicsound_info'/>
 
diff --git a/df.g_src.renderer_2d.xml b/df.g_src.renderer_2d.xml
index ec8a914a6..ab07ab301 100644
--- a/df.g_src.renderer_2d.xml
+++ b/df.g_src.renderer_2d.xml
@@ -1,9 +1,14 @@
 <data-definition>
     <struct-type type-name='tile_cachest'>
-        <stl-unordered-map name='tile_cache' comment='unordered_map&lt;texture_fullid, SDL_Texture*\&gt;'/>
+        <extra-include filename="custom/hash/texture_fullid.h"/>
+        <stl-unordered-map name='tile_cache'>
+            <key-type type-name='texture_fullid'/>
+            <value-type type-name='pointer' comment='SDL_Texture*'/>
+        </stl-unordered-map>
     </struct-type>
 
     <class-type type-name='renderer_2d_base' inherits-from='renderer'>
+        <extra-include filename="custom/hash/texture_fullid.h"/>
         <pointer name='window' comment='SDL_Window*'/>
         <pointer name='sdl_renderer' comment='SDL_Renderer*'/>
         <pointer name='screen_tex' comment='SDL_Texture*'/>
diff --git a/df.item.xml b/df.item.xml
index 6b60ccead..1641218a1 100644
--- a/df.item.xml
+++ b/df.item.xml
@@ -2453,7 +2453,10 @@
 
         <stl-vector name='temp_save_compat' type-name='int32_t'/>
 
-        <stl-unordered-map name='deleters' comment='std::unordered_set&lt;df::item *&gt;'/>
+        <stl-unordered-set name='deleters'>
+            <pointer type-name='item'/>
+        </stl-unordered-set>
+
     </struct-type>
 
     <enum-type type-name='artifact_flags'> bay12: ArtifactFlagType
diff --git a/df.region_midmap.xml b/df.region_midmap.xml
index 34eff449d..e1297b550 100644
--- a/df.region_midmap.xml
+++ b/df.region_midmap.xml
@@ -270,7 +270,12 @@
         <int16_t name="loadarea_ex"/>
         <int16_t name="loadarea_ey"/>
 
-        <stl-map name="midmap_place" comment="std::map&lt;std::pair&lt;int16_t,int16_t&gt;,VIndex&gt;; not saved"/>
+        <stl-map name="midmap_place" comment="not saved">
+            <key-type>
+                <static-array type-name='int16_t' count='2'/>
+            </key-type>
+            <value-type type-name='int32_t'/>
+        </stl-map>
     </struct-type>
 </data-definition>
 
diff --git a/df.widgets.unit_list.xml b/df.widgets.unit_list.xml
index 3725ec578..d07ac4566 100644
--- a/df.widgets.unit_list.xml
+++ b/df.widgets.unit_list.xml
@@ -65,7 +65,10 @@
         <stl-vector type-name='sort_entry' name='sorting_by' comment='std::vector&lt;sort_entry&lt;item_or_unit&gt;&gt;'/>
         <stl-vector name='always_sorting_by'> <stl-function type-name='bool'/> </stl-vector>
         <stl-vector name='partitions'> <stl-function type-name='bool'/> </stl-vector>
-        <stl-unordered-map name='ascending_sort'/> std::unordered_map&lt;std::string,bool&gt;
+        <stl-unordered-map name='ascending_sort'>
+            <key-type type-name='stl-string'/>
+            <value-type type-name='bool'/>
+        </stl-unordered-map>
         <bitfield type-name='unit_list_sort_flag' name='sort_flags' base-type='uint8_t'/>
         <bitfield type-name='unit_list_flag' name='flags' base-type='uint8_t'/>
         <stl-vector name='filter_func'> <stl-function type-name='bool'/> </stl-vector>
@@ -76,8 +79,13 @@
         <stl-function name='close_callback'/>
         <stl-vector type-name='unit_list_options' name='options'/>
         <stl-vector type-name='item_or_unit' name='entry_list'/>
-        <stl-unordered-map name='selected' comment='std::unordered_set&lt;void *&gt;'/>
-        <stl-unordered-map type-name='stl-string' name='job_sort_str' comment='std::unordered_map&lt;void *,std::string&gt;'/>
+        <stl-unordered-set name='selected' comment='std::unordered_set&lt;void *&gt;'>
+            <pointer/>
+        </stl-unordered-set>
+        <stl-unordered-map name='job_sort_str'>
+            <key-type><pointer/></key-type>
+            <value-type><stl-string/></value-type>
+        </stl-unordered-map>
         <int32_t name='cursor_idx'/>
         <stl-function name='is_selected' comment='std::function&lt;bool(item_or_unit)&gt;'/>
         <stl-vector name='on_select_change'>
diff --git a/df.world.xml b/df.world.xml
index 9fd596fc0..54e6df574 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -340,7 +340,14 @@
         <stl-fs-path name='src_dir'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_name'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
-        <static-array count='23' name='token_by_mod_id'><stl-unordered-map/></static-array>
+        <static-array count='23' name='token_by_mod_id'>
+            <stl-unordered-map>
+                <key-type type-name='stl-string'/>
+                <value-type>
+                    <stl-vector type-name='stl-string'/>
+                </value-type>
+            </stl-unordered-map>
+        </static-array>
     </struct-type>
 
     <enum-type type-name='prepare_rod_stage_type' base-type='int32_t'> bay12: PrepareRodStageType
diff --git a/lower-1.xslt b/lower-1.xslt
index 0ff956bd4..101a8b03a 100644
--- a/lower-1.xslt
+++ b/lower-1.xslt
@@ -340,7 +340,7 @@ Error: field <xsl:value-of select='$enum-key'/> corresponds to an enum value of
     </xsl:template>
 
     <!-- Misc containers: meta='container' subtype='$tag' -->
-    <xsl:template match='stl-vector|stl-deque|stl-set|stl-bit-vector|stl-array|stl-map|stl-unordered-map|stl-optional|stl-variant|stl-shared-ptr|stl-weak-ptr|stl-function|df-flagarray|df-static-flagarray|df-array|df-linked-list'>
+    <xsl:template match='stl-vector|stl-deque|stl-set|stl-unordered-set|stl-bit-vector|stl-array|stl-optional|stl-variant|stl-shared-ptr|stl-weak-ptr|stl-function|df-flagarray|df-static-flagarray|df-array|df-linked-list'>
         <xsl:param name='level' select='-1'/>
         <ld:field ld:meta='container'>
             <xsl:attribute name='ld:level'><xsl:value-of select='$level'/></xsl:attribute>
@@ -352,6 +352,48 @@ Error: field <xsl:value-of select='$enum-key'/> corresponds to an enum value of
         </ld:field>
     </xsl:template>
 
+    <!-- Assoc containers: meta='container' keytype='$tag' subtype='$tag' -->
+    <xsl:template match='stl-map|stl-unordered-map'>
+        <xsl:param name='level' select='-1'/>
+        <ld:field ld:meta='container'>
+            <xsl:attribute name='ld:level'><xsl:value-of select='$level'/></xsl:attribute>
+            <xsl:attribute name='ld:subtype'><xsl:value-of select='name(.)'/></xsl:attribute>
+            <xsl:apply-templates select='@*'/>
+            <!--
+            <xsl:if test='@key-type'>
+                <xsl:copy-of select='text()[1]'/>
+                <key-type>
+                    <xsl:call-template name='lookup-type-ref'>
+                        <xsl:with-param name='name' select="@key-type"/>
+                        <xsl:with-param name="level" select="$level+1"/>
+                    </xsl:call-template>
+                </key-type>
+            </xsl:if>
+            -->
+            <xsl:call-template name='container'>
+                <xsl:with-param name='level' select="$level+1"/>
+            </xsl:call-template>
+        </ld:field>
+    </xsl:template>
+
+    <xsl:template match='key-type'>
+        <xsl:param name='level' select='-1'/>
+        <xsl:copy>
+            <xsl:call-template name='compound'>
+                <xsl:with-param name='level' select="$level"/>
+            </xsl:call-template>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match='value-type'>
+        <xsl:param name='level' select='-1'/>
+        <xsl:copy>
+            <xsl:call-template name='compound'>
+                <xsl:with-param name='level' select="$level"/>
+            </xsl:call-template>
+        </xsl:copy>
+    </xsl:template>
+
     <!-- Virtual methods -->
 
     <xsl:template match='vmethod|cmethod'>
diff --git a/lower-2.xslt b/lower-2.xslt
index 941e4d83d..10d31c90e 100644
--- a/lower-2.xslt
+++ b/lower-2.xslt
@@ -69,6 +69,18 @@
             <xsl:with-param name='tag' select="'ret-type'"/>
         </xsl:apply-templates>
     </xsl:template>
+
+    <xsl:template match='key-type[count(ld:field)=1]'>
+        <xsl:apply-templates select='ld:field'>
+            <xsl:with-param name='tag' select="'key-type'"/>
+        </xsl:apply-templates>
+    </xsl:template>
+
+    <xsl:template match='value-type[count(ld:field)=1]'>
+        <xsl:apply-templates select='ld:field'>
+            <xsl:with-param name='tag' select="'value-type'"/>
+        </xsl:apply-templates>
+    </xsl:template>
 </xsl:stylesheet>
 
 <!--