diff --git a/df.advmode.xml b/df.advmode.xml
index 1e56a784a..d38aa3845 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -128,15 +128,9 @@
         <int32_t name='unk18'/>
         <int32_t name='unk19'/>
 
-        <stl-vector name='unk20'>
-            <int32_t ref-target='world_site'/>
-        </stl-vector>
-        <stl-vector name='unk21'>
-            <int32_t/>
-        </stl-vector>
-        <stl-vector name='unk22'>
-            <int32_t/>
-        </stl-vector>
+        <stl-vector name='unk20' type-name='int32_t' ref-target='world_site'/>
+        <stl-vector name='unk21' type-name='int32_t'/>
+        <stl-vector name='unk22' type-name='int32_t'/>
 
         <int16_t name='unk23'/>
         <int16_t name='unk24'/>
@@ -169,9 +163,7 @@
         <stl-vector name='unk28'/>
         <stl-vector name='unk29'/>
         <stl-vector name='unk30'/>
-        <stl-vector name='actions'>
-            <pointer type-name='adventure_movement_option'/>
-        </stl-vector>
+        <stl-vector name='actions' pointer-type='adventure_movement_option'/>
         <stl-vector name='unk31' comment='v0.34.08'/>
 
         <int32_t name='unk32'/>
@@ -184,15 +176,11 @@
         <int32_t name='unk36'/>
 
         <compound name='companions'>
-            <stl-vector name='unit'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='unit' pointer-type='unit'/>
             <stl-bit-vector name='unit_visible'/>
             <compound name='unit_position' type-name='coord_path'/>
 
-            <stl-vector name='all_histfigs' comment='includes dead'>
-                <int32_t ref-target='historical_figure'/>
-            </stl-vector>
+            <stl-vector name='all_histfigs' comment='includes dead' type-name='int32_t' ref-target='historical_figure'/>
         </compound>
 
         <stl-vector name='unk37'/>
diff --git a/df.art.xml b/df.art.xml
index fa7a6656c..eaa659f6f 100644
--- a/df.art.xml
+++ b/df.art.xml
@@ -172,12 +172,8 @@
         <code-helper name='find-instance'>$(find-instance $art_image_chunk $$).images[$]</code-helper>
         <code-helper name='describe'>(describe-obj $.name)</code-helper>
 
-        <stl-vector name='elements'>
-            <pointer type-name='art_image_element'/>
-        </stl-vector>
-        <stl-vector name='properties'>
-            <pointer type-name='art_image_property'/>
-        </stl-vector>
+        <stl-vector name='elements' pointer-type='art_image_element'/>
+        <stl-vector name='properties' pointer-type='art_image_property'/>
 
         <int32_t name='event' ref-target='history_event'/>
         <compound name='name' type-name='language_name'/>
diff --git a/df.building-raws.xml b/df.building-raws.xml
index 9a24a47bd..346dfd7aa 100644
--- a/df.building-raws.xml
+++ b/df.building-raws.xml
@@ -33,9 +33,7 @@
         <int32_t name='build_key'/>
         <bool name='needs_magma'/>
 
-        <stl-vector name="build_items">
-            <pointer type-name='building_def_item'/>
-        </stl-vector>
+        <stl-vector name="build_items" pointer-type='building_def_item'/>
 
         <int32_t name="dim_x"/>
         <int32_t name="dim_y"/>
diff --git a/df.buildings.xml b/df.buildings.xml
index 2deb57dcc..cb812e39e 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -238,24 +238,14 @@
         <int16_t name='race' ref-target='creature_raw'/>
         <int32_t name='id' init-value='-1'/>
 
-        <stl-vector name='jobs'>
-            <pointer type-name='job'/>
-        </stl-vector>
-        <stl-vector name='specific_refs'>
-            <pointer type-name='specific_ref'/>
-        </stl-vector>
-        <stl-vector name='general_refs'>
-            <pointer type-name='general_ref'/>
-        </stl-vector>
+        <stl-vector name='jobs' pointer-type='job'/>
+        <stl-vector name='specific_refs' pointer-type='specific_ref'/>
+        <stl-vector name='general_refs' pointer-type='general_ref'/>
 
         <bool name='is_room'/>
 
-        <stl-vector name='children' comment='other buildings within this room'>
-            <pointer type-name='building'/>
-        </stl-vector>
-        <stl-vector name='parents' comment='rooms this building belongs to'>
-            <pointer type-name='building'/>
-        </stl-vector>
+        <stl-vector name='children' pointer-type='building' comment='other buildings within this room'/>
+        <stl-vector name='parents' pointer-type='building' comment='rooms this building belongs to'/>
 
         <pointer type-name='unit' name='owner'/>
 
@@ -446,7 +436,7 @@
 
             <vmethod name='getSquads'>
                 <ret-type>
-                    <pointer><stl-vector><pointer type-name='building_squad_use'/></stl-vector></pointer>
+                    <pointer><stl-vector pointer-type='building_squad_use'/></pointer>
                 </ret-type>
             </vmethod>
             <vmethod name='getSpecificSquad' ret-type='int32_t'/>
@@ -463,18 +453,10 @@
     -- stockpile --
 
     <struct-type type-name='stockpile_links'>
-        <stl-vector name='give_to_pile'>
-            <pointer type-name='building'/>
-        </stl-vector>
-        <stl-vector name='take_from_pile'>
-            <pointer type-name='building'/>
-        </stl-vector>
-        <stl-vector name='give_to_workshop'>
-            <pointer type-name='building'/>
-        </stl-vector>
-        <stl-vector name='take_from_workshop'>
-            <pointer type-name='building'/>
-        </stl-vector>
+        <stl-vector name='give_to_pile' pointer-type='building'/>
+        <stl-vector name='take_from_pile' pointer-type='building'/>
+        <stl-vector name='give_to_workshop' pointer-type='building'/>
+        <stl-vector name='take_from_workshop' pointer-type='building'/>
     </struct-type>
 
     <class-type type-name='building_stockpilest' inherits-from='building'>
@@ -487,9 +469,7 @@
         <stl-vector name='container_type'>
             <enum base-type='int16_t' type-name='item_type'/>
         </stl-vector>
-        <stl-vector name='container_item_id'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
+        <stl-vector name='container_item_id' type-name='int32_t' ref-target='item'/>
         <stl-vector name='container_x' type-name='int16_t'/>
         <stl-vector name='container_y' type-name='int16_t'/>
 
@@ -498,9 +478,7 @@
         <int32_t name='use_links_only'/>
         <int32_t name='stockpile_number' init-value='-1'/>
 
-        <stl-vector name='linked_stops'>
-            <pointer type-name='hauling_stop'/>
-        </stl-vector>
+        <stl-vector name='linked_stops' pointer-type='hauling_stop'/>
     </class-type>
 
     -- zone --
@@ -558,12 +536,8 @@
     </enum-type>
 
     <class-type type-name='building_civzonest' inherits-from='building'>
-        <stl-vector name='assigned_units'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
-        <stl-vector name='assigned_items'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
+        <stl-vector name='assigned_units' type-name='int32_t' ref-target='unit'/>
+        <stl-vector name='assigned_items' type-name='int32_t' ref-target='item'/>
         <enum base-type='int32_t' name="type" type-name='civzone_type' comment='only saved as int16'/>
         <bitfield name='zone_flags' base-type='uint32_t'>
             <flag-bit name='water_source'/>
@@ -692,9 +666,7 @@
     </enum-type>
 
     <struct-type type-name='workshop_profile'>
-        <stl-vector name="permitted_workers">
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name="permitted_workers" type-name='int32_t' ref-target='unit'/>
         <int32_t name="min_level"/>
         <int32_t name="max_level" init-value='3000'/>
     </struct-type>
@@ -729,9 +701,7 @@
     <class-type type-name='building_armorstandst' inherits-from='building_actual'>
         <int16_t name='unk_c0'/>
 
-        <stl-vector name='squads'>
-            <pointer type-name='building_squad_use'/>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='building_squad_use'/>
         <int32_t name='specific_squad' ref-target='squad'/>
         <int32_t name='specific_position' init-value='-1'/>
     </class-type>
@@ -747,9 +717,7 @@
     </class-type>
 
     <struct-type type-name='building_users'>
-        <stl-vector name='unit'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name='unit' type-name='int32_t' ref-target='unit'/>
         <stl-vector name='mode' type-name='int16_t'/>
     </struct-type>
 
@@ -758,9 +726,7 @@
             <flag-bit name='barracks'/>
             <flag-bit name='dormitory'/>
         </bitfield>
-        <stl-vector name='squads'>
-            <pointer type-name='building_squad_use'/>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='building_squad_use'/>
         <int32_t name='specific_squad' ref-target='squad'/>
         <int32_t name='specific_position' init-value='-1'/>
         <compound name='users' type-name='building_users'/>
@@ -768,9 +734,7 @@
 
     <class-type type-name='building_boxst' inherits-from='building_actual'>
         <int16_t/>
-        <stl-vector name='squads'>
-            <pointer type-name='building_squad_use'/>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='building_squad_use'/>
         <int32_t name='specific_squad' ref-target='squad'/>
         <int32_t name='specific_position' init-value='-1'/>
     </class-type>
@@ -790,20 +754,14 @@
 
     <class-type type-name='building_cabinetst' inherits-from='building_actual'>
         <int16_t/>
-        <stl-vector name='squads'>
-            <pointer type-name='building_squad_use'/>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='building_squad_use'/>
         <int32_t name='specific_squad' ref-target='squad'/>
         <int32_t name='specific_position' init-value='-1'/>
     </class-type>
 
     <class-type type-name='building_cagest' inherits-from='building_actual'>
-        <stl-vector name='assigned_units'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
-        <stl-vector name='assigned_items'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
+        <stl-vector name='assigned_units' type-name='int32_t' ref-target='unit'/>
+        <stl-vector name='assigned_items' type-name='int32_t' ref-target='item'/>
         <bitfield base-type='uint16_t' name='cage_flags'>
             <flag-bit name='triggered'/>
         </bitfield>
@@ -1056,9 +1014,7 @@
             <flag-bit name='disabling'/>
             <flag-bit name='enabling'/>
         </bitfield>
-        <stl-vector name='linked_mechanisms'>
-            <pointer type-name='item'/>
-        </stl-vector>
+        <stl-vector name='linked_mechanisms' pointer-type='item'/>
         <stl-vector name='observed_by_civs' type-name='int32_t' ref-target='historical_entity'/>
 
         <compound name='profile' type-name='workshop_profile'/>
@@ -1089,9 +1045,7 @@
     <class-type type-name='building_weaponrackst' inherits-from='building_actual'>
         <int16_t name='unk_c0'/>
 
-        <stl-vector name='squads'>
-            <pointer type-name='building_squad_use'/>
-        </stl-vector>
+        <stl-vector name='squads' pointer-type='building_squad_use'/>
         <int32_t name='specific_squad' ref-target='squad'/>
     </class-type>
 
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
index f22e06b6c..0abad1b0e 100644
--- a/df.creature-raws.xml
+++ b/df.creature-raws.xml
@@ -429,9 +429,7 @@
 
         <df-flagarray name='flags' index-enum='body_part_raw_flags'/>
 
-        <stl-vector name='layers'>
-            <pointer type-name='body_part_layer_raw'/>
-        </stl-vector>
+        <stl-vector name='layers' pointer-type='body_part_layer_raw'/>
 
         <int32_t name='fraction_total'/>
         <int32_t name='fraction_base'/>
@@ -443,12 +441,8 @@
 
         <int16_t name='unk7b'/>
 
-        <stl-vector name='name_singular'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='name_plural'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='name_singular' pointer-type='stl-string'/>
+        <stl-vector name='name_plural' pointer-type='stl-string'/>
 
         <pointer name='bp_relation_part_id'>
             <stl-vector type-name='int16_t'/>
@@ -589,9 +583,7 @@
     </struct-type>
 
     <struct-type type-name='caste_body_info'>
-        <stl-vector name='body_parts'>
-            <pointer type-name='body_part_raw'/>
-        </stl-vector>
+        <stl-vector name='body_parts' pointer-type='body_part_raw'/>
 
         <stl-vector name='attacks' pointer-type='caste_attack'/>
 
@@ -639,9 +631,7 @@
         <int32_t name='fraction_muscle'/>
 
         <pointer name='clothing_items' comment='v0.34.06'>
-            <stl-vector>
-                <pointer type-name='caste_clothing_item'/>
-            </stl-vector>
+            <stl-vector pointer-type='caste_clothing_item'/>
         </pointer>
     </struct-type>
 
@@ -789,9 +779,7 @@
                         index-refers-to='$$._parent.style_layer_idx[$].refers-to'/>
         </compound>
 
-        <stl-vector name='color_modifiers'>
-            <pointer type-name='color_modifier_raw'/>
-        </stl-vector>
+        <stl-vector name='color_modifiers' pointer-type='color_modifier_raw'/>
         <stl-vector name='tissue_styles' pointer-type='tissue_style_raw'/>
         <stl-vector name='shearable_tissue_layer'>
             <pointer>
@@ -828,9 +816,7 @@
             <stl-vector type-name='int16_t' name='extract_mat'/>
             <stl-vector type-name='int32_t' name='extract_matidx'/>
             <static-array name='extract_str' count='3'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
 
             <int16_t name='milkable_mat'/>
@@ -883,9 +869,7 @@
             <stl-vector type-name='int16_t' name='egg_material_mattype'/>
             <stl-vector type-name='int32_t' name='egg_material_matindex'/>
             <static-array name='egg_material_str' count='3'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
 
             <stl-vector name='lays_unusual_eggs_itemtype'>
@@ -895,17 +879,13 @@
             <stl-vector type-name='int16_t' name='lays_unusual_eggs_mattype'/>
             <stl-vector type-name='int32_t' name='lays_unusual_eggs_matindex'/>
             <static-array name='lays_unusual_eggs_str' count='5'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
         </compound>
 
         <stl-vector name='unk22'/>
 
-        <stl-vector name='creature_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='creature_class' pointer-type='stl-string'/>
 
         <compound name='unknown2'>
             <stl-vector name='unk23a' type-name='int32_t'/>
@@ -1023,14 +1003,10 @@
 
         <int32_t name='adultsize'/>
 
-        <stl-vector name='prefstring'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='prefstring' pointer-type='stl-string'/>
 
         <stl-vector type-name='int16_t' name='sphere'/>
-        <stl-vector name='caste'>
-            <pointer type-name='caste_raw'/>
-        </stl-vector>
+        <stl-vector name='caste' pointer-type='caste_raw'/>
 
         <stl-vector type-name='int32_t' name='pop_ratio'/>
 
@@ -1094,9 +1070,7 @@
         <stl-vector name='speech2' type-name='int32_t'/>
         <stl-vector name='speech3'/>
 
-        <stl-vector name='material'>
-            <pointer type-name='material'/>
-        </stl-vector>
+        <stl-vector name='material' pointer-type='material'/>
         <stl-vector type-name='pointer' name='tissue'/>
 
         <compound name='profession_name'>
@@ -1138,17 +1112,13 @@
             <compound name='material' type-name='material_vec_ref'/>
 
             <static-array name='tmpstr' count='5'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
         </compound>
 
         <int32_t name='next_modifier_id'/>
 
-        <stl-vector name='raws'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='raws' pointer-type='stl-string'/>
     </struct-type>
 
     <struct-type type-name='creature_variation_convert_tag'>
@@ -1159,15 +1129,9 @@
 
     <struct-type type-name='creature_variation' instance-vector='$global.world.raws.creature_variations'>
         <stl-string name='id'/>
-        <stl-vector name='cv_convert_tag'>
-            <pointer type-name='creature_variation_convert_tag'/>
-        </stl-vector>
-        <stl-vector name='cv_new_tag'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='cv_remove_tag'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='cv_convert_tag' pointer-type='creature_variation_convert_tag'/>
+        <stl-vector name='cv_new_tag' pointer-type='stl-string'/>
+        <stl-vector name='cv_remove_tag' pointer-type='stl-string'/>
     </struct-type>
 
     <enum-type type-name='body_part_template_flags'>
@@ -1227,19 +1191,13 @@
         <int32_t name='default_relsize'/>
         <int32_t name='number'/>
 
-        <stl-vector name='name_singular' comment='first comes from BP, rest come from INDIVIDUAL_NAME'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='name_plural'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='name_singular' pointer-type='stl-string' comment='first comes from BP, rest come from INDIVIDUAL_NAME'/>
+        <stl-vector name='name_plural' pointer-type='stl-string'/>
     </struct-type>
 
     <struct-type type-name='body_template' instance-vector='$global.world.raws.body_templates'>
         <stl-string name='id'/>
-        <stl-vector name='parts'>
-            <pointer type-name='body_part_template'/>
-        </stl-vector>
+        <stl-vector name='parts' pointer-type='body_part_template'/>
     </struct-type>
 
     <enum-type type-name='tissue_template_flags'>
@@ -1291,10 +1249,10 @@
 
     <struct-type type-name='body_detail_plan' instance-vector='$global.world.raws.body_detail_plans'>
         <stl-string name='id'/>
-        <stl-vector name='add_material_name'> <pointer type-name='stl-string'/> </stl-vector>
-        <stl-vector name='add_material_template'> <pointer type-name='stl-string'/> </stl-vector>
-        <stl-vector name='add_tissue_name'> <pointer type-name='stl-string'/> </stl-vector>
-        <stl-vector name='add_tissue_template'> <pointer type-name='stl-string'/> </stl-vector>
+        <stl-vector name='add_material_name' pointer-type='stl-string'/>
+        <stl-vector name='add_material_template' pointer-type='stl-string'/>
+        <stl-vector name='add_tissue_name' pointer-type='stl-string'/>
+        <stl-vector name='add_tissue_template' pointer-type='stl-string'/>
         <stl-vector name='unk5c'/>
         <stl-vector name='unk6c'/>
         <stl-vector name='unk7c'/>
diff --git a/df.descriptors.xml b/df.descriptors.xml
index aa880dd70..b7c8dc128 100644
--- a/df.descriptors.xml
+++ b/df.descriptors.xml
@@ -12,9 +12,7 @@
         <stl-string name="id"/>
         <code-helper name='describe'>$.id</code-helper>
         <stl-vector name="word_unk"/>
-        <stl-vector name="words">
-            <int32_t ref-target='language_word'/>
-        </stl-vector>
+        <stl-vector name="words" type-name='int32_t' ref-target='language_word'/>
         <stl-string name="name"/>
         <int16_t name="unk_58"/>
         <s-float name="red"/>
@@ -26,14 +24,10 @@
         <stl-string name="id"/>
         <code-helper name='describe'>$.id</code-helper>
         <stl-vector name="word_unk"/>
-        <stl-vector name="words">
-            <int32_t ref-target='language_word'/>
-        </stl-vector>
+        <stl-vector name="words" type-name='int32_t' ref-target='language_word'/>
         <stl-string name="name"/>
         <stl-string name="name_plural"/>
-        <stl-vector name="adj">
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name="adj" pointer-type='stl-string'/>
 
         <bitfield name='gems_use'>
             <flag-bit name='noun'/>
@@ -47,9 +41,7 @@
     <struct-type type-name='descriptor_pattern' instance-vector='$global.world.raws.language.patterns'>
         <stl-string name='id'/>
         <code-helper name='describe'>$.id</code-helper>
-        <stl-vector name="colors">
-            <int16_t ref-target='descriptor_color'/>
-        </stl-vector>
+        <stl-vector name="colors" type-name='int16_t' ref-target='descriptor_color'/>
         <enum base-type='int16_t' type-name='pattern_type' name='pattern'/>
         <stl-vector name="cp_color"/>
     </struct-type>
diff --git a/df.entities.xml b/df.entities.xml
index 284c1061c..824ad922b 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -79,14 +79,10 @@
         <int32_t/>
         <int32_t/>
         <int32_t/>
-        <stl-vector name='animals'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name='animals' type-name='int32_t' ref-target='unit'/>
         <pointer type-name='entity_sell_prices' name='sell_prices'/>
         <pointer type-name='entity_buy_prices' name='buy_prices'/>
-        <stl-vector name='goods'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
+        <stl-vector name='goods' type-name='int32_t' ref-target='item'/>
         <int32_t/>
         <pointer/>
     </struct-type>
@@ -225,12 +221,8 @@
             <flag-bit name='worshipping'/>
         </bitfield>
 
-        <stl-vector name='entity_links'>
-            <pointer type-name='entity_entity_link'/>
-        </stl-vector>
-        <stl-vector name='site_links'>
-            <pointer type-name='entity_site_link'/>
-        </stl-vector>
+        <stl-vector name='entity_links' pointer-type='entity_entity_link'/>
+        <stl-vector name='site_links' pointer-type='entity_site_link'/>
 
         <stl-vector name='histfig_ids' type-name='int32_t' ref-target='historical_figure'/>
 
@@ -307,19 +299,11 @@
                 <compound name='meat' type-name='material_vec_ref'/>
             </compound>
 
-            <stl-vector name='fish_races'>
-                <int32_t ref-target='creature_raw'/>
-            </stl-vector>
-            <stl-vector name='fish_castes'>
-                <int16_t ref-target='caste_raw' aux-value='$$._parent.fish_races[$._key]'/>
-            </stl-vector>
+            <stl-vector name='fish_races' type-name='int32_t' ref-target='creature_raw'/>
+            <stl-vector name='fish_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.fish_races[$._key]'/>
 
-            <stl-vector name='egg_races'>
-                <int32_t ref-target='creature_raw'/>
-            </stl-vector>
-            <stl-vector name='egg_castes'>
-                <int16_t ref-target='caste_raw' aux-value='$$._parent.egg_races[$._key]'/>
-            </stl-vector>
+            <stl-vector name='egg_races' type-name='int32_t' ref-target='creature_raw'/>
+            <stl-vector name='egg_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.egg_races[$._key]'/>
 
             <compound name='plants' type-name='material_vec_ref'/>
             <compound name='seeds' type-name='material_vec_ref'/>
@@ -333,49 +317,21 @@
             </compound>
 
             <compound name='animals'>
-                <stl-vector name='pet_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='wagon_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='pack_animal_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='wagon_puller_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='mount_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='minion_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-                <stl-vector name='exotic_pet_races'>
-                    <int32_t ref-target='creature_raw'/>
-                </stl-vector>
-
-                <stl-vector name='pet_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.pet_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='wagon_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.wagon_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='pack_animal_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.pack_animal_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='wagon_puller_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.wagon_puller_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='mount_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.mount_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='minion_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.minion_races[$._key]'/>
-                </stl-vector>
-                <stl-vector name='exotic_pet_castes'>
-                    <int16_t ref-target='caste_raw' aux-value='$$._parent.unk728_races[$._key]'/>
-                </stl-vector>
+                <stl-vector name='pet_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='wagon_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='pack_animal_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='wagon_puller_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='mount_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='minion_races' type-name='int32_t' ref-target='creature_raw'/>
+                <stl-vector name='exotic_pet_races' type-name='int32_t' ref-target='creature_raw'/>
+
+                <stl-vector name='pet_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.pet_races[$._key]'/>
+                <stl-vector name='wagon_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.wagon_races[$._key]'/>
+                <stl-vector name='pack_animal_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.pack_animal_races[$._key]'/>
+                <stl-vector name='wagon_puller_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.wagon_puller_races[$._key]'/>
+                <stl-vector name='mount_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.mount_races[$._key]'/>
+                <stl-vector name='minion_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.minion_races[$._key]'/>
+                <stl-vector name='exotic_pet_castes' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.unk728_races[$._key]'/>
             </compound>
 
             <stl-vector name='meat_fish_recipes'>
@@ -485,21 +441,13 @@
         </compound>
 
         <compound name='positions'>
-            <stl-vector name='own'>
-                <pointer type-name='entity_position'/>
-            </stl-vector>
-            <stl-vector name='site'>
-                <pointer type-name='entity_position'/>
-            </stl-vector>
-            <stl-vector name='conquered_site'>
-                <pointer type-name='entity_position'/>
-            </stl-vector>
+            <stl-vector name='own' pointer-type='entity_position'/>
+            <stl-vector name='site' pointer-type='entity_position'/>
+            <stl-vector name='conquered_site' pointer-type='entity_position'/>
 
             <int32_t name='next_position_id'/>
 
-            <stl-vector name='assignments'>
-                <pointer type-name='entity_position_assignment'/>
-            </stl-vector>
+            <stl-vector name='assignments' pointer-type='entity_position_assignment'/>
 
             <int32_t name='next_assignment_id'/>
         </compound>
@@ -518,9 +466,7 @@
             </stl-vector>
         </compound>
 
-        <stl-vector name='squads'>
-            <int32_t ref-target='squad'/>
-        </stl-vector>
+        <stl-vector name='squads' type-name='int32_t' ref-target='squad'/>
 
         <compound name='unknown1d'>
             <int32_t name='unk42'/>
@@ -556,12 +502,8 @@
             <stl-vector name='unk50' type-name='pointer' comment='empty'/>
         </compound>
 
-        <stl-vector name='hist_figures'>
-            <pointer type-name='historical_figure'/>
-        </stl-vector>
-        <stl-vector name='nemesis'>
-            <pointer type-name='nemesis_record'/>
-        </stl-vector>
+        <stl-vector name='hist_figures' pointer-type='historical_figure'/>
+        <stl-vector name='nemesis' pointer-type='nemesis_record'/>
 
         <compound name='unknown2a'>
             <compound name='flour_sugar' type-name='material_vec_ref'/>
@@ -574,9 +516,7 @@
 
         <static-array name='assignments_by_type' count='25'
                       index-enum='entity_position_responsibility'>
-            <stl-vector>
-                <pointer type-name='entity_position_assignment'/>
-            </stl-vector>
+            <stl-vector pointer-type='entity_position_assignment'/>
         </static-array>
 
         <compound name='claims'>
@@ -687,15 +627,11 @@
 
         <df-flagarray name='flags' index-enum='entity_position_flags'/>
 
-        <stl-vector name='allowed_creature' type-name='int32_t'/>
-        <stl-vector name='allowed_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='allowed_creature' type-name='int32_t' ref-target='creature_raw'/>
+        <stl-vector name='allowed_class' pointer-type='stl-string'/>
 
-        <stl-vector name='rejected_creature' type-name='int32_t'/>
-        <stl-vector name='rejected_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='rejected_creature' type-name='int32_t' ref-target='creature_raw'/>
+        <stl-vector name='rejected_class' pointer-type='stl-string'/>
 
         <static-array type-name='stl-string' name='name' count='2'/>
         <static-array type-name='stl-string' name='name_female' count='2'/>
@@ -709,9 +645,7 @@
         <int16_t name='squad_size'/>
 
         <stl-vector name='commander_id' type-name='int32_t'/>
-        <stl-vector name='commander_civ'>
-            <int32_t ref-target='historical_entity'/>
-        </stl-vector>
+        <stl-vector name='commander_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='commander_types' type-name='int16_t'/>
 
         <int16_t name='land_holder'/>
@@ -724,9 +658,7 @@
         <int16_t name='number' init-value='1'/>
 
         <stl-vector name='appointed_by' type-name='int32_t'/>
-        <stl-vector name='appointed_by_civ'>
-            <int32_t ref-target='historical_entity'/>
-        </stl-vector>
+        <stl-vector name='appointed_by_civ' type-name='int32_t' ref-target='historical_entity'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
         <static-array type-name='bool' name='responsibilities' count='25' index-enum='entity_position_responsibility'/>
@@ -834,9 +766,7 @@
         </static-array>
 
         <static-array name='uniform_item_info' count='7' index-enum='uniform_category'>
-            <stl-vector>
-                <pointer type-name='entity_uniform_item'/>
-            </stl-vector>
+            <stl-vector pointer-type='entity_uniform_item'/>
         </static-array>
 
         <stl-string name="name"/>
diff --git a/df.entity-raws.xml b/df.entity-raws.xml
index 543399c70..3a4e0793c 100644
--- a/df.entity-raws.xml
+++ b/df.entity-raws.xml
@@ -128,56 +128,24 @@
 
         <code-helper name='describe'>$.translation</code-helper>
 
-        <stl-vector name='creature_ids'>
-            <int16_t ref-target='creature_raw'/>
-        </stl-vector>
-        <stl-vector name='creatures'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='creature_ids' type-name='int16_t' ref-target='creature_raw'/>
+        <stl-vector name='creatures' pointer-type='stl-string'/>
 
         <compound name='equipment'>
-            <stl-vector name='digger_id'>
-                <int16_t ref-target='itemdef_weaponst'/>
-            </stl-vector>
-            <stl-vector name='weapon_id'>
-                <int16_t ref-target='itemdef_weaponst'/>
-            </stl-vector>
-            <stl-vector name='armor_id'>
-                <int16_t ref-target='itemdef_armorst'/>
-            </stl-vector>
-            <stl-vector name='ammo_id'>
-                <int16_t ref-target='itemdef_ammost'/>
-            </stl-vector>
-            <stl-vector name='helm_id'>
-                <int16_t ref-target='itemdef_helmst'/>
-            </stl-vector>
-            <stl-vector name='gloves_id'>
-                <int16_t ref-target='itemdef_glovesst'/>
-            </stl-vector>
-            <stl-vector name='shoes_id'>
-                <int16_t ref-target='itemdef_shoesst'/>
-            </stl-vector>
-            <stl-vector name='pants_id'>
-                <int16_t ref-target='itemdef_pantsst'/>
-            </stl-vector>
-            <stl-vector name='shield_id'>
-                <int16_t ref-target='itemdef_shieldst'/>
-            </stl-vector>
-            <stl-vector name='trapcomp_id'>
-                <int16_t ref-target='itemdef_trapcompst'/>
-            </stl-vector>
-            <stl-vector name='toy_id'>
-                <int16_t ref-target='itemdef_toyst'/>
-            </stl-vector>
-            <stl-vector name='instrument_id'>
-                <int16_t ref-target='itemdef_instrumentst'/>
-            </stl-vector>
-            <stl-vector name='tool_id'>
-                <int16_t ref-target='itemdef_toolst'/>
-            </stl-vector>
-            <stl-vector name='siegeammo_id'>
-                <int16_t ref-target='itemdef_siegeammost'/>
-            </stl-vector>
+            <stl-vector name='digger_id' type-name='int16_t' ref-target='itemdef_weaponst'/>
+            <stl-vector name='weapon_id' type-name='int16_t' ref-target='itemdef_weaponst'/>
+            <stl-vector name='armor_id' type-name='int16_t' ref-target='itemdef_armorst'/>
+            <stl-vector name='ammo_id' type-name='int16_t' ref-target='itemdef_ammost'/>
+            <stl-vector name='helm_id' type-name='int16_t' ref-target='itemdef_helmst'/>
+            <stl-vector name='gloves_id' type-name='int16_t' ref-target='itemdef_glovesst'/>
+            <stl-vector name='shoes_id' type-name='int16_t' ref-target='itemdef_shoesst'/>
+            <stl-vector name='pants_id' type-name='int16_t' ref-target='itemdef_pantsst'/>
+            <stl-vector name='shield_id' type-name='int16_t' ref-target='itemdef_shieldst'/>
+            <stl-vector name='trapcomp_id' type-name='int16_t' ref-target='itemdef_trapcompst'/>
+            <stl-vector name='toy_id' type-name='int16_t' ref-target='itemdef_toyst'/>
+            <stl-vector name='instrument_id' type-name='int16_t' ref-target='itemdef_instrumentst'/>
+            <stl-vector name='tool_id' type-name='int16_t' ref-target='itemdef_toolst'/>
+            <stl-vector name='siegeammo_id' type-name='int16_t' ref-target='itemdef_siegeammost'/>
 
             <stl-vector name='armor_rarity' type-name='int8_t'/>
             <stl-vector name='helm_rarity' type-name='int8_t'/>
@@ -185,48 +153,20 @@
             <stl-vector name='shoes_rarity' type-name='int8_t'/>
             <stl-vector name='pants_rarity' type-name='int8_t'/>
 
-            <stl-vector name='digger_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='weapon_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='armor_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='ammo_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='helm_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='gloves_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='shoes_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='pants_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='shield_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='trapcomp_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='toy_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='instrument_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='siegeammo_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='tool_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='digger_str' pointer-type='stl-string'/>
+            <stl-vector name='weapon_str' pointer-type='stl-string'/>
+            <stl-vector name='armor_str' pointer-type='stl-string'/>
+            <stl-vector name='ammo_str' pointer-type='stl-string'/>
+            <stl-vector name='helm_str' pointer-type='stl-string'/>
+            <stl-vector name='gloves_str' pointer-type='stl-string'/>
+            <stl-vector name='shoes_str' pointer-type='stl-string'/>
+            <stl-vector name='pants_str' pointer-type='stl-string'/>
+            <stl-vector name='shield_str' pointer-type='stl-string'/>
+            <stl-vector name='trapcomp_str' pointer-type='stl-string'/>
+            <stl-vector name='toy_str' pointer-type='stl-string'/>
+            <stl-vector name='instrument_str' pointer-type='stl-string'/>
+            <stl-vector name='siegeammo_str' pointer-type='stl-string'/>
+            <stl-vector name='tool_str' pointer-type='stl-string'/>
         </compound>
 
         <stl-vector name='currency_value' type-name='int32_t'
@@ -293,9 +233,7 @@
         <int32_t name='max_pop_number'/>
         <int32_t name='max_starting_civ_number'/>
 
-        <stl-vector name='religion'>
-            <int16_t/>
-        </stl-vector>
+        <stl-vector name='religion' type-name='int16_t'/>
         <stl-vector name='religion_sphere'>
             <enum base-type='int16_t' type-name='sphere_type'/>
         </stl-vector>
@@ -312,9 +250,7 @@
                           index-enum='world_construction_type' count='4'/>
         </compound>
 
-        <stl-vector name='positions'>
-            <pointer type-name='entity_position_raw'/>
-        </stl-vector>
+        <stl-vector name='positions' pointer-type='entity_position_raw'/>
 
         <static-array name='variable_positions' type-name='int8_t'
                       index-enum='entity_position_responsibility' count='25'/>
@@ -329,18 +265,10 @@
         </stl-vector>
 
         <compound name='workshops'>
-            <stl-vector name='permitted_building_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='permitted_building_id'>
-                <int32_t ref-target='building_def'/>
-            </stl-vector>
-            <stl-vector name='permitted_reaction_str'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
-            <stl-vector name='permitted_reaction_id'>
-                <int32_t/>
-            </stl-vector>
+            <stl-vector name='permitted_building_str' pointer-type='stl-string'/>
+            <stl-vector name='permitted_building_id' type-name='int32_t' ref-target='building_def'/>
+            <stl-vector name='permitted_reaction_str' pointer-type='stl-string'/>
+            <stl-vector name='permitted_reaction_id' type-name='int32_t' ref-target='reaction'/>
         </compound>
 
         <compound name='land_holder_trigger'>
@@ -354,12 +282,8 @@
         <stl-vector name='unk2'/>
         <stl-vector name='currency'/>
 
-        <stl-vector name='gem_shapes' comment='v0.34.01'>
-            <int32_t ref-target='descriptor_shape'/>
-        </stl-vector>
-        <stl-vector name='stone_shapes' comment='v0.34.01'>
-            <int32_t ref-target='descriptor_shape'/>
-        </stl-vector>
+        <stl-vector name='gem_shapes' comment='v0.34.01' type-name='int32_t' ref-target='descriptor_shape'/>
+        <stl-vector name='stone_shapes' comment='v0.34.01' type-name='int32_t' ref-target='descriptor_shape'/>
 
         <stl-vector comment='v0.34.01'/>
         <stl-vector comment='v0.34.01'/>
@@ -427,20 +351,16 @@
         <df-flagarray name='flags' index-enum='entity_position_raw_flags'/>
 
         <static-array name='allowed_creature_str' count='2'>
-            <stl-vector><pointer type-name='stl-string'/></stl-vector>
+            <stl-vector pointer-type='stl-string'/>
         </static-array>
-        <stl-vector name='allowed_creature' type-name='int32_t'/>
-        <stl-vector name='allowed_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='allowed_creature' type-name='int32_t' ref-target='creature_raw'/>
+        <stl-vector name='allowed_class' pointer-type='stl-string'/>
 
         <static-array name='rejected_creature_str' count='2'>
-            <stl-vector><pointer type-name='stl-string'/></stl-vector>
+            <stl-vector pointer-type='stl-string'/>
         </static-array>
-        <stl-vector name='rejected_creature' type-name='int32_t'/>
-        <stl-vector name='rejected_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='rejected_creature' type-name='int32_t' ref-target='creature_raw'/>
+        <stl-vector name='rejected_class' pointer-type='stl-string'/>
 
         <static-array type-name='stl-string' name='name' count='2'/>
         <static-array type-name='stl-string' name='name_female' count='2'/>
@@ -453,9 +373,7 @@
 
         <int16_t name='squad_size'/>
 
-        <stl-vector name='commander_str'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='commander_str' pointer-type='stl-string'/>
         <stl-vector name='commander_id' type-name='int32_t'/>
         <stl-vector name='commander_types' type-name='int16_t'/>
 
@@ -467,14 +385,10 @@
         <stl-string name='replaced_by_str'/>
         <int32_t name='replaced_by'/>
 
-        <stl-vector name='appointed_by_str'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='appointed_by_str' pointer-type='stl-string'/>
         <stl-vector name='appointed_by' type-name='int32_t'/>
 
-        <stl-vector name='succession_by_position_str'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='succession_by_position_str' pointer-type='stl-string'/>
         <stl-vector name='succession_by_position' type-name='int32_t'/>
 
         <static-array type-name='bool' name='responsibilities' count='25' index-enum='entity_position_responsibility'/>
diff --git a/df.globals.xml b/df.globals.xml
index 8b837ea1c..77f6447a6 100644
--- a/df.globals.xml
+++ b/df.globals.xml
@@ -80,9 +80,7 @@
     <!-- To find: with world, place cursor over unit, and trace pointers to unit -->
     <global-object name='cursor_unit_list'>
         <padding size='65536'/>
-        <stl-vector name='units'>
-            <pointer type-name='unit'/>
-        </stl-vector>
+        <stl-vector name='units' pointer-type='unit'/>
     </global-object>
 
     <global-object name='d_init' type-name='d_init'/>
@@ -102,9 +100,7 @@
     <global-object name='texture' type-name='texture_handler'/>
 
     <global-object name='timed_events'>
-        <stl-vector>
-            <pointer type-name='timed_event'/>
-        </stl-vector>
+        <stl-vector pointer-type='timed_event'/>
     </global-object>
 
     <!-- To find: create squad, enter the 's' menu, trace pointers to squad -->
@@ -123,14 +119,10 @@
     </global-object>
     <!-- Candidates for a building owner. To find: backtrack from unit. -->
     <global-object name='ui_building_assign_units'>
-        <stl-vector>
-            <pointer type-name='unit'/>
-        </stl-vector>
+        <stl-vector pointer-type='unit'/>
     </global-object>
     <global-object name='ui_building_assign_items'>
-        <stl-vector>
-            <pointer type-name='item'/>
-        </stl-vector>
+        <stl-vector pointer-type='item'/>
     </global-object>
 
     <!-- To find: place loo'k' cursor over a unit, trace pointers to unit -->
diff --git a/df.history.xml b/df.history.xml
index 8a214737c..57c00ecbe 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -2,27 +2,15 @@
     <struct-type type-name='historical_kills'>
         -- Important
 
-        <stl-vector name="events">
-            <int32_t ref-target='history_event'/>
-        </stl-vector>
+        <stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
 
         -- Misc
 
-        <stl-vector name="killed_race">
-            <int16_t ref-target='creature_raw'/>
-        </stl-vector>
-        <stl-vector name="killed_caste">
-            <int16_t ref-target='caste_raw' aux-value='$$._parent.killed_race[$._key]'/>
-        </stl-vector>
-        <stl-vector name="unk_30">
-            <int32_t comment='-1'/>
-        </stl-vector>
-        <stl-vector name="unk_40">
-            <int32_t comment='-1'/>
-        </stl-vector>
-        <stl-vector name="killed_site">
-            <int32_t ref-target='world_site'/>
-        </stl-vector>
+        <stl-vector name="killed_race" type-name='int16_t' ref-target='creature_raw'/>
+        <stl-vector name="killed_caste" type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.killed_race[$._key]'/>
+        <stl-vector name="unk_30" type-name='int32_t' comment='-1'/>
+        <stl-vector name="unk_40" type-name='int32_t' comment='-1'/>
+        <stl-vector name="killed_site" type-name='int32_t' ref-target='world_site'/>
         <stl-vector name="killed_undead">
             <bitfield base-type='uint16_t'>
                 <flag-bit name='skeletal'/>
@@ -60,24 +48,16 @@
             <stl-vector name="skills">
                 <enum base-type='int16_t' type-name='job_skill'/>
             </stl-vector>
-            <stl-vector name="points" index-refers-to='$$._parent.skills[$]'>
-                <int32_t/>
-            </stl-vector>
-            <stl-vector name="unk_20">
-                <int16_t/>
-            </stl-vector>
-            <stl-vector name="unk_30">
-                <int32_t/>
-            </stl-vector>
+            <stl-vector name="points" type-name='int32_t' index-refers-to='$$._parent.skills[$]'/>
+            <stl-vector name="unk_20" type-name='int16_t'/>
+            <stl-vector name="unk_30" type-name='int32_t'/>
             <stl-vector name="unk_40" type-name='int16_t'/>
             <stl-vector name="unk_50" type-name='int16_t'/>
             <int16_t name="unk_60"/>
         </pointer>
 
         <pointer name="pets">
-            <stl-vector>
-                <int16_t ref-target='creature_raw'/>
-            </stl-vector>
+            <stl-vector type-name='int16_t' ref-target='creature_raw'/>
         </pointer>
 
         <pointer name="unk_c">
@@ -89,19 +69,13 @@
                     <int16_t name='b'/>
                 </pointer>
             </stl-vector>
-            <stl-vector name="unk_4c">
-                <int16_t/>
-            </stl-vector>
+            <stl-vector name="unk_4c" type-name='int16_t'/>
             <stl-vector name="unk_5c" comment='v0.34.01'/>
         </pointer>
 
         <pointer name="masterpieces">
-            <stl-vector name="events">
-                <int32_t ref-target='history_event'/>
-            </stl-vector>
-            <stl-vector name="events2" comment='ones that were stolen??..'>
-                <int32_t ref-target='history_event'/>
-            </stl-vector>
+            <stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
+            <stl-vector name="events2" type-name='int32_t' ref-target='history_event' comment='ones that were stolen??..'/>
         </pointer>
 
         <pointer name="unk_14">
@@ -118,9 +92,7 @@
         <pointer name="kills" type-name='historical_kills'/>
 
         <pointer name="wounds">
-            <stl-vector name="events">
-                <int32_t ref-target='history_event'/>
-            </stl-vector>
+            <stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
             <stl-bit-vector name="status">
                 <code-helper name='index-refers-to'>
                     (let* ((info $$._parent._parent._parent)
@@ -132,23 +104,17 @@
         </pointer>
 
         <pointer name='secret' comment='v0.34.01'>
-            <stl-vector name="interactions">
-                <pointer type-name='interaction'/>
-            </stl-vector>
+            <stl-vector name="interactions" pointer-type='interaction'/>
             <int32_t name="unk_10"/>
             <stl-vector name="unk_14"/>
         </pointer>
 
         <pointer name='curse' comment='v0.34.01'>
-            <stl-vector name="active_interactions">
-                <pointer type-name='interaction'/>
-            </stl-vector>
+            <stl-vector name="active_interactions" pointer-type='interaction'/>
             <stl-vector name="active_effects">
                 <pointer/>
             </stl-vector>
-            <stl-vector name="can_do">
-                <pointer type-name='interaction'/>
-            </stl-vector>
+            <stl-vector name="can_do" pointer-type='interaction'/>
             <int16_t name="unk_30"/>
             <int16_t name="unk_32"/>
             <int32_t name="unk_34"/>
@@ -162,9 +128,7 @@
             <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
             <stl-vector name="unk_a0"/>
             <stl-vector name="unk_b0"/>
-            <stl-vector name="unk_c0">
-                <int32_t/>
-            </stl-vector>
+            <stl-vector name="unk_c0" type-name='int32_t'/>
             <int32_t name="unk_d0"/>
             <int32_t name="unk_d4"/>
             <int32_t name="unk_d8"/>
@@ -174,9 +138,7 @@
         </pointer>
 
         <pointer name='books' comment='v0.34.01'>
-            <stl-vector>
-                <pointer type-name='artifact_record'/>
-            </stl-vector>
+            <stl-vector pointer-type='artifact_record'/>
         </pointer>
 
         <pointer name='reputation' comment='v0.34.01'>
@@ -189,9 +151,7 @@
                 </pointer>
             </stl-vector>
             <int32_t name="cur_identity" ref-target='assumed_identity'/>
-            <stl-vector name="all_identities">
-                <int32_t ref-target='assumed_identity'/>
-            </stl-vector>
+            <stl-vector name="all_identities" type-name='int32_t' ref-target='assumed_identity'/>
         </pointer>
     </struct-type>
 
@@ -248,15 +208,9 @@
 
         <int32_t name='unk4'/>
 
-        <stl-vector name='entity_links'>
-            <pointer type-name='histfig_entity_link'/>
-        </stl-vector>
-        <stl-vector name='site_links'>
-            <pointer type-name='histfig_site_link'/>
-        </stl-vector>
-        <stl-vector name='histfig_links'>
-            <pointer type-name='histfig_hf_link'/>
-        </stl-vector>
+        <stl-vector name='entity_links' pointer-type='histfig_entity_link'/>
+        <stl-vector name='site_links' pointer-type='histfig_site_link'/>
+        <stl-vector name='histfig_links' pointer-type='histfig_hf_link'/>
 
         <pointer name='info' type-name='historical_figure_info'/>
 
@@ -425,27 +379,27 @@
             -- 10
 
             <vmethod name='getRelatedHistfigIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='historical_figure'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='historical_figure'/></pointer>
             </vmethod>
             <vmethod name='getRelatedSiteIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='world_site'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='world_site'/></pointer>
             </vmethod>
             <vmethod name='getRelatedSiteStructureIDs'>
-                <pointer name='vec1'><stl-vector><int32_t ref-target='world_site'/></stl-vector></pointer>
-                <pointer name='vec2'><stl-vector><int32_t/></stl-vector></pointer>
+                <pointer name='vec1'><stl-vector type-name='int32_t' ref-target='world_site'/></pointer>
+                <pointer name='vec2'><stl-vector type-name='int32_t'/></pointer>
             </vmethod>
             <vmethod name='getRelatedArtifactIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='artifact_record'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='artifact_record'/></pointer>
             </vmethod>
             <vmethod name='getRelatedRegionIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='world_region'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='world_region'/></pointer>
             </vmethod>
 
             <vmethod name='getRelatedLayerIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='world_underground_region'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='world_underground_region'/></pointer>
             </vmethod>
             <vmethod name='getRelatedEntityIDs'>
-                <pointer name='vec'><stl-vector><int32_t ref-target='historical_entity'/></stl-vector></pointer>
+                <pointer name='vec'><stl-vector type-name='int32_t' ref-target='historical_entity'/></pointer>
             </vmethod>
             <vmethod ret-type='bool' name='isRelatedToHistfigID'>
                 <int32_t name='histfig' ref-target='historical_figure'/>
@@ -969,9 +923,7 @@
         <int32_t name='defender_civ' ref-target='historical_entity'/>
         <int32_t name='defender_group' ref-target='historical_entity'/>
         <int32_t name='site' ref-target='world_site'/>
-        <stl-vector name='new_leaders'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='new_leaders' type-name='int32_t' ref-target='historical_figure'/>
     </class-type>
 
     <class-type type-name='history_event_war_site_tribute_forcedst' inherits-from='history_event'>
@@ -990,9 +942,7 @@
     </class-type>
 
     <class-type type-name='history_event_body_abusedst' inherits-from='history_event'>
-        <stl-vector name='bodies'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='bodies' type-name='int32_t' ref-target='historical_figure'/>
         <int32_t/>
         <int32_t name='civ' ref-target='historical_entity'/>
         <int32_t name='histfig' ref-target='historical_figure'/>
@@ -1086,12 +1036,8 @@
     </enum-type>
 
     <class-type type-name='history_event_hist_figure_simple_battle_eventst' inherits-from='history_event'>
-        <stl-vector name='side1'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
-        <stl-vector name='side2'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='side1' type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name='side2' type-name='int32_t' ref-target='historical_figure'/>
 
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
@@ -1110,30 +1056,22 @@
     </class-type>
 
     <class-type type-name='history_event_hist_figure_reunionst' inherits-from='history_event'>
-        <stl-vector name='missing'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
-        <stl-vector name='reunited_with'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='missing' type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name='reunited_with' type-name='int32_t' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
     </class-type>
 
     <class-type type-name='history_event_hist_figure_reach_summitst' inherits-from='history_event'>
-        <stl-vector name='figures'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='figures' type-name='int32_t' ref-target='historical_figure'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
         <compound name='region_pos' type-name='coord2d'/>
     </class-type>
 
     <class-type type-name='history_event_hist_figure_travelst' inherits-from='history_event'>
-        <stl-vector name='figures'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='figures' type-name='int32_t' ref-target='historical_figure'/>
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
         <int32_t name='layer' ref-target='world_underground_region'/>
@@ -1142,12 +1080,8 @@
     </class-type>
 
     <class-type type-name='history_event_hist_figure_new_petst' inherits-from='history_event'>
-        <stl-vector name='figures'>
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
-        <stl-vector name='pets'>
-            <int16_t ref-target='creature_raw'/>
-        </stl-vector>
+        <stl-vector name='figures' type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name='pets' type-name='int16_t' ref-target='creature_raw'/>
 
         <int32_t name='site' ref-target='world_site'/>
         <int32_t name='region' ref-target='world_region'/>
@@ -1439,25 +1373,15 @@
     <struct-type type-name='world_history'>
         dtor 8532fa0
 
-        <stl-vector name='events'>
-            <pointer type-name='history_event'/>
-        </stl-vector>
-        <stl-vector name='events2'>
-            <pointer type-name='history_event'/>
-        </stl-vector>
+        <stl-vector name='events' pointer-type='history_event'/>
+        <stl-vector name='events2' pointer-type='history_event'/>
 
-        <stl-vector name='figures'>
-            <pointer type-name='historical_figure'/>
-        </stl-vector>
+        <stl-vector name='figures' pointer-type='historical_figure'/>
 
         <compound name='event_collections'>
-            <stl-vector name='all'>
-                <pointer type-name='history_event_collection'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='history_event_collection'/>
             <static-array name='other' count='8'>
-                <stl-vector>
-                    <pointer type-name='history_event_collection'/>
-                </stl-vector>
+                <stl-vector pointer-type='history_event_collection'/>
             </static-array>
         </compound>
 
diff --git a/df.init.xml b/df.init.xml
index 61272e573..b40d4d2a7 100644
--- a/df.init.xml
+++ b/df.init.xml
@@ -126,9 +126,7 @@
     </struct-type>
 
     <struct-type type-name='texture_handler'>
-        <stl-vector name='page'>
-            <pointer type-name='tile_page'/>
-        </stl-vector>
+        <stl-vector name='page' pointer-type='tile_page'/>
 
         <stl-vector name='texpos' type-name='int32_t'/>
         <stl-vector name='datapos' type-name='int32_t'/>
diff --git a/df.item-raws.xml b/df.item-raws.xml
index 4cc9b3ab2..63da82218 100644
--- a/df.item-raws.xml
+++ b/df.item-raws.xml
@@ -414,9 +414,7 @@
         <int16_t name="subtype"/>
 
         <df-flagarray name='base_flags' comment='v0.34.08; [0] = generated'/>
-        <stl-vector name='raw_strings'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='raw_strings' pointer-type='stl-string'/>
 
         <code-helper name='describe'>$.id</code-helper>
 
@@ -448,9 +446,7 @@
         <int32_t name="size" comment='divided by 10'/>
         <int32_t name="value"/>
 
-        <stl-vector name="attacks">
-            <pointer type-name='weapon_attack'/>
-        </stl-vector>
+        <stl-vector name="attacks" pointer-type='weapon_attack'/>
     </class-type>
 
     <enum-type type-name='armor_general_flags'>
@@ -653,9 +649,7 @@
         <int32_t name="minimum_size"/>
         <int32_t name="material_size"/>
 
-        <stl-vector name="attacks">
-            <pointer type-name='weapon_attack'/>
-        </stl-vector>
+        <stl-vector name="attacks" pointer-type='weapon_attack'/>
 
         <int32_t name="shoot_force"/>
         <int32_t name="shoot_maxvel"/>
@@ -695,9 +689,7 @@
 
         <df-flagarray name='flags' index-enum='trapcomp_flags'/>
 
-        <stl-vector name="attacks">
-            <pointer type-name='weapon_attack'/>
-        </stl-vector>
+        <stl-vector name="attacks" pointer-type='weapon_attack'/>
     </class-type>
 
     <enum-type type-name='weapon_flags'>
@@ -720,9 +712,7 @@
         <int32_t name="minimum_size"/>
         <int32_t name="material_size"/>
         <df-flagarray name='flags' index-enum='weapon_flags'/>
-        <stl-vector name="attacks">
-            <pointer type-name='weapon_attack'/>
-        </stl-vector>
+        <stl-vector name="attacks" pointer-type='weapon_attack'/>
         <int32_t name="shoot_force"/>
         <int32_t name="shoot_maxvel"/>
     </class-type>
diff --git a/df.items.xml b/df.items.xml
index 0fc93ecbd..c0debbd7e 100644
--- a/df.items.xml
+++ b/df.items.xml
@@ -134,12 +134,8 @@
         <uint32_t name='age'/>
         <int32_t name='id'/>
 
-        <stl-vector name='specific_refs'>
-            <pointer type-name='specific_ref'/>
-        </stl-vector>
-        <stl-vector name='general_refs'>
-            <pointer type-name='general_ref'/>
-        </stl-vector>
+        <stl-vector name='specific_refs' pointer-type='specific_ref'/>
+        <stl-vector name='general_refs' pointer-type='general_ref'/>
 
         <int32_t name='world_data_id' init-value='-1' comment='v0.34.01'/>
         <int32_t name='world_data_subid' init-value='-1' comment='v0.34.01'/>
@@ -532,7 +528,7 @@
             <vmethod ret-type='bool' name='hasImprovements'/> any at all
             <vmethod ret-type='bool' name='isImproved'/>
             <vmethod name='getMagic'>
-                <ret-type><pointer><stl-vector><pointer type-name='item_magicness'/></stl-vector></pointer></ret-type>
+                <ret-type><pointer><stl-vector pointer-type='item_magicness'/></pointer></ret-type>
             </vmethod>
 
             -- 186
@@ -634,9 +630,7 @@
 
         -- Wielders
 
-        <stl-vector name="slayers">
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
+        <stl-vector name="slayers" type-name='int32_t' ref-target='historical_figure'/>
         <stl-vector name="slayer_kill_counts" type-name='int32_t'/>
     </struct-type>
 
@@ -659,15 +653,11 @@
         </pointer>
 
         <pointer name='magic'>
-            <stl-vector>
-                <pointer type-name='item_magicness'/>
-            </stl-vector>
+            <stl-vector pointer-type='item_magicness'/>
         </pointer>
 
         <pointer name='contaminants'>
-            <stl-vector>
-                <pointer type-name='contaminant'/>
-            </stl-vector>
+            <stl-vector pointer-type='contaminant'/>
         </pointer>
 
         <compound name='temperature' type-name='temperaturest'/>
@@ -702,9 +692,7 @@
 
     <class-type type-name='item_constructed' inherits-from='item_crafted'
                 original-name='item_constructedst'>
-        <stl-vector name='improvements'>
-            <pointer type-name='itemimprovement'/>
-        </stl-vector>
+        <stl-vector name='improvements' pointer-type='itemimprovement'/>
     </class-type>
 
     -- BODY COMPONENT
diff --git a/df.jobs.xml b/df.jobs.xml
index c858487e4..0a91310c2 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -119,20 +119,10 @@
         <int16_t name='wait_timer' comment='for units to leave build sites; to recheck stockpiles'/>
         <int32_t name='unk11' init-value='-1' comment='v0.34.08'/>
 
-        <stl-vector name='items'>
-            <pointer type-name='job_item_ref'/>
-        </stl-vector>
-
-        <stl-vector name='specific_refs'>
-            <pointer type-name='specific_ref'/>
-        </stl-vector>
-        <stl-vector name='general_refs'>
-            <pointer type-name='general_ref'/>
-        </stl-vector>
-
-        <stl-vector name='job_items'>
-            <pointer type-name='job_item'/>
-        </stl-vector>
+        <stl-vector name='items' pointer-type='job_item_ref'/>
+        <stl-vector name='specific_refs' pointer-type='specific_ref'/>
+        <stl-vector name='general_refs' pointer-type='general_ref'/>
+        <stl-vector name='job_items' pointer-type='job_item'/>
 
         <compound name='guide_path' type-name='coord_path' comment='v0.34.08'/>
         <int32_t name='cur_path_index' comment='v0.34.08'/>
@@ -283,9 +273,7 @@
         <compound name="flags1" type-name='job_item_flags1'/>
 
         <pointer name="item_vector">
-            <stl-vector>
-                <pointer type-name='item'/>
-            </stl-vector>
+            <stl-vector pointer-type='item'/>
         </pointer>
 
         <bool name="use_mat_index"/>
@@ -328,15 +316,11 @@
 
         <int32_t name="unk_74"/>
 
-        <stl-vector name='burrows'>
-            <int32_t ref-target='burrow'/>
-        </stl-vector>
+        <stl-vector name='burrows' type-name='int32_t' ref-target='burrow'/>
         <bool name="use_burrows"/>
 
         <pointer name='take_from' comment='v0.34.08'>
-            <stl-vector>
-                <pointer type-name='building'/>
-            </stl-vector>
+            <stl-vector pointer-type='building'/>
         </pointer>
     </struct-type>
 
diff --git a/df.language.xml b/df.language.xml
index bcc60ccc6..72acdeea6 100644
--- a/df.language.xml
+++ b/df.language.xml
@@ -187,9 +187,7 @@
         <stl-vector name='unknown1' comment='empty'/>
         <stl-vector name='unknown2' comment='empty'/>
 
-        <stl-vector name='words' index-refers-to='$global.world.raws.language.words[$]'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='words' index-refers-to='$global.world.raws.language.words[$]' pointer-type='stl-string'/>
     </struct-type>
 
     <struct-type type-name='language_symbol'
diff --git a/df.map.xml b/df.map.xml
index 65d8d580f..ada1b15cf 100644
--- a/df.map.xml
+++ b/df.map.xml
@@ -195,9 +195,7 @@
     <struct-type type-name='map_block'>
         <compound name='flags' type-name='block_flags'/>
 
-        <stl-vector name='block_events'>
-            <pointer type-name='block_square_event'/>
-        </stl-vector>
+        <stl-vector name='block_events' pointer-type='block_square_event'/>
 
         <df-linked-list name='block_burrows' type-name='block_burrow_link'/>
 
@@ -215,15 +213,11 @@
         <stl-vector name='items'>
             <int32_t ref-target='item'/>
         </stl-vector>
-        <stl-vector name='flows'>
-            <pointer type-name='flow_info'/>
-        </stl-vector>
+        <stl-vector name='flows' pointer-type='flow_info'/>
 
         <compound name='flow_pool' type-name='flow_reuse_pool'/>
 
-        <stl-vector name='plants'>
-            <pointer type-name='plant'/>
-        </stl-vector>
+        <stl-vector name='plants' pointer-type='plant'/>
 
         <compound name='map_pos' type-name='coord'/>
         <compound name='region_pos' type-name='coord2d'/>
@@ -366,9 +360,7 @@
             </static-array>
         </static-array>
 
-        <stl-vector name='column_rectangles'>
-            <pointer type-name='cave_column_rectangle'/>
-        </stl-vector>
+        <stl-vector name='column_rectangles' pointer-type='cave_column_rectangle'/>
 
         <int16_t name='z_shift' comment='seems to be 0 originally, but updated when map is shifted'/>
 
@@ -469,9 +461,7 @@
     </enum-type>
 
     <class-type type-name='feature' original-name='featurest'>
-        <stl-vector name='population'>
-            <pointer type-name='world_population'/>
-        </stl-vector>
+        <stl-vector name='population' pointer-type='world_population'/>
 
         <int32_t/>
         <int16_t/>
diff --git a/df.materials.xml b/df.materials.xml
index 746558b77..172b8f52a 100644
--- a/df.materials.xml
+++ b/df.materials.xml
@@ -257,15 +257,11 @@
         <static-array name='block_name' type-name='stl-string' count='2'/>
 
         <compound name='reaction_product'>
-            <stl-vector name='id'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='id' pointer-type='stl-string'/>
             <compound name='material' type-name='material_vec_ref'/>
 
             <static-array name='str' count='3'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
         </compound>
 
@@ -276,9 +272,7 @@
             <static-array name='str' type-name='stl-string' count='3'/>
         </compound>
 
-        <stl-vector name='reaction_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='reaction_class' pointer-type='stl-string'/>
 
         <uint8_t name='tile'/>
 
@@ -291,9 +285,7 @@
         <int16_t name='powder_dye'/> // color token index
         <int16_t name='temp_diet_info'/>
 
-        <stl-vector name='syndrome'>
-            <pointer type-name='syndrome'/>
-        </stl-vector>
+        <stl-vector name='syndrome' pointer-type='syndrome'/>
 
         <int32_t name='soap_level'/>
     </struct-type>
@@ -387,18 +379,14 @@
     <struct-type type-name='inorganic_raw' instance-vector='$global.world.raws.inorganics' custom-methods='true'>
         <stl-string name='id'/>
 
-        <stl-vector name='str' comment='v0.34.01'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='str' comment='v0.34.01' pointer-type='stl-string'/>
 
         <code-helper name='describe'>$.id</code-helper>
 
         <df-flagarray name='flags' index-enum='inorganic_flags'/>
 
         <compound name='metal_ore'>
-            <stl-vector name='str' comment='only during parsing'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='str' comment='only during parsing' pointer-type='stl-string'/>
             <stl-vector name='mat_index'>
                 <int16_t ref-target='inorganic_raw'/>
             </stl-vector>
@@ -406,9 +394,7 @@
         </compound>
 
         <compound name='thread_metal'>
-            <stl-vector name='str' comment='only during parsing'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='str' comment='only during parsing' pointer-type='stl-string'/>
             <stl-vector name='mat_index'>
                 <int16_t ref-target='inorganic_raw'/>
             </stl-vector>
@@ -418,9 +404,7 @@
         <stl-vector type-name='int32_t' name='economic_uses' ref-target='reaction'/>
 
         <compound name='environment_spec'>
-            <stl-vector name='str' comment='only during parsing'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='str' comment='only during parsing' pointer-type='stl-string'/>
             <stl-vector name='mat_index'>
                 <int16_t ref-target='inorganic_raw'/>
             </stl-vector>
diff --git a/df.meeting.xml b/df.meeting.xml
index 93bc7bbf9..aa076c616 100644
--- a/df.meeting.xml
+++ b/df.meeting.xml
@@ -74,17 +74,13 @@
     </struct-type>
 
     <struct-type type-name='party_info'>
-        <stl-vector name="units">
-            <pointer type-name="unit"/>
-        </stl-vector>
+        <stl-vector name="units" pointer-type='unit'/>
         <pointer name="location" type-name="building"/>
         <int32_t name="timer" comment='-1 per 10'/>
     </struct-type>
 
     <struct-type type-name='room_rent_info'>
-        <stl-vector name='elements'>
-            <pointer type-name='building'/>
-        </stl-vector>
+        <stl-vector name='elements' pointer-type='building'/>
         <int32_t name='rent_value'/>
         <bitfield name='flags'>
             <flag-bit name='eviction_underway'/>
@@ -95,9 +91,7 @@
     <struct-type type-name='activity_entry' instance-vector='$global.world.activities.all' key-field='id'>
         <int32_t name='id'/>
         <int16_t name='is_individual'/>
-        <stl-vector name='events'>
-            <pointer type-name='activity_event'/>
-        </stl-vector>
+        <stl-vector name='events' pointer-type='activity_event'/>
         <int32_t name='next_event_id'/>
     </struct-type>
 
diff --git a/df.military.xml b/df.military.xml
index 88ae57ed0..760c54680 100644
--- a/df.military.xml
+++ b/df.military.xml
@@ -125,20 +125,14 @@
 
         <code-helper name='describe'>(describe-obj @.occupant)</code-helper>
 
-        <stl-vector name="orders">
-            <pointer type-name='squad_order'/>
-        </stl-vector>
+        <stl-vector name="orders" pointer-type='squad_order'/>
 
         <static-array name='preferences' count='4' index-enum='barrack_preference_category'>
-            <stl-vector>
-                <int32_t ref-target='building'/>
-            </stl-vector>
+            <stl-vector type-name='int32_t' ref-target='building'/>
         </static-array>
 
         <static-array name='uniform' count='7' index-enum='uniform_category'>
-            <stl-vector>
-                <pointer type-name='squad_uniform_spec'/>
-            </stl-vector>
+            <stl-vector pointer-type='squad_uniform_spec'/>
         </static-array>
 
         <stl-string name="unk_c4"/>
@@ -197,13 +191,9 @@
             (describe-obj $.name)
         </code-helper>
 
-        <stl-vector name='positions'>
-            <pointer type-name='squad_position'/>
-        </stl-vector>
+        <stl-vector name='positions' pointer-type='squad_position'/>
 
-        <stl-vector name="orders">
-            <pointer type-name='squad_order'/>
-        </stl-vector>
+        <stl-vector name="orders" pointer-type='squad_order'/>
 
         <stl-vector name="schedule">
             <pointer>
@@ -226,9 +216,7 @@
         <int32_t name="uniform_priority"/>
         <int32_t name="activity" ref-target='activity_entry'/>
 
-        <stl-vector name="ammunition">
-            <pointer type-name='squad_ammo_spec'/>
-        </stl-vector>
+        <stl-vector name="ammunition" pointer-type='squad_ammo_spec'/>
 
         <stl-vector name="train_weapon_free">
             <int32_t ref-target='item'/>
diff --git a/df.plant-raws.xml b/df.plant-raws.xml
index 77cd55d25..be361f79c 100644
--- a/df.plant-raws.xml
+++ b/df.plant-raws.xml
@@ -152,13 +152,9 @@
         <int8_t name='sapling_drown_level'/>
         <int16_t name='frequency'/>
         <int16_t name='clustersize'/>
-        <stl-vector name='prefstring'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='prefstring' pointer-type='stl-string'/>
 
-        <stl-vector name='material'>
-            <pointer type-name='material'/>
-        </stl-vector>
+        <stl-vector name='material' pointer-type='material'/>
 
         <compound name='material_defs'>
             <int16_t name='type_basic_mat' ref-target='material' aux-value='$$.idx_basic_mat'/>
diff --git a/df.plants.xml b/df.plants.xml
index e620ad2ec..eeb93dae9 100644
--- a/df.plants.xml
+++ b/df.plants.xml
@@ -19,9 +19,7 @@
         <int32_t name='hitpoints'/>
         <int16_t name='update_order'/>
 
-        <stl-vector name='contaminants'>
-            <pointer type-name='contaminant'/>
-        </stl-vector>
+        <stl-vector name='contaminants' pointer-type='contaminant'/>
         <int32_t name='temperature_tile_tick'/>
         <uint16_t name='temperature_tile'/>
         <uint16_t name='min_safe_temp'/>
diff --git a/df.raws.xml b/df.raws.xml
index d9886a143..23a5a7230 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -2,42 +2,28 @@
     <struct-type type-name='world_raws'>
         -- Materials
 
-        <stl-vector name='material_templates'>
-            <pointer type-name='material_template'/>
-        </stl-vector>
+        <stl-vector name='material_templates' pointer-type='material_template'/>
 
         -- Inorganic
 
-        <stl-vector name='inorganics'>
-            <pointer type-name='inorganic_raw'/>
-        </stl-vector>
-        <stl-vector name='inorganics_subset' comment='all inorganics with value less than 4'>
-            <pointer type-name='inorganic_raw'/>
-        </stl-vector>
+        <stl-vector name='inorganics' pointer-type='inorganic_raw'/>
+        <stl-vector name='inorganics_subset'  pointer-type='inorganic_raw' comment='all inorganics with value less than 4'/>
 
         -- Plants
 
         <compound name='plants'>
             dtor 852cc20
 
-            <stl-vector name='all'>
-                <pointer type-name='plant_raw'/>
-            </stl-vector>
-            <stl-vector name='bushes'>
-                <pointer type-name='plant_raw'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='plant_raw'/>
+            <stl-vector name='bushes' pointer-type='plant_raw'/>
             <stl-vector name='bushes_idx' index-refers-to='$$._parent.bushes[$]'>
                 <int32_t ref-target='plant_raw'/>
             </stl-vector>
-            <stl-vector name='trees'>
-                <pointer type-name='plant_raw'/>
-            </stl-vector>
+            <stl-vector name='trees' pointer-type='plant_raw'/>
             <stl-vector name='trees_idx' index-refers-to='$$._parent.trees[$]'>
                 <int32_t ref-target='plant_raw'/>
             </stl-vector>
-            <stl-vector name='grasses'>
-                <pointer type-name='plant_raw'/>
-            </stl-vector>
+            <stl-vector name='grasses' pointer-type='plant_raw'/>
             <stl-vector name='grasses_idx' index-refers-to='$$._parent.grasses[$]'>
                 <int32_t ref-target='plant_raw'/>
             </stl-vector>
@@ -45,19 +31,13 @@
 
         -- Creature RAWs
 
-        <stl-vector name='tissue_templates'>
-            <pointer type-name='tissue_template'/>
-        </stl-vector>
+        <stl-vector name='tissue_templates' pointer-type='tissue_template'/>
 
         dtor 89bab50
-        <stl-vector name='body_detail_plans'>
-            <pointer type-name='body_detail_plan'/>
-        </stl-vector>
+        <stl-vector name='body_detail_plans' pointer-type='body_detail_plan'/>
 
         dtor 8527e40
-        <stl-vector name='body_templates'>
-            <pointer type-name='body_template'/>
-        </stl-vector>
+        <stl-vector name='body_templates' pointer-type='body_template'/>
 
         <stl-vector name='bodyglosses'>
             <pointer key-field='id'>
@@ -70,22 +50,15 @@
         </stl-vector>
 
         dtor 89ba980
-        <stl-vector name='creature_variations'>
-            <pointer type-name='creature_variation'/>
-        </stl-vector>
+        <stl-vector name='creature_variations' pointer-type='creature_variation'/>
 
         -- Creatures
 
         <compound name='creatures'>
             dtor 81448c0
 
-            <stl-vector name='alphabetic'>
-                <pointer type-name='creature_raw'/>
-            </stl-vector>
-
-            <stl-vector name='all'>
-                <pointer type-name='creature_raw'/>
-            </stl-vector>
+            <stl-vector name='alphabetic' pointer-type='creature_raw'/>
+            <stl-vector name='all' pointer-type='creature_raw'/>
 
             <int32_t name='num_caste' comment='seems equal to length of vectors below'/>
 
@@ -99,81 +72,38 @@
         <compound name='itemdefs'>
             dtor 852e080
 
-            <stl-vector name='all'>
-                <pointer type-name='itemdef'/>
-            </stl-vector>
-
-            <stl-vector name='weapons'>
-                <pointer type-name='itemdef_weaponst'/>
-            </stl-vector>
-            <stl-vector name='trapcomps'>
-                <pointer type-name='itemdef_trapcompst'/>
-            </stl-vector>
-            <stl-vector name='toys'>
-                <pointer type-name='itemdef_toyst'/>
-            </stl-vector>
-            <stl-vector name='tools'>
-                <pointer type-name='itemdef_toolst'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='itemdef'/>
+            <stl-vector name='weapons' pointer-type='itemdef_weaponst'/>
+            <stl-vector name='trapcomps' pointer-type='itemdef_trapcompst'/>
+            <stl-vector name='toys' pointer-type='itemdef_toyst'/>
+            <stl-vector name='tools' pointer-type='itemdef_toolst'/>
             <static-array name='tools_by_type' count='17' index-enum='tool_uses'>
-                <stl-vector>
-                    <pointer type-name='itemdef_toolst'/>
-                </stl-vector>
+                <stl-vector pointer-type='itemdef_toolst'/>
             </static-array>
-            <stl-vector name='instruments'>
-                <pointer type-name='itemdef_instrumentst'/>
-            </stl-vector>
-            <stl-vector name='armor'>
-                <pointer type-name='itemdef_armorst'/>
-            </stl-vector>
-            <stl-vector name='ammo'>
-                <pointer type-name='itemdef_ammost'/>
-            </stl-vector>
-            <stl-vector name='siege_ammo'>
-                <pointer type-name='itemdef_siegeammost'/>
-            </stl-vector>
-            <stl-vector name='gloves'>
-                <pointer type-name='itemdef_glovesst'/>
-            </stl-vector>
-            <stl-vector name='shoes'>
-                <pointer type-name='itemdef_shoesst'/>
-            </stl-vector>
-            <stl-vector name='shields'>
-                <pointer type-name='itemdef_shieldst'/>
-            </stl-vector>
-            <stl-vector name='helms'>
-                <pointer type-name='itemdef_helmst'/>
-            </stl-vector>
-            <stl-vector name='pants'>
-                <pointer type-name='itemdef_pantsst'/>
-            </stl-vector>
-            <stl-vector name='food'>
-                <pointer type-name='itemdef_foodst'/>
-            </stl-vector>
+            <stl-vector name='instruments' pointer-type='itemdef_instrumentst'/>
+            <stl-vector name='armor' pointer-type='itemdef_armorst'/>
+            <stl-vector name='ammo' pointer-type='itemdef_ammost'/>
+            <stl-vector name='siege_ammo' pointer-type='itemdef_siegeammost'/>
+            <stl-vector name='gloves' pointer-type='itemdef_glovesst'/>
+            <stl-vector name='shoes' pointer-type='itemdef_shoesst'/>
+            <stl-vector name='shields' pointer-type='itemdef_shieldst'/>
+            <stl-vector name='helms' pointer-type='itemdef_helmst'/>
+            <stl-vector name='pants' pointer-type='itemdef_pantsst'/>
+            <stl-vector name='food' pointer-type='itemdef_foodst'/>
         </compound>
 
         -- Entity RAWs
 
-        <stl-vector name='entities'>
-            <pointer type-name='entity_raw'/>
-        </stl-vector>
+        <stl-vector name='entities' pointer-type='entity_raw'/>
 
         -- Language RAWs
 
         <compound name='language'>
             dtor 852bc90
 
-            <stl-vector name='words'>
-                <pointer type-name='language_word'/>
-            </stl-vector>
-
-            <stl-vector name='symbols'>
-                <pointer type-name='language_symbol'/>
-            </stl-vector>
-
-            <stl-vector name='translations'>
-                <pointer type-name='language_translation'/>
-            </stl-vector>
+            <stl-vector name='words' pointer-type='language_word'/>
+            <stl-vector name='symbols' pointer-type='language_symbol'/>
+            <stl-vector name='translations' pointer-type='language_translation'/>
 
             <static-array name='word_table' count='2'>
                 <static-array count='59'>
@@ -192,44 +122,28 @@
 
             -- Descriptors
 
-            <stl-vector name='colors'>
-                <pointer type-name='descriptor_color'/>
-            </stl-vector>
-            <stl-vector name='shapes'>
-                <pointer type-name='descriptor_shape'/>
-            </stl-vector>
-            <stl-vector name='patterns'>
-                <pointer type-name='descriptor_pattern'/>
-            </stl-vector>
+            <stl-vector name='colors' pointer-type='descriptor_color'/>
+            <stl-vector name='shapes' pointer-type='descriptor_shape'/>
+            <stl-vector name='patterns' pointer-type='descriptor_pattern'/>
         </compound>
 
         -- Reaction RAWs
 
-        <stl-vector name='reactions'>
-            <pointer type-name='reaction'/>
-        </stl-vector>
+        <stl-vector name='reactions' pointer-type='reaction'/>
 
         -- Workshops
 
         <compound name='buildings'>
-            <stl-vector name='all'>
-                <pointer type-name='building_def'/>
-            </stl-vector>
-            <stl-vector name='workshops'>
-                <pointer type-name='building_def_workshopst'/>
-            </stl-vector>
-            <stl-vector name='furnaces'>
-                <pointer type-name='building_def_furnacest'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='building_def'/>
+            <stl-vector name='workshops' pointer-type='building_def_workshopst'/>
+            <stl-vector name='furnaces' pointer-type='building_def_furnacest'/>
 
             <int32_t name='next_id'/>
         </compound>
 
         -- Interactions
 
-        <stl-vector name='interactions' comment='v0.34.01'>
-            <pointer type-name='interaction'/>
-        </stl-vector>
+        <stl-vector name='interactions' comment='v0.34.01' pointer-type='interaction'/>
 
         -- Material index
 
@@ -246,9 +160,7 @@
                 <int32_t ref-target='interaction'/>
             </stl-vector>
 
-            <stl-vector name='all' comment='v0.34.01'>
-                <pointer type-name='syndrome'/>
-            </stl-vector>
+            <stl-vector name='all' comment='v0.34.01' pointer-type='syndrome'/>
         </compound>
 
         <compound name='effects'>
@@ -260,9 +172,7 @@
                 <int32_t ref-target='interaction'/>
             </stl-vector>
 
-            <stl-vector name='all' comment='v0.34.01'>
-                <pointer type-name='creature_interaction_effect'/>
-            </stl-vector>
+            <stl-vector name='all' comment='v0.34.01' pointer-type='creature_interaction_effect'/>
         </compound>
 
         <int32_t comment='v0.34.01'/>
diff --git a/df.reaction-raws.xml b/df.reaction-raws.xml
index afa4df3f7..ee803bfa2 100644
--- a/df.reaction-raws.xml
+++ b/df.reaction-raws.xml
@@ -14,20 +14,14 @@
 
         <df-flagarray name='flags' index-enum='reaction_flags'/>
 
-        <stl-vector name="reagents">
-            <pointer type-name='reaction_reagent'/>
-        </stl-vector>
-        <stl-vector name="products">
-            <pointer type-name='reaction_product'/>
-        </stl-vector>
+        <stl-vector name="reagents" pointer-type='reaction_reagent'/>
+        <stl-vector name="products" pointer-type='reaction_product'/>
 
         <enum base-type='int16_t' name='skill' type-name='job_skill'/>
 
         <compound name='building'>
             <static-array name='str' count='2'>
-                <stl-vector>
-                    <pointer type-name='stl-string'/>
-                </stl-vector>
+                <stl-vector pointer-type='stl-string'/>
             </static-array>
             <stl-vector name='type'>
                 <enum base-type='int32_t' type-name='building_type'/>
@@ -110,9 +104,7 @@
         <static-array type-name='stl-string' name='item_str' count='2'/>
         <static-array type-name='stl-string' name='material_str' count='3'/>
         <stl-string name='metal_ore_str'/>
-        <stl-vector name='contains_str'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='contains_str' pointer-type='stl-string'/>
     </class-type>
 
     <enum-type type-name='reaction_product_type'>
diff --git a/df.stockpile.xml b/df.stockpile.xml
index 031037d45..39fb5355f 100644
--- a/df.stockpile.xml
+++ b/df.stockpile.xml
@@ -445,9 +445,7 @@
                  instance-vector='$global.ui.hauling.routes' key-field='id'>
         <int32_t name='id'/>
         <stl-string name="name"/>
-        <stl-vector name="stops">
-            <pointer type-name='hauling_stop'/>
-        </stl-vector>
+        <stl-vector name="stops" pointer-type='hauling_stop'/>
         <stl-vector name="vehicle_ids">
             <int32_t ref-target='vehicle'/>
         </stl-vector>
@@ -463,12 +461,8 @@
 
         <compound name='settings' type-name='stockpile_settings'/>
 
-        <stl-vector name='conditions'>
-            <pointer type-name='stop_depart_condition'/>
-        </stl-vector>
-        <stl-vector name='stockpiles'>
-            <pointer type-name='route_stockpile_link'/>
-        </stl-vector>
+        <stl-vector name='conditions' pointer-type='stop_depart_condition'/>
+        <stl-vector name='stockpiles' pointer-type='route_stockpile_link'/>
 
         <int32_t name='time_waiting'/>
         <int32_t name='cart_id' ref-target='item'/>
diff --git a/df.syndrome.xml b/df.syndrome.xml
index b3b3cb52f..e645787ae 100644
--- a/df.syndrome.xml
+++ b/df.syndrome.xml
@@ -97,12 +97,8 @@
                 <enum-item name='BY_CATEGORY'/>
             </enum>
         </stl-vector>
-        <stl-vector name='key'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='tissue'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='key' pointer-type='stl-string'/>
+        <stl-vector name='tissue' pointer-type='stl-string'/>
     </struct-type>
 
     <class-type type-name='creature_interaction_effect' original-name='creature_interaction_effectst'
@@ -414,30 +410,14 @@
 
         <code-helper name='describe'>$.syn_name</code-helper>
 
-        <stl-vector name='ce'>
-            <pointer type-name='creature_interaction_effect'/>
-        </stl-vector>
-        <stl-vector name='syn_affected_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_affected_creature'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_affected_caste'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_immune_class'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_immune_creature'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_immune_caste'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='syn_class' comment='v0.34.01'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='ce' pointer-type='creature_interaction_effect'/>
+        <stl-vector name='syn_affected_class' pointer-type='stl-string'/>
+        <stl-vector name='syn_affected_creature' pointer-type='stl-string'/>
+        <stl-vector name='syn_affected_caste' pointer-type='stl-string'/>
+        <stl-vector name='syn_immune_class' pointer-type='stl-string'/>
+        <stl-vector name='syn_immune_creature' pointer-type='stl-string'/>
+        <stl-vector name='syn_immune_caste' pointer-type='stl-string'/>
+        <stl-vector name='syn_class' comment='v0.34.01' pointer-type='stl-string'/>
 
         <compound name='flags' type-name='syndrome_flags'/>
         <int32_t name='id'/>
@@ -450,9 +430,7 @@
 
         <code-helper name='describe'>$.name</code-helper>
 
-        <stl-vector name="str">
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name="str" pointer-type='stl-string'/>
 
         <df-flagarray name='flags'/>
 
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index e33302439..4eeebe697 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -9,9 +9,7 @@
 
         <compound name='filter' type-name='job_item_filter'/>
 
-        <stl-vector name='candidates'>
-            <pointer type-name='item'/>
-        </stl-vector>
+        <stl-vector name='candidates' pointer-type='item'/>
         <stl-vector name='candidate_selected' type-name='bool'/>
         <stl-vector name='unk_a0' type-name='int16_t'/>
         <stl-vector name='candidate_enabled' type-name='bool'/>
@@ -78,13 +76,9 @@
     </class-type>
 
     <struct-type type-name='ui_build_selector'>
-        <stl-vector name='requirements'>
-            <pointer type-name='ui_build_item_req'/>
-        </stl-vector>
+        <stl-vector name='requirements' pointer-type='ui_build_item_req'/>
 
-        <stl-vector name='choices'>
-            <pointer type-name='build_req_choicest'/>
-        </stl-vector>
+        <stl-vector name='choices' pointer-type='build_req_choicest'/>
 
         <enum base-type='int32_t' name="building_type"
               type-name='building_type' comment='if -1, in Build menu; otherwise select item'/>
@@ -98,12 +92,8 @@
 
         <int32_t name="is_grouped"/>
 
-        <stl-vector name='errors'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name='unk4'>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector name='errors' pointer-type='stl-string'/>
+        <stl-vector name='unk4' pointer-type='stl-string'/>
 
         <static-array name='tiles' count='31'>
             <static-array type-name='int32_t' count='31'/>
@@ -229,12 +219,8 @@
         dtor 0x8535ee0
 
         <compound name='workshop_job'>
-            <stl-vector name='choices_all'>
-                <pointer type-name='interface_button_buildingst'/>
-            </stl-vector>
-            <stl-vector name='choices_visible'>
-                <pointer type-name='interface_button_buildingst'/>
-            </stl-vector>
+            <stl-vector name='choices_all' pointer-type='interface_button_buildingst'/>
+            <stl-vector name='choices_visible' pointer-type='interface_button_buildingst'/>
 
             <int32_t name="cursor"/>
             <int32_t name="category_id" comment='weapons, armor, etc'/>
@@ -245,12 +231,8 @@
         </compound>
 
         <compound name='building'>
-            <stl-vector name='choices_all'>
-                <pointer type-name='interface_button_constructionst'/>
-            </stl-vector>
-            <stl-vector name='choices_visible'>
-                <pointer type-name='interface_button_constructionst'/>
-            </stl-vector>
+            <stl-vector name='choices_all' pointer-type='interface_button_constructionst'/>
+            <stl-vector name='choices_visible' pointer-type='interface_button_constructionst'/>
 
             <int32_t name="category_id"/>
             <int32_t name="cursor"/>
@@ -274,26 +256,16 @@
         </compound>
 
         <compound name='unit'>
-            <stl-vector name='inv_items'>
-                <pointer type-name='unit_inventory_item'/>
-            </stl-vector>
-            <stl-vector name='inv_spatters'>
-                <pointer type-name='unit_spatter'/>
-            </stl-vector>
+            <stl-vector name='inv_items' pointer-type='unit_inventory_item'/>
+            <stl-vector name='inv_spatters' pointer-type='unit_spatter'/>
 
             <bool name="in_new_squad" comment='v0.34.08'/>
             <int32_t name="cursor_uniform" comment='v0.34.08'/>
             <int32_t name="unk_88n" comment='v0.34.08'/>
 
-            <stl-vector name='squads' comment='v0.34.08'>
-                <pointer type-name='squad'/>
-            </stl-vector>
-            <stl-vector name='squad_pos' comment='v0.34.08'>
-                <pointer type-name='entity_position'/>
-            </stl-vector>
-            <stl-vector name='squad_assn' comment='v0.34.08'>
-                <pointer type-name='entity_position_assignment'/>
-            </stl-vector>
+            <stl-vector name='squads' comment='v0.34.08' pointer-type='squad'/>
+            <stl-vector name='squad_pos' comment='v0.34.08' pointer-type='entity_position'/>
+            <stl-vector name='squad_assn' comment='v0.34.08' pointer-type='entity_position_assignment'/>
             <stl-bit-vector name='squad_unk1' comment='v0.34.08'/>
             <stl-vector name='squad_unk2' comment='v0.34.08'/>
 
@@ -311,15 +283,11 @@
             <int32_t name="unk_8c"/>
             <int32_t name="unk_90"/>
 
-            <stl-vector name='list'>
-                <int32_t refers-to='$global.world.units.active[$]'/>
-            </stl-vector>
+            <stl-vector name='list' type-name='int32_t' refers-to='$global.world.units.active[$]'/>
 
             <int32_t name="unk_a0"/>
 
-            <stl-vector name='skills'>
-                <int32_t refers-to='$global.ui_selected_unit.index.refers-to.status.current_soul.skills[$]'/>
-            </stl-vector>
+            <stl-vector name='skills' type-name='int32_t' refers-to='$global.ui_selected_unit.index.refers-to.status.current_soul.skills[$]'/>
 
             <bool name="show_combat"/>
             <bool name="show_labor"/>
@@ -329,9 +297,7 @@
         <compound name='barracks'>
             <int32_t name="squad_cursor"/>
 
-            <stl-vector name='squads'>
-                <pointer type-name='squad'/>
-            </stl-vector>
+            <stl-vector name='squads' pointer-type='squad'/>
             <stl-vector name='uses'>
                 <compound type-name='squad_use_flags'/>
             </stl-vector>
@@ -342,18 +308,14 @@
             <int32_t name="position_cursor"/>
 
             <bool name="in_position_squads"/>
-            <stl-vector name='position_squads'>
-                <pointer type-name='squad'/>
-            </stl-vector>
+            <stl-vector name='position_squads' pointer-type='squad'/>
             <int32_t name="position_squad_cursor"/>
         </compound>
 
         <padding size='5824'/>
 
         <stl-string/>
-        <stl-vector>
-            <pointer type-name='stl-string'/>
-        </stl-vector>
+        <stl-vector pointer-type='stl-string'/>
 
         <int32_t name="unk_17c0"/>
         <int32_t name="unk_17c4"/>
diff --git a/df.ui.xml b/df.ui.xml
index a51d13e1a..cb52cdf15 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -33,9 +33,7 @@
         <stl-vector name='block_y' type-name='int32_t'/>
         <stl-vector name='block_z' type-name='int32_t'/>
 
-        <stl-vector name='units'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name='units' type-name='int32_t' ref-target='unit'/>
     </struct-type>
 
     <struct-type type-name='ui_hotkey'>
@@ -150,9 +148,7 @@
         <compound name='tax_collection'>
             <int16_t name='state'/>
             <int32_t/>
-            <stl-vector name='rooms'>
-                <pointer type-name='building'/>
-            </stl-vector>
+            <stl-vector name='rooms' pointer-type='building'/>
             <int32_t/>
             <int32_t comment='probably for tax collector'/>
             <int32_t comment='probably for guard1'/>
@@ -175,9 +171,7 @@
         <int32_t/>
         <int16_t name='bookkeeper_settings'/> noble bookkeeper precision: 10/100/1000/10000/all_accurate
 
-        <stl-vector name='caravans'>
-            <pointer type-name='caravan_state'/>
-        </stl-vector>
+        <stl-vector name='caravans' pointer-type='caravan_state'/>
         <int8_t/>
         <int16_t name='fortress_rank'/> outpost/hamlet/village/town/city/metropolis
         <int16_t name='progress_population' comment='?'/> (unles that's what the above is)
@@ -207,23 +201,15 @@
         <compound name='tasks' type-name='entity_activity_statistics'/>
         <stl-vector name='unk22e8'/>
 
-        <stl-vector name='activities'>
-            <pointer type-name='activity_info'/>
-        </stl-vector>
-        <stl-vector name='dip_meeting_info'>
-            <pointer type-name='meeting_diplomat_info'/>
-        </stl-vector>
+        <stl-vector name='activities' pointer-type='activity_info'/>
+        <stl-vector name='dip_meeting_info' pointer-type='meeting_diplomat_info'/>
 
-        <stl-vector name='unk230c' comment='based on 23a, most likely wounded dwarves waiting for rescue'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name='aid_requesters' type-name='int32_t' ref-target='unit'/>
 
         <bool name='game_over'/>
 
         <compound name='invasions'>
-            <stl-vector name='list' comment='goblins...'>
-                <pointer type-name='invasion_info'/>
-            </stl-vector>
+            <stl-vector name='list' pointer-type='invasion_info'/>
             <int32_t name='next_id'/>
         </compound>
 
@@ -266,19 +252,11 @@
             </pointer>
         </stl-vector>
 
-        <stl-vector name='pets'>
-            <pointer type-name='pet_info'/>
-        </stl-vector>
-        <stl-vector name='parties'>
-            <pointer type-name='party_info'/>
-        </stl-vector>
-        <stl-vector name='room_rent'>
-            <pointer type-name='room_rent_info'/>
-        </stl-vector>
+        <stl-vector name='pets' pointer-type='pet_info'/>
+        <stl-vector name='parties' pointer-type='party_info'/>
+        <stl-vector name='room_rent' pointer-type='room_rent_info'/>
 
-        <stl-vector name='dipscripts'>
-            <pointer type-name='dipscript_info'/>
-        </stl-vector>
+        <stl-vector name='dipscripts' pointer-type='dipscript_info'/>
 
         <stl-vector name='dipscript_popups' pointer-type='dipscript_popup'
                     comment='cause viewscreen_meetingst to pop up'/>
@@ -348,36 +326,36 @@
                 <stl-vector type-name='int32_t' name='pets'/>
             </compound>
             <compound name='price_setter'>
-                <stl-vector name='general_items' index-enum='item_type'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='weapons' index-refers-to='$global.world.raws.itemdefs.weapons[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='armor' index-refers-to='$global.world.raws.itemdefs.armor[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='handwear' index-refers-to='$global.world.raws.itemdefs.helms[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='footwear' index-refers-to='$global.world.raws.itemdefs.shoes[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='headwear' index-refers-to='$global.world.raws.itemdefs.gloves[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='legwear' index-refers-to='$global.world.raws.itemdefs.pants[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='prepared_food' index-refers-to='$global.world.raws.itemdefs.food[$]'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='wood'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='thread_cloth'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='bone'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='tooth'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='horn'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='pearl'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='shell'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='leather'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='silk'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='yarn'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='inorganic'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='meat'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='fish'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='plants'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='drinks'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='extract_animal'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='extract_plant'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='mill_animal'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='mill_plant'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='cheese_animal'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='cheese_plant'><pointer type-name='unit'/></stl-vector>
-                <stl-vector name='pets'><pointer type-name='unit'/></stl-vector>
+                <stl-vector name='general_items' index-enum='item_type' pointer-type='unit'/>
+                <stl-vector name='weapons' index-refers-to='$global.world.raws.itemdefs.weapons[$]' pointer-type='unit'/>
+                <stl-vector name='armor' index-refers-to='$global.world.raws.itemdefs.armor[$]' pointer-type='unit'/>
+                <stl-vector name='handwear' index-refers-to='$global.world.raws.itemdefs.helms[$]' pointer-type='unit'/>
+                <stl-vector name='footwear' index-refers-to='$global.world.raws.itemdefs.shoes[$]' pointer-type='unit'/>
+                <stl-vector name='headwear' index-refers-to='$global.world.raws.itemdefs.gloves[$]' pointer-type='unit'/>
+                <stl-vector name='legwear' index-refers-to='$global.world.raws.itemdefs.pants[$]' pointer-type='unit'/>
+                <stl-vector name='prepared_food' index-refers-to='$global.world.raws.itemdefs.food[$]' pointer-type='unit'/>
+                <stl-vector name='wood' pointer-type='unit'/>
+                <stl-vector name='thread_cloth' pointer-type='unit'/>
+                <stl-vector name='bone' pointer-type='unit'/>
+                <stl-vector name='tooth' pointer-type='unit'/>
+                <stl-vector name='horn' pointer-type='unit'/>
+                <stl-vector name='pearl' pointer-type='unit'/>
+                <stl-vector name='shell' pointer-type='unit'/>
+                <stl-vector name='leather' pointer-type='unit'/>
+                <stl-vector name='silk' pointer-type='unit'/>
+                <stl-vector name='yarn' pointer-type='unit'/>
+                <stl-vector name='inorganic' pointer-type='unit'/>
+                <stl-vector name='meat' pointer-type='unit'/>
+                <stl-vector name='fish' pointer-type='unit'/>
+                <stl-vector name='plants' pointer-type='unit'/>
+                <stl-vector name='drinks' pointer-type='unit'/>
+                <stl-vector name='extract_animal' pointer-type='unit'/>
+                <stl-vector name='extract_plant' pointer-type='unit'/>
+                <stl-vector name='mill_animal' pointer-type='unit'/>
+                <stl-vector name='mill_plant' pointer-type='unit'/>
+                <stl-vector name='cheese_animal' pointer-type='unit'/>
+                <stl-vector name='cheese_plant' pointer-type='unit'/>
+                <stl-vector name='pets' pointer-type='unit'/>
             </compound>
         </compound>
 
@@ -452,9 +430,7 @@
             <uint8_t name='sym_tile'/>
             <int16_t name='sym_fg_color'/>
             <int16_t name='sym_bg_color'/>
-            <stl-vector name='unk5c04'>
-                <pointer type-name='stl-string'/>
-            </stl-vector>
+            <stl-vector name='unk5c04' pointer-type='stl-string'/>
             <int32_t name='next_point_id'/>
             <int32_t name='next_route_id'/>
             <int32_t name='sel_route_idx'/>
@@ -463,17 +439,13 @@
         </compound>
 
         <compound name='burrows'>
-            <stl-vector name='list'>
-                <pointer type-name='burrow'/>
-            </stl-vector>
+            <stl-vector name='list' pointer-type='burrow'/>
             <int32_t name='next_id'/>
             <int32_t name='sel_index' refers-to='$$._parent.list[$]'/>
             <int32_t name='sel_id' ref-target='burrow'/>
             <bool name='in_confirm_delete'/>
             <bool name='in_add_units_mode'/>
-            <stl-vector name='list_units'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='list_units' pointer-type='unit'/>
             <stl-bit-vector name='sel_units' index-refers-to='$$._parent.list_units[$]'/>
             <int32_t name='unit_cursor_pos'/>
             <bool name='in_define_mode'/>
@@ -500,20 +472,15 @@
 
         <compound name='equipment'>
             <static-array name='items_by_type1' count='112' index-enum='item_type'>
-                <stl-vector>
-                    <pointer type-name='item'/>
-                </stl-vector>
+                <stl-vector pointer-type='item'/>
             </static-array>
 
             <static-array name='items_unassigned' count='112' index-enum='item_type'>
-                <stl-vector>
-                    <pointer type-name='item'/>
-                </stl-vector>
+                <stl-vector pointer-type='item'/>
             </static-array>
+
             <static-array name='items_assigned' count='112' index-enum='item_type'>
-                <stl-vector>
-                    <pointer type-name='item'/>
-                </stl-vector>
+                <stl-vector pointer-type='item'/>
             </static-array>
 
             <bitfield name='update'>
@@ -540,9 +507,7 @@
                 <int32_t ref-target='unit'/>
             </stl-vector>
 
-            <stl-vector name='hunter_ammunition'>
-                <pointer type-name='squad_ammo_spec'/>
-            </stl-vector>
+            <stl-vector name='hunter_ammunition' pointer-type='squad_ammo_spec'/>
             <stl-vector name='ammo_items'>
                 <int32_t ref-target='item'/>
             </stl-vector>
@@ -550,24 +515,15 @@
                 <int32_t ref-target='unit'/>
             </stl-vector>
 
-            <stl-vector name='training_assignments' comment='v0.34.06'>
-                <!-- sorted by animal_id -->
-                <pointer type-name='training_assignment'/>
-            </stl-vector>
+            <stl-vector name='training_assignments' comment='v0.34.06, sorted by animal_id' pointer-type='training_assignment'/>
         </compound>
 
         <compound name='hauling' comment='v0.34.08'>
-            <stl-vector name='routes'>
-                <pointer type-name='hauling_route'/>
-            </stl-vector>
+            <stl-vector name='routes' pointer-type='hauling_route'/>
             <int32_t name='next_id'/>
 
-            <stl-vector name='view_routes'>
-                <pointer type-name='hauling_route'/>
-            </stl-vector>
-            <stl-vector name='view_stops'>
-                <pointer type-name='hauling_stop'/>
-            </stl-vector>
+            <stl-vector name='view_routes' pointer-type='hauling_route'/>
+            <stl-vector name='view_stops' pointer-type='hauling_stop'/>
             <stl-vector name='view_bad'>
                 <int32_t/>
             </stl-vector>
@@ -575,19 +531,13 @@
 
             <bool name='in_stop'/>
             <int32_t name='cursor_stop'/>
-            <stl-vector name='stop_conditions'>
-                <pointer type-name='stop_depart_condition'/>
-            </stl-vector>
-            <stl-vector name='stop_links'>
-                <pointer type-name='route_stockpile_link'/>
-            </stl-vector>
+            <stl-vector name='stop_conditions' pointer-type='stop_depart_condition'/>
+            <stl-vector name='stop_links' pointer-type='route_stockpile_link'/>
             <bool name='in_advanced_cond'/>
 
             <bool name='in_assign_vehicle'/>
             <int32_t name='cursor_vehicle'/>
-            <stl-vector name='vehicles'>
-                <pointer type-name='vehicle'/>
-            </stl-vector>
+            <stl-vector name='vehicles' pointer-type='vehicle'/>
 
             <bool name='in_name'/>
             <stl-string name='old_name'/>
@@ -633,9 +583,7 @@
 
         <compound name='squads'>
             <stl-vector name='list' has-bad-pointers='true'
-                        comment='valid only when ui is displayed'>
-                <pointer type-name='squad'/>
-            </stl-vector>
+                        comment='valid only when ui is displayed' pointer-type='squad'/>
 
             <stl-vector name='unk6e08'/>
 
@@ -657,16 +605,12 @@
 
             <bool name='in_kill_order'/>
 
-            <stl-vector name='kill_rect_targets'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='kill_rect_targets' pointer-type='unit'/>
 
             <padding size='4'/>
 
             <bool name='in_kill_list'/>
-            <stl-vector name='kill_targets'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='kill_targets' pointer-type='unit'/>
             <stl-bit-vector name='sel_kill_targets' index-refers-to='$$._parent.kill_target[$]'/>
             <padding size='4'/>
 
diff --git a/df.units.xml b/df.units.xml
index 98705fb0f..faa47ff91 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -394,12 +394,8 @@
                   comment='used by necromancers for corpse locations'/>
         <uint32_t name='unk_144'/>
 
-        <stl-vector name='specific_refs'>
-            <pointer type-name='specific_ref'/>
-        </stl-vector>
-        <stl-vector name='general_refs'>
-            <pointer type-name='general_ref'/>
-        </stl-vector>
+        <stl-vector name='specific_refs' pointer-type='specific_ref'/>
+        <stl-vector name='general_refs' pointer-type='general_ref'/>
 
         <compound name='military'>
             <int32_t name='squad_id' ref-target='squad'/>
@@ -413,25 +409,17 @@
                         ref-target='item' comment='v0.34.06'/>
 
             <static-array name='uniforms' count='4'>
-                <stl-vector>
-                    <int32_t ref-target='item'/>
-                </stl-vector>
+                <stl-vector type-name='int32_t' ref-target='item'/>
             </static-array>
 
             <bitfield name='pickup_flags'>
                 <flag-bit name='update'/>
             </bitfield>
 
-            <stl-vector name='uniform_pickup'>
-                <int32_t ref-target='item'/>
-            </stl-vector>
-            <stl-vector name='uniform_drop'>
-                <int32_t ref-target='item'/>
-            </stl-vector>
+            <stl-vector name='uniform_pickup' type-name='int32_t' ref-target='item'/>
+            <stl-vector name='uniform_drop' type-name='int32_t' ref-target='item'/>
 
-            <stl-vector name='individual_drills'>
-                <int32_t ref-target='activity_entry'/>
-            </stl-vector>
+            <stl-vector name='individual_drills' type-name='int32_t' ref-target='activity_entry'/>
         </compound>
 
         <compound name='animal'>
@@ -491,22 +479,12 @@
 
         <int32_t name='riding_item_id' ref-target='item' comment='v0.34.08'/>
 
-        <stl-vector name='inventory'>
-            <pointer type-name='unit_inventory_item'/>
-        </stl-vector>
+        <stl-vector name='inventory' pointer-type='unit_inventory_item'/>
 
-        <stl-vector name='owned_items'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
-        <stl-vector name='traded_items' comment='items brought to trade depot'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
-        <stl-vector name='owned_buildings'>
-            <pointer type-name='building'/>
-        </stl-vector>
-        <stl-vector name='corpse_parts' comment='entries remain even when items are destroyed'>
-            <int32_t ref-target='item'/>
-        </stl-vector>
+        <stl-vector name='owned_items' type-name='int32_t' ref-target='item'/>
+        <stl-vector name='traded_items' comment='items brought to trade depot' type-name='int32_t' ref-target='item'/>
+        <stl-vector name='owned_buildings' pointer-type='building'/>
+        <stl-vector name='corpse_parts' comment='entries remain even when items are destroyed' type-name='int32_t' ref-target='item'/>
 
         <compound name='job'>
             <int32_t name='account'/>
@@ -527,9 +505,7 @@
         <compound name='body'>
             <compound name='components' type-name='body_component_info'/>
 
-            <stl-vector name='wounds'>
-                <pointer type-name='unit_wound'/>
-            </stl-vector>
+            <stl-vector name='wounds' pointer-type='unit_wound'/>
             <int32_t name='wound_next_id' init-value='1'/>
 
             <static-array name='unk_39c' count='10'>
@@ -551,9 +527,7 @@
             <int32_t name='infection_level'
                       comment='GETS_INFECTIONS_FROM_ROT sets; DISEASE_RESISTANCE reduces; >=300 causes bleeding'/>
 
-            <stl-vector name='spatters'>
-                <pointer type-name='unit_spatter'/>
-            </stl-vector>
+            <stl-vector name='spatters' pointer-type='unit_spatter'/>
         </compound>
 
         <compound name='appearance'>
@@ -671,9 +645,7 @@
         </compound>
 
         <compound name='status'>
-            <stl-vector name='misc_traits'>
-                <pointer type-name='unit_misc_trait'/>
-            </stl-vector>
+            <stl-vector name='misc_traits' pointer-type='unit_misc_trait'/>
 
             <pointer name='eat_history'>
                 <compound name='food'>
@@ -699,37 +671,24 @@
             <int32_t name='demand_timeout' init-value='1000'/>
             <int32_t name='mandate_timeout' init-value='1000'/>
 
-            <stl-vector name='attacker_ids'>
-                <int32_t ref-target='unit'/>
-            </stl-vector>
+            <stl-vector name='attacker_ids' type-name='int32_t' ref-target='unit'/>
             <stl-vector name='attacker_unk' type-name='int16_t'/>
 
             <uint8_t name='face_direction' comment='for wagons'/>
 
             <compound type-name='language_name' name='artifact_name'/>
-            <stl-vector name='souls'>
-                <pointer type-name='unit_soul'/>
-            </stl-vector>
+            <stl-vector name='souls' pointer-type='unit_soul'/>
             <pointer name='current_soul' type-name='unit_soul'/>
 
-            <stl-vector name='demands'>
-                <pointer type-name='unit_demand'/>
-            </stl-vector>
+            <stl-vector name='demands' pointer-type='unit_demand'/>
 
             <static-array type-name='bool' name='labors' index-enum='unit_labor' count='94'/>
 
-            <stl-vector name='wrestle_items'>
-                <pointer type-name='unit_item_wrestle'/>
-            </stl-vector>
+            <stl-vector name='wrestle_items' pointer-type='unit_item_wrestle'/>
             <stl-vector name='observed_traps' type-name='int32_t' ref-target='building'/>
 
-            <stl-vector name='recent_events'>
-                <pointer type-name='unit_thought'/>
-            </stl-vector>
-
-            <stl-vector name='dreams' comment='moved into recent_events upon waking up'>
-                <pointer type-name='unit_thought'/>
-            </stl-vector>
+            <stl-vector name='recent_events' pointer-type='unit_thought'/>
+            <stl-vector name='dreams'  pointer-type='unit_thought' comment='moved into recent_events upon waking up'/>
 
             <int32_t name='happiness' init-value='100'/>
             <int16_t name='insanity_chance' comment='increases gradually when miserable'/>
@@ -779,9 +738,7 @@
             <int16_t name='limbs_fly_max'/>
             <int16_t name='limbs_fly_count'/>
 
-            <stl-vector name='body_part_temperature'>
-                <pointer name='temperature' type-name='temperaturest'/>
-            </stl-vector>
+            <stl-vector name='body_part_temperature' pointer-type='temperaturest'/>
 
             <uint32_t name='unk_7b4'/> set to 0 after move
 
@@ -797,12 +754,8 @@
         </compound>
 
         <compound name='syndromes'>
-            <stl-vector name='active'>
-                <pointer type-name='unit_syndrome'/>
-            </stl-vector>
-            <stl-vector name='unk_7d4'>
-                <int32_t ref-target='syndrome'/>
-            </stl-vector>
+            <stl-vector name='active' pointer-type='unit_syndrome'/>
+            <stl-vector name='unk_7d4' type-name='int32_t' ref-target='syndrome'/>
             <stl-vector name='unk_7e4' type-name='int16_t'/>
         </compound>
 
@@ -818,14 +771,9 @@
 
         <pointer name='health' type-name='unit_health_info'/>
 
-        <stl-vector name='used_items'>
-            <comment>Contains worn clothes, armor, weapons, arrows fired by archers</comment>
-            <pointer type-name='unit_item_use'/>
-        </stl-vector>
+        <stl-vector name='used_items' pointer-type='unit_item_use' comment='Contains worn clothes, armor, weapons, arrows fired by archers'/>
 
-        <stl-vector name='adventurer_knows' comment='if not, no names'>
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name='adventurer_knows' comment='if not, no names' type-name='int32_t' ref-target='unit'/>
 
         <compound name='enemy'>
             <stl-vector name='unk1' comment='v0.34.01'/>
@@ -877,9 +825,7 @@
         <int32_t name='weight'/>
         <int32_t name='weight_fraction' comment='1e-6'/>
 
-        <stl-vector name='burrows'>
-            <int32_t ref-target='burrow'/>
-        </stl-vector>
+        <stl-vector name='burrows' type-name='int32_t' ref-target='burrow'/>
 
         <int32_t name='combat_side_id'/>
     </struct-type>
@@ -1444,12 +1390,8 @@
 
         <static-array type-name='unit_attribute' name='mental_attrs' count='13' index-enum='mental_attribute_type'/>
 
-        <stl-vector name='skills'>
-            <pointer type-name='unit_skill'/>
-        </stl-vector>
-        <stl-vector name='preferences'>
-            <pointer type-name='unit_preference'/>
-        </stl-vector>
+        <stl-vector name='skills' pointer-type='unit_skill'/>
+        <stl-vector name='preferences' pointer-type='unit_preference'/>
 
         <static-array type-name='uint16_t' name='traits' count='30' index-enum='personality_facet_type'/>
 
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index cdfe1d1f4..6f852a7f5 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -276,19 +276,13 @@
         <bool name='in_embark_large'/>
         <bool name="in_embark_normal"/>
 
-        <stl-vector name="highlighted_sites">
-            <pointer type-name='world_site'/>
-        </stl-vector>
-        <stl-vector name="local_sites">
-            <pointer type-name='world_site'/>
-        </stl-vector>
+        <stl-vector name="highlighted_sites" pointer-type='world_site'/>
+        <stl-vector name="local_sites" pointer-type='world_site'/>
         <int32_t name="unk_74"/>
 
         <int32_t name="civ_idx" refers-to='$$._global.available_civs[$]'/>
 
-        <stl-vector name="available_civs">
-            <pointer type-name="historical_entity"/>
-        </stl-vector>
+        <stl-vector name="available_civs" pointer-type="historical_entity"/>
 
         <compound name='finder'>
             <int32_t/>
@@ -343,9 +337,7 @@
         <static-string name='str_filter' size='256'/>
         <int32_t name='top_idx'/>
         <int32_t name='sel_idx'/>
-        <stl-vector name='orders'>
-            <pointer type-name='manager_order_template'/>
-        </stl-vector>
+        <stl-vector name='orders' pointer-type='manager_order_template'/>
         <stl-vector name='pages' type-name='int32_t' comment='first index for each page'/>
         <bool name='want_quantity'/>
     </class-type>
@@ -371,12 +363,8 @@
 
         <bool name="view_skills"/>
 
-        <stl-vector name="inventory">
-            <pointer type-name="unit_inventory_item"/>
-        </stl-vector>
-        <stl-vector name="spatters">
-            <pointer type-name="unit_spatter"/>
-        </stl-vector>
+        <stl-vector name="inventory" pointer-type="unit_inventory_item"/>
+        <stl-vector name="spatters" pointer-type="unit_spatter"/>
     </class-type>
 
     <class-type type-name='viewscreen_dungeon_wrestlest' inherits-from='viewscreen'>
@@ -497,19 +485,13 @@
     <class-type type-name='viewscreen_itemst' inherits-from='viewscreen'>
         <pointer name="item" type-name="item"/>
 
-        <stl-vector name="entry_ref">
-            <pointer type-name="general_ref"/>
-        </stl-vector>
+        <stl-vector name="entry_ref" pointer-type='general_ref'/>
         <stl-vector name="entry_indent" type-name='int16_t'/>
         <stl-vector name="unk_34">
             <pointer comment='NULL'/>
         </stl-vector>
-        <stl-vector name="entry_string">
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name="entry_reaction">
-            <int32_t/>
-        </stl-vector>
+        <stl-vector name="entry_string" pointer-type='stl-string'/>
+        <stl-vector name="entry_reaction" type-name='int32_t'/>
         <int32_t name="cursor_pos"/>
 
         <bool name="caption_uses"/>
@@ -525,12 +507,8 @@
 
         <int32_t name="cursor_pos"/>
 
-        <stl-vector name="jobs">
-            <pointer type-name='job'/>
-        </stl-vector>
-        <stl-vector name="units">
-            <pointer type-name="unit"/>
-        </stl-vector>
+        <stl-vector name="jobs" pointer-type='job'/>
+        <stl-vector name="units" pointer-type='unit'/>
     </class-type>
 
     <class-type type-name='viewscreen_jobmanagementst' inherits-from='viewscreen'>
@@ -599,14 +577,10 @@
 
     <class-type type-name='viewscreen_layer_assigntradest'
                 inherits-from='viewscreen_layer'>
-        <stl-vector name='info'>
-            <pointer type-name='assign_trade_status'/>
-        </stl-vector>
+        <stl-vector name='info' pointer-type='assign_trade_status'/>
         <pointer name='depot' type-name='building_tradedepotst'/>
         <static-array name='lists' count='61'>
-            <stl-vector>
-                <int32_t refers-to='$$._global.info[$]'/>
-            </stl-vector>
+            <stl-vector type-name='int32_t' refers-to='$$._global.info[$]'/>
         </static-array>
         <stl-vector name='visible_lists' type-name='int16_t'/>
         <bool name='sort_distance'/>
@@ -649,29 +623,19 @@
 
     <class-type type-name='viewscreen_layer_militaryst' inherits-from='viewscreen_layer'>
         <compound name='squads'>
-            <stl-vector name="list">
-                <pointer type-name='squad'/>
-            </stl-vector>
-            <stl-vector name="leader_positions">
-                <pointer type-name="entity_position"/>
-            </stl-vector>
-            <stl-vector name="leader_assignments">
-                <pointer type-name="entity_position_assignment"/>
-            </stl-vector>
+            <stl-vector name="list" pointer-type='squad'/>
+            <stl-vector name="leader_positions" pointer-type='entity_position'/>
+            <stl-vector name="leader_assignments" pointer-type='entity_position_assignment'/>
             <stl-bit-vector name='can_appoint'/>
         </compound>
 
         <compound name='positions'>
-            <stl-vector name="assigned">
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name="assigned" pointer-type='unit'/>
             <stl-vector name="skill">
                 <enum base-type='int16_t' type-name='job_skill'/>
             </stl-vector>
             <stl-vector name="unk_84" type-name='int32_t'/>
-            <stl-vector name="candidates">
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name="candidates" pointer-type='unit'/>
         </compound>
 
         <enum name="page">
@@ -699,18 +663,14 @@
         <bool name="in_new_squad"/>
         <bool name='unk_e6'/>
 
-        <stl-vector name="captain_positions">
-            <pointer type-name='entity_position'/>
-        </stl-vector>
+        <stl-vector name="captain_positions" pointer-type='entity_position'/>
         <pointer name='new_position' type-name='entity_position'/>
 
         <bool name="unk_fc"/>
         <bool name='in_rename_alert'/>
         <bool name='in_delete_alert'/>
 
-        <stl-vector name="alert_squads">
-            <pointer type-name='squad'/>
-        </stl-vector>
+        <stl-vector name="alert_squads" pointer-type='squad'/>
 
         <compound name='equip'>
             <enum name='mode'>
@@ -718,21 +678,13 @@
                 <enum-item name='Uniform'/>
                 <enum-item name='Priority'/>
             </enum>
-            <stl-vector name="squads">
-                <pointer type-name='squad'/>
-            </stl-vector>
-            <stl-vector name="units">
-                <pointer type-name='unit'/>
-            </stl-vector>
-            <stl-vector name="specific_items">
-                <pointer type-name='item'/>
-            </stl-vector>
+            <stl-vector name="squads" pointer-type='squad'/>
+            <stl-vector name="units" pointer-type='unit'/>
+            <stl-vector name="specific_items" pointer-type='item'/>
             <int32_t name='prio_in_move' refers-to='$$._parent.squads[$]'/>
 
             <compound name='assigned'>
-                <stl-vector name="spec">
-                    <pointer type-name='squad_uniform_spec'/>
-                </stl-vector>
+                <stl-vector name="spec" pointer-type='squad_uniform_spec'/>
                 <stl-vector name="category">
                     <enum base-type='int16_t' type-name='uniform_category'/>
                 </stl-vector>
@@ -742,9 +694,7 @@
             <stl-vector name="unk_178"/>
             <pointer name="edit_spec" type-name='squad_uniform_spec'/>
 
-            <stl-vector name="uniforms">
-                <pointer type-name='entity_uniform'/>
-            </stl-vector>
+            <stl-vector name="uniforms" pointer-type='entity_uniform'/>
             <compound name='uniform'>
                 <stl-vector name="type">
                     <enum base-type='int16_t' type-name='item_type'/>
@@ -756,9 +706,7 @@
                     <enum base-type='int16_t' type-name='uniform_category'/>
                 </stl-vector>
                 <stl-vector name="index" type-name='int16_t'/>
-                <stl-vector name="info">
-                    <pointer type-name='entity_uniform_item'/>
-                </stl-vector>
+                <stl-vector name="info" pointer-type='entity_uniform_item'/>
             </compound>
 
             <enum name='edit_mode'>
@@ -797,18 +745,14 @@
                 <compound name='specific' type-name='material_vec_ref'/>
             </compound>
             <compound name='color'>
-                <stl-vector name="id">
-                    <int32_t ref-target='descriptor_color'/>
-                </stl-vector>
+                <stl-vector name="id" type-name='int32_t' ref-target='descriptor_color'/>
                 <stl-bit-vector name='dye'/>
             </compound>
             <bool name='in_name_uniform'/>
         </compound>
 
         <compound name='ammo'>
-            <stl-vector name="squads">
-                <pointer type-name='squad' comment='null for hunters'/>
-            </stl-vector>
+            <stl-vector name="squads" pointer-type='squad' comment='null for hunters'/>
             <bool name='in_add_item'/>
             <bool name='in_set_material'/>
             <compound name='add_item'>
@@ -828,9 +772,7 @@
             </compound>
         </compound>
 
-        <stl-vector name="supplies_squads">
-            <pointer type-name='squad'/>
-        </stl-vector>
+        <stl-vector name="supplies_squads" pointer-type='squad'/>
     </class-type>
 
     <class-type type-name='viewscreen_layer_musicsoundst' inherits-from='viewscreen_layer'/>
@@ -859,15 +801,9 @@
                 <int32_t name='weight'/>
             </pointer>
         </stl-vector>
-        <stl-vector name="assignments">
-            <pointer type-name="entity_position_assignment"/>
-        </stl-vector>
-        <stl-vector name="histfigs">
-            <int32_t ref-target='historical_figure'/>
-        </stl-vector>
-        <stl-vector name="groups">
-            <int32_t ref-target='historical_entity'/>
-        </stl-vector>
+        <stl-vector name="assignments" pointer-type='entity_position_assignment'/>
+        <stl-vector name="histfigs" type-name='int32_t' ref-target='historical_figure'/>
+        <stl-vector name="groups" type-name='int32_t' ref-target='historical_entity'/>
     </class-type>
 
     <bitfield-type type-name='health_view_bits1'>
@@ -969,9 +905,7 @@
                 inherits-from='viewscreen_layer'>
         <int32_t/>
 
-        <stl-vector name="unit">
-            <pointer type-name="unit"/>
-        </stl-vector>
+        <stl-vector name="unit" pointer-type='unit'/>
         <stl-vector name="bits1">
             <compound type-name='health_view_bits1'/>
         </stl-vector>
@@ -1026,12 +960,8 @@
         <stl-vector name="list_ids">
             <enum type-name='stockpile_list' base-type='int32_t'/>
         </stl-vector>
-        <stl-vector name="item_names">
-            <pointer type-name='stl-string'/>
-        </stl-vector>
-        <stl-vector name="item_status">
-            <pointer type-name='bool'/>
-        </stl-vector>
+        <stl-vector name="item_names" pointer-type='stl-string'/>
+        <stl-vector name="item_status" pointer-type='bool'/>
         <stl-string name="title"/>
     </class-type>
 
@@ -1095,9 +1025,7 @@
                 inherits-from='viewscreen_layer'>
         <pointer name="profile" type-name='workshop_profile'/>
 
-        <stl-vector name="workers">
-            <pointer type-name="unit"/>
-        </stl-vector>
+        <stl-vector name="workers" pointer-type='unit'/>
     </class-type>
 
     <class-type type-name='viewscreen_layer_world_gen_paramst' inherits-from='viewscreen_layer'>
@@ -1313,9 +1241,7 @@
             </compound>
         </stl-vector>
         <stl-vector name="is_vermin" type-name='bool'/>
-        <stl-vector name="pet_info">
-            <pointer type-name='pet_info'/>
-        </stl-vector>
+        <stl-vector name="pet_info" pointer-type='pet_info'/>
         <stl-vector name="is_tame" type-name='bool'/>
         <stl-vector name="is_adopting" type-name='bool'/>
 
@@ -1326,14 +1252,10 @@
         </enum>
 
         <int32_t name='knowledge_page'/>
-        <stl-vector name="known">
-            <int32_t ref-target='creature_raw'/>
-        </stl-vector>
+        <stl-vector name="known" type-name='int32_t' ref-target='creature_raw'/>
 
         <int32_t name='trainer_cursor'/>
-        <stl-vector name="trainer_unit">
-            <pointer type-name='unit'/>
-        </stl-vector>
+        <stl-vector name="trainer_unit" pointer-type='unit'/>
         <stl-vector name="trainer_mode">
             <int32_t comment='0 any, 1 any unassigned, 2 none, 3 specific'/>
         </stl-vector>
@@ -1492,9 +1414,7 @@
         <int16_t name='in_group_mode'/>
         <stl-vector name="category_total" type-name='int32_t' index-enum='item_type'/>
         <stl-vector name="category_busy" type-name='int32_t' index-enum='item_type'/>
-        <stl-vector name="items">
-            <pointer type-name="item"/>
-        </stl-vector>
+        <stl-vector name="items" pointer-type='item'/>
         <stl-vector name='group_item_type'>
             <enum base-type='int16_t' type-name='item_type'/>
         </stl-vector>
@@ -1621,12 +1541,8 @@
         <bool name='has_traders'/>
         <pointer name="trader" type-name="unit"/>
         <pointer name="broker" type-name="unit"/>
-        <stl-vector name="trader_items">
-            <pointer type-name="item"/>
-        </stl-vector>
-        <stl-vector name="broker_items">
-            <pointer type-name="item"/>
-        </stl-vector>
+        <stl-vector name="trader_items" pointer-type='item'/>
+        <stl-vector name="broker_items" pointer-type='item'/>
         <stl-vector name="trader_selected" type-name='bool'/>
         <stl-vector name="broker_selected" type-name='bool'/>
         <stl-vector name="trader_count" type-name='int32_t'/>
@@ -1646,9 +1562,7 @@
     <class-type type-name='viewscreen_tradelistst' inherits-from='viewscreen'>
         <int32_t name="unk_10"/>
         <pointer name="depot" type-name="building_tradedepotst"/>
-        <stl-vector name="caravans">
-            <pointer type-name="caravan_state"/>
-        </stl-vector>
+        <stl-vector name="caravans" pointer-type='caravan_state'/>
     </class-type>
 
     <class-type type-name='viewscreen_treasurelistst' inherits-from='viewscreen'> list artifacts in fort mode
@@ -1677,14 +1591,10 @@
             <int32_t refers-to='$$._global.units[$$._key][$]'/>
         </static-array>
         <static-array name='jobs' count='4' index-enum='viewscreen_unitlist_page'>
-            <stl-vector>
-                <pointer type-name='job'/>
-            </stl-vector>
+            <stl-vector pointer-type='job'/>
         </static-array>
         <static-array name='units' count='4' index-enum='viewscreen_unitlist_page'>
-            <stl-vector>
-                <pointer type-name="unit"/>
-            </stl-vector>
+            <stl-vector pointer-type='unit'/>
         </static-array>
     </class-type>
 
diff --git a/df.world-data.xml b/df.world-data.xml
index 98900290b..898e05b63 100644
--- a/df.world-data.xml
+++ b/df.world-data.xml
@@ -135,9 +135,7 @@
         <int32_t name="unk_a0"/>
         <int32_t name="unk_a4"/>
 
-        <stl-vector name="population">
-            <pointer type-name='world_population'/>
-        </stl-vector>
+        <stl-vector name="population" pointer-type='world_population'/>
 
         <static-array name="unk_118" count="51">
             <int32_t/>
@@ -213,15 +211,9 @@
         <code-helper name='describe'>(describe-obj $.name)</code-helper>
 
         <compound name='path' type-name='coord2d_path'/>
-        <stl-vector name="unk_8c">
-            <int32_t/>
-        </stl-vector>
-        <stl-vector name="unk_9c">
-            <int16_t/>
-        </stl-vector>
-        <stl-vector name="elevation">
-            <int16_t/>
-        </stl-vector>
+        <stl-vector name="unk_8c" type-name='int32_t'/>
+        <stl-vector name="unk_9c" type-name='int16_t'/>
+        <stl-vector name="elevation" type-name='int16_t'/>
 
         <compound name='end_pos' type-name='coord2d'/>
         <df-flagarray name='flags'/>
@@ -248,9 +240,7 @@
 
         <code-helper name='describe'>(describe-obj $.mat_index.ref-target)</code-helper>
 
-        <stl-vector name="vein_mat">
-            <int32_t ref-target='inorganic_raw'/>
-        </stl-vector>
+        <stl-vector name="vein_mat" type-name='int32_t' ref-target='inorganic_raw'/>
         <stl-vector name="vein_nested_in">
             -- Index of the other vein this one is nested in, or -1
             <int16_t refers-to='$$._global.vein_mat[$].ref-target'/>
@@ -258,9 +248,7 @@
         <stl-vector name="vein_type">
             <enum base-type='int8_t' type-name='inclusion_type'/>
         </stl-vector>
-        <stl-vector name="vein_unk_38" comment='density??'>
-            <int8_t/>
-        </stl-vector>
+        <stl-vector name="vein_unk_38" type-name='int8_t' comment='density??'/>
 
         <int16_t name="top_height" comment='negative'/>
         <int16_t name="bottom_height"/>
@@ -272,9 +260,7 @@
 
         <code-helper name='describe'>(fmt "~A geo_layers" $.layers.count)</code-helper>
 
-        <stl-vector name="layers">
-            <pointer type-name='world_geo_layer'/>
-        </stl-vector>
+        <stl-vector name="layers" pointer-type='world_geo_layer'/>
     </struct-type>
 
     <struct-type type-name='world_region_feature'>
@@ -463,9 +449,7 @@
     <struct-type type-name='region_map_entry'>
         <int32_t name="unk_0"/>
         <int32_t name="finder_rank" init-value='-1'/>
-        <stl-vector name="sites">
-            <pointer type-name='world_site'/>
-        </stl-vector>
+        <stl-vector name="sites" pointer-type='world_site'/>
         <df-flagarray name='flags' index-enum='region_map_entry_flags'/>
         <int16_t name="elevation" comment='~40 ocean -> ~100 plains -> ~200 mointains'/>
         <int16_t name="rainfall"/>
@@ -493,9 +477,7 @@
     <struct-type type-name='entity_claim_mask'>
         <pointer name="map" is-array='true'>
             <pointer is-array='true'>
-                <stl-vector name='entities'>
-                    <int32_t ref-target='historical_entity'/>
-                </stl-vector>
+                <stl-vector name='entities' type-name='int32_t' ref-target='historical_entity'/>
                 <stl-vector name='region_masks'>
                     <pointer>
                         <static-array count='16'>
@@ -579,9 +561,7 @@
         <pointer type-name='uint32_t' is-array='true' comment='width*height'/>
         <pointer type-name='uint8_t' is-array='true' comment='align(width,4)*height'/>
 
-        <stl-vector name='region_details'>
-            <pointer type-name='world_region_details'/>
-        </stl-vector>
+        <stl-vector name='region_details' pointer-type='world_region_details'/>
 
         <int32_t name="adv_region_x"/>
         <int32_t name="adv_region_y"/>
@@ -610,21 +590,15 @@
         <compound name="entity_claims1" type-name='entity_claim_mask'/>
         <compound name="entity_claims2" type-name='entity_claim_mask'/>
 
-        <stl-vector name="sites">
-            <pointer type-name='world_site'/>
-        </stl-vector>
+        <stl-vector name="sites" pointer-type='world_site'/>
 
-        <stl-vector name="site_unk130">
-            <pointer type-name='world_site_unk130'/>
-        </stl-vector>
+        <stl-vector name="site_unk130" pointer-type='world_site_unk130'/>
 
         <stl-vector name="unk_140">
             <pointer>
                 <int32_t name='index'/>
                 <static-array name='resource_allotments' count='100'>
-                    <stl-vector>
-                        <pointer type-name='resource_allotment_specifier'/>
-                    </stl-vector>
+                    <stl-vector pointer-type='resource_allotment_specifier'/>
                 </static-array>
                 <int32_t name='unk1'/>
                 <int32_t name='unk2'/>
@@ -665,18 +639,10 @@
         <stl-vector type-name='pointer' comment='v0.34.01'/>
         <stl-vector name='building_data' type-name='pointer' comment='v0.34.01'/>
 
-        <stl-vector name="landmasses">
-            <pointer type-name='world_landmass'/>
-        </stl-vector>
-        <stl-vector name="regions">
-            <pointer type-name='world_region'/>
-        </stl-vector>
-        <stl-vector name="underground_regions">
-            <pointer type-name='world_underground_region'/>
-        </stl-vector>
-        <stl-vector name="geo_biomes">
-            <pointer type-name='world_geo_biome'/>
-        </stl-vector>
+        <stl-vector name="landmasses" pointer-type='world_landmass'/>
+        <stl-vector name="regions" pointer-type='world_region'/>
+        <stl-vector name="underground_regions" pointer-type='world_underground_region'/>
+        <stl-vector name="geo_biomes" pointer-type='world_geo_biome'/>
         <stl-vector name="mountain_peaks">
             <pointer>
                 <compound name='name' type-name='language_name'/>
@@ -685,9 +651,7 @@
                 <int16_t name="height"/>
             </pointer>
         </stl-vector>
-        <stl-vector name="rivers">
-            <pointer type-name='world_river'/>
-        </stl-vector>
+        <stl-vector name="rivers" pointer-type='world_river'/>
 
         <pointer name="region_map" is-array='true'>
             <pointer is-array='true' type-name='region_map_entry'/>
@@ -728,9 +692,7 @@
             </pointer>
         </pointer>
 
-        <stl-vector name="active_site">
-            <pointer type-name='world_site'/>
-        </stl-vector>
+        <stl-vector name="active_site" pointer-type='world_site'/>
 
         <pointer name="feature_map" is-array='true'>
             <pointer is-array='true'>
@@ -739,7 +701,7 @@
                 <pointer name='features'>
                     <static-array name='feature_init' count='16'>
                         <static-array count='16'>
-                            <stl-vector><pointer type-name='feature_init'/></stl-vector>
+                            <stl-vector pointer-type='feature_init'/>
                         </static-array>
                     </static-array>
                     <static-array name='unk' count='16'>
@@ -755,9 +717,7 @@
 
         <df-flagarray name='flags'/>
 
-        <stl-vector name="old_sites">
-            <int32_t ref-target='world_site'/>
-        </stl-vector>
+        <stl-vector name="old_sites" type-name='int32_t' ref-target='world_site'/>
         <stl-vector name="old_site_x" type-name='int32_t'/>
         <stl-vector name="old_site_y" type-name='int32_t'/>
 
@@ -773,9 +733,7 @@
 
         <stl-vector name="unk_274">
             <pointer>
-                <stl-vector name="unk_0">
-                    <pointer type-name="historical_figure"/>
-                </stl-vector>
+                <stl-vector name="unk_0" pointer-type="historical_figure"/>
                 <stl-vector name="unk_10">
                     <pointer>
                         <int32_t name="unk_0"/>
diff --git a/df.world-site.xml b/df.world-site.xml
index b755a19dc..b1234fc64 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -174,15 +174,11 @@
 
         <int32_t name="id"/>
 
-        <stl-vector name="nemesis" comment='could also be units - they happen to coincide here'>
-            <int32_t ref-target='nemesis_record'/>
-        </stl-vector>
+        <stl-vector name="nemesis" type-name='int32_t' ref-target='nemesis_record'/>
 
         <stl-vector name="unk_94"/>
 
-        <stl-vector name="animals">
-            <pointer type-name='world_population'/>
-        </stl-vector>
+        <stl-vector name="animals" pointer-type='world_population'/>
 
         <stl-vector name="inhabitants" pointer-type='world_site_inhabitant'/>
 
@@ -231,9 +227,7 @@
 
         <df-flagarray name='flags'/>
 
-        <stl-vector name="buildings">
-            <pointer type-name='abstract_building'/>
-        </stl-vector>
+        <stl-vector name="buildings" pointer-type='abstract_building'/>
 
         <int32_t name="next_building_id"/>
         <int32_t name="created_tick"/>
diff --git a/df.world.xml b/df.world.xml
index 0f31422d5..b41eab370 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -52,9 +52,7 @@
         <int32_t name='id'/>
         <int32_t name="unk_4"/>
 
-        <stl-vector name="unk_8">
-            <int32_t ref-target='unit'/>
-        </stl-vector>
+        <stl-vector name="unk_8" type-name='int32_t' ref-target='unit'/>
 
         <int32_t name="victim" ref-target='unit'/>
         <int32_t name="killer" ref-target='unit'/>
@@ -194,25 +192,15 @@
             </pointer>
         </stl-vector>
 
-        <stl-vector name='unk_20'>
-            <pointer type-name='world_unk_20'/>
-        </stl-vector>
+        <stl-vector name='unk_20' pointer-type='world_unk_20'/>
 
-        <stl-vector name='engravings'>
-            <pointer type-name='engraving'/>
-        </stl-vector>
+        <stl-vector name='engravings' pointer-type='engraving'/>
 
         <compound name='vermin'>
-            <stl-vector name='all'>
-                <pointer type-name='vermin'/>
-            </stl-vector>
-            <stl-vector name='colonies'>
-                <pointer type-name='vermin'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='vermin'/>
+            <stl-vector name='colonies' pointer-type='vermin'/>
         </compound>
-        <stl-vector name='unk_3C'>
-            <pointer type-name='coord'/>
-        </stl-vector>
+        <stl-vector name='unk_3C' pointer-type='coord'/>
         <stl-vector name='campfires'>
             <pointer>
                 <compound type-name='coord' name='pos'/>
@@ -263,9 +251,7 @@
                 <int8_t/>
             </pointer>
         </stl-vector>
-        <stl-vector name='constructions'>
-            <pointer type-name='construction'/>
-        </stl-vector>
+        <stl-vector name='constructions' pointer-type='construction'/>
         <stl-vector name='unk_90'>
             <pointer>
                 <int16_t name='x1'/>
@@ -313,9 +299,7 @@
                 <int16_t/>
             </pointer>
         </stl-vector>
-        <stl-vector name='unk_C0'>
-            <pointer type-name='world_unk_c0'/>
-        </stl-vector>
+        <stl-vector name='unk_C0' pointer-type='world_unk_c0'/>
         <stl-vector name='unk_CC'>
             <pointer>
                 <int32_t/>
@@ -383,9 +367,7 @@
                 <int16_t/>
             </pointer>
         </stl-vector>
-        <stl-vector name='effects'>
-            <pointer type-name='effect_info'/>
-        </stl-vector>
+        <stl-vector name='effects' pointer-type='effect_info'/>
 
         <stl-vector name='coin_batches'>
             <pointer>
@@ -405,28 +387,20 @@
             </pointer>
         </stl-vector>
 
-        <stl-vector name='populations'>
-            <pointer type-name='local_population'/>
-        </stl-vector>
+        <stl-vector name='populations' pointer-type='local_population'/>
 
         --
 
-        <stl-vector name='manager_orders'>
-            <pointer type-name='manager_order'/>
-        </stl-vector>
+        <stl-vector name='manager_orders' pointer-type='manager_order'/>
 
-        <stl-vector name='mandates'>
-            <pointer type-name='mandate'/>
-        </stl-vector>
+        <stl-vector name='mandates' pointer-type='mandate'/>
 
         --  Entities
 
         <compound name='entities'>
             <stl-vector name='all' pointer-type='historical_entity'/>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='historical_entity'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='historical_entity'/>
         </compound>
 
         -- Apparently a temporary buffer for world construction stuff
@@ -439,26 +413,15 @@
         -- Units
 
         <compound name='units'>
-            <stl-vector name='all'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='unit'/>
 
-            <stl-vector name='active'>
-                <comment>
-                    not sorted; [0] is adventurer; removed if kidnapped etc but not if dead
-                </comment>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='active' pointer-type='unit' comment='not sorted, entry 0 is adventurer'/>
 
             <static-array name='other' count='3' index-enum='units_other_id'>
-                <stl-vector>
-                    <pointer type-name='unit'/>
-                </stl-vector>
+                <stl-vector pointer-type='unit'/>
             </static-array>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='unit'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='unit'/>
         </compound>
 
         -- Unit and Art Chunks
@@ -469,13 +432,9 @@
         -- Nemesis
 
         <compound name='nemesis'>
-            <stl-vector name='all'>
-                <pointer type-name='nemesis_record'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='nemesis_record'/>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='nemesis_record'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='nemesis_record'/>
         </compound>
 
         <bool name='unk4'/>
@@ -485,19 +444,13 @@
         <compound name='items'>
             dtor 852f4b0
 
-            <stl-vector name='all'>
-                <pointer type-name='item'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='item'/>
 
             <static-array name='other' count='129' index-enum='items_other_id'>
-                <stl-vector>
-                    <pointer type-name='item'/>
-                </stl-vector>
+                <stl-vector pointer-type='item'/>
             </static-array>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='item'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='item'/>
 
             <stl-vector name='bad_tag' type-name='int32_t'/>
         </compound>
@@ -505,13 +458,9 @@
         -- Artifacts
 
         <compound name='artifacts'>
-            <stl-vector name='all'>
-                <pointer type-name='artifact_record'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='artifact_record'/>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='artifact_record'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='artifact_record'/>
         </compound>
 
         -- Jobs and projectiles
@@ -525,19 +474,13 @@
         <compound name='buildings'>
             dtor 85316f0
 
-            <stl-vector name='all'>
-                <pointer type-name='building'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='building'/>
 
             <static-array name='other' count='87' index-enum='buildings_other_id'>
-                <stl-vector>
-                    <pointer type-name='building'/>
-                </stl-vector>
+                <stl-vector pointer-type='building'/>
             </static-array>
 
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='building'/>
-            </stl-vector>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='building'/>
         </compound>
 
         <bool name='check_bridge_collapse'/>
@@ -546,12 +489,8 @@
         -- Machines (connected groups of gears and so on)
 
         <compound name='machines'>
-            <stl-vector name='all'>
-                <pointer type-name='machine'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='machine'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='machine'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='machine'/>
         </compound>
 
         -- Flow guides (whatever those are)
@@ -631,24 +570,12 @@
         -- Plants
 
         <compound name='plants'>
-            <stl-vector name='all'>
-                <pointer type-name='plant'/>
-            </stl-vector>
-            <stl-vector name='shrub_dry'>
-                <pointer type-name='plant'/>
-            </stl-vector>
-            <stl-vector name='shrub_wet'>
-                <pointer type-name='plant'/>
-            </stl-vector>
-            <stl-vector name='tree_dry'>
-                <pointer type-name='plant'/>
-            </stl-vector>
-            <stl-vector name='tree_wet'>
-                <pointer type-name='plant'/>
-            </stl-vector>
-            <stl-vector name='empty'>
-                <pointer type-name='plant'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='plant'/>
+            <stl-vector name='shrub_dry' pointer-type='plant'/>
+            <stl-vector name='shrub_wet' pointer-type='plant'/>
+            <stl-vector name='tree_dry' pointer-type='plant'/>
+            <stl-vector name='tree_wet' pointer-type='plant'/>
+            <stl-vector name='empty' pointer-type='plant'/>
         </compound>
 
         -- Adventure quests
@@ -671,12 +598,8 @@
         </compound>
 
         <compound name='squads'>
-            <stl-vector name='all'>
-                <pointer type-name='squad'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='squad'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='squad'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='squad'/>
         </compound>
 
         <compound name='unk_518dc' comment='formations?'>
@@ -693,27 +616,17 @@
         -- Drills
 
         <compound name='activities'>
-            <stl-vector name='all'>
-                <pointer type-name='activity_entry'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='activity_entry'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='activity_entry'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='activity_entry'/>
         </compound>
 
         -- Reports and announcements
 
         <compound name='status'>
             dtor 85356e0
-            <stl-vector name='reports'>
-                <pointer type-name='report'/>
-            </stl-vector>
-            <stl-vector name='announcements'>
-                <pointer type-name='report'/>
-            </stl-vector>
-            <stl-vector name='popups'>
-                <pointer type-name='popup_message'/>
-            </stl-vector>
+            <stl-vector name='reports' pointer-type='report'/>
+            <stl-vector name='announcements' pointer-type='report'/>
+            <stl-vector name='popups' pointer-type='popup_message'/>
 
             <int32_t name='next_report_id'/>
             <bitfield name='flags'>
@@ -761,42 +674,24 @@
         </compound>
 
         <compound name='assumed_identities' comment='v0.34.01 - DF calls these identities'>
-            <stl-vector name='all'>
-                <pointer type-name='assumed_identity'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='assumed_identity'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='assumed_identity'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='assumed_identity'/>
         </compound>
 
         <compound name='deaths' comment='v0.34.01 - DF calls these incidents'>
-            <stl-vector name='all'>
-                <pointer type-name='death_info'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='death_info'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='death_info'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='death_info'/>
         </compound>
 
         <compound name='criminal_cases' comment='v0.34.01 - DF calls these crimes'>
-            <stl-vector name='all'>
-                <pointer type-name='criminal_case'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='criminal_case'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='criminal_case'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='criminal_case'/>
         </compound>
 
         <compound name='vehicles' comment='v0.34.08'>
-            <stl-vector name='all'>
-                <pointer type-name='vehicle'/>
-            </stl-vector>
-            <stl-vector name='active'>
-                <pointer type-name='vehicle'/>
-            </stl-vector>
-            <stl-vector name='bad' has-bad-pointers='true'>
-                <pointer type-name='vehicle'/>
-            </stl-vector>
+            <stl-vector name='all' pointer-type='vehicle'/>
+            <stl-vector name='active' pointer-type='vehicle'/>
+            <stl-vector name='bad' has-bad-pointers='true' pointer-type='vehicle'/>
         </compound>
 
         <pointer name='selected_building' type-name='building'/>
@@ -808,9 +703,7 @@
 
         <compound name='map'>
             52cdc
-            <stl-vector name='map_blocks'>
-                <pointer type-name='map_block'/>
-            </stl-vector>
+            <stl-vector name='map_blocks' pointer-type='map_block'/>
             <pointer name='block_index' is-array='true'>
                 <pointer is-array='true'>
                     <pointer is-array='true'>
@@ -819,9 +712,7 @@
                 </pointer>
             </pointer>
 
-            <stl-vector name='map_block_columns'>
-                <pointer type-name='map_block_column'/>
-            </stl-vector>
+            <stl-vector name='map_block_columns' pointer-type='map_block_column'/>
             <pointer name='column_index' is-array='true'>
                 <pointer is-array='true'>
                     <pointer type-name='map_block_column'/>
@@ -1082,17 +973,13 @@
 
         <compound name='history' type-name='world_history'/>
 
-        <stl-vector name='entity_populations'>
-            <pointer type-name='entity_population'/>
-        </stl-vector>
+        <stl-vector name='entity_populations' pointer-type='entity_population'/>
 
         <bool name="reindex_pathfinding" comment='forces map_block.passable to be recomputed'/>
 
         <int32_t name='frame_counter' comment='increases by 1 every time . is pressed'/>
 
-        <stl-vector name='orphaned_flows' comment='flows that are not tied to a map_block'>
-            <pointer type-name='flow_info'/>
-        </stl-vector>
+        <stl-vector name='orphaned_flows' pointer-type='flow_info' comment='flows that are not tied to a map_block'/>
 
         <compound name='pathfinder'>
             <static-array name='boundary_heap' count='80000'>
@@ -1129,9 +1016,7 @@
             <stl-string name='save_dir'/>
             <padding size='4'/>
 
-            <stl-vector name='map_features'>
-                <pointer type-name='feature_init'/>
-            </stl-vector>
+            <stl-vector name='map_features' pointer-type='feature_init'/>
             <stl-vector type-name='int16_t' name='feature_x'/>
             <stl-vector type-name='int16_t' name='feature_y'/>
             <stl-vector type-name='int16_t' name='feature_local_idx' comment='same as map_block.local_feature'/>
@@ -1147,12 +1032,8 @@
         <bool/>
 
         <compound name='arena_spawn'>
-            <stl-vector name='race'>
-                <int16_t ref-target='creature_raw'/>
-            </stl-vector>
-            <stl-vector name='caste'>
-                <int16_t ref-target='caste_raw' aux-value='$$._parent.race[$._key]'/>
-            </stl-vector>
+            <stl-vector name='race' type-name='int16_t' ref-target='creature_raw'/>
+            <stl-vector name='caste' type-name='int16_t' ref-target='caste_raw' aux-value='$$._parent.race[$._key]'/>
 
             <int32_t name='type' refers-to='$$._parent.caste[$].ref-target'/>