diff --git a/common/type_system/Type.cpp b/common/type_system/Type.cpp
index 33af717369..4b06f394db 100644
--- a/common/type_system/Type.cpp
+++ b/common/type_system/Type.cpp
@@ -108,6 +108,7 @@ void Field::set_inline() {
  * Compare field definitions for equality. Used to determine if redefinition would change the type.
  */
 bool Field::operator==(const Field& other) const {
+  // we don't check the score and the do-not-decompile here.
   // clang-format off
   return m_name == other.m_name &&
          m_type == other.m_type &&
@@ -116,8 +117,7 @@ bool Field::operator==(const Field& other) const {
          m_dynamic == other.m_dynamic &&
          m_array == other.m_array &&
          m_array_size == other.m_array_size &&
-         m_alignment == other.m_alignment &&
-         m_skip_in_static_decomp == other.m_skip_in_static_decomp;
+         m_alignment == other.m_alignment;
   // clang-format on
 }
 
diff --git a/common/type_system/TypeSystem.cpp b/common/type_system/TypeSystem.cpp
index b88f8645eb..27268eac25 100644
--- a/common/type_system/TypeSystem.cpp
+++ b/common/type_system/TypeSystem.cpp
@@ -151,9 +151,9 @@ void TypeSystem::forward_declare_type_as(const std::string& new_type,
       auto new_parent_it = m_types.find(parent_type);
 
       auto old_ts = TypeSpec(old_parent_it->second->get_name());
-      auto new_ts = TypeSpec(new_parent_it->second->get_name());
 
       if (old_parent_it != m_types.end() && new_parent_it != m_types.end()) {
+        auto new_ts = TypeSpec(new_parent_it->second->get_name());
         if (tc(old_ts, new_ts)) {
           // new is more specific or equal to old:
           m_forward_declared_types[new_type] = new_ts.base_type();
@@ -1505,8 +1505,14 @@ std::string TypeSystem::generate_deftype_footer(const Type* type) const {
         methods_string.push_back(' ');
       }
     }
-    methods_string.append(fmt::format(
-        ") {} {})\n    ", info.type.get_arg(info.type.arg_count() - 1).print(), info.id));
+    methods_string.append(
+        fmt::format(") {} ", info.type.get_arg(info.type.arg_count() - 1).print()));
+
+    if (info.no_virtual) {
+      methods_string.append(":no-virtual ");
+    }
+
+    methods_string.append(fmt::format("{})\n    ", info.id));
   }
 
   if (!methods_string.empty()) {
@@ -1530,6 +1536,7 @@ std::string TypeSystem::generate_deftype_for_structure(const StructureType* st)
   const std::string inline_string = ":inline";
   const std::string dynamic_string = ":dynamic";
   const std::string user_offset_string = ":offset xxx";
+  bool has_offset_assert = false;
 
   for (size_t i = st->first_unique_field_idx(); i < st->fields().size(); i++) {
     const auto& field = st->fields().at(i);
@@ -1556,11 +1563,8 @@ std::string TypeSystem::generate_deftype_for_structure(const StructureType* st)
       mods += dynamic_string.size();
     }
 
-    if (field.user_placed()) {
-      if (mods) {
-        mods++;
-      }
-      mods += user_offset_string.size();
+    if (!field.user_placed()) {
+      has_offset_assert = true;
     }
     longest_mods = std::max(longest_mods, mods);
   }
@@ -1589,17 +1593,20 @@ std::string TypeSystem::generate_deftype_for_structure(const StructureType* st)
       mods += " ";
     }
 
-    if (field.user_placed()) {
-      mods += fmt::format(":offset {:3d}", field.offset());
-    }
     result.append(mods);
+    result.append(longest_mods - int(mods.size() - 1), ' ');
 
     if (!field.user_placed()) {
-      result.append(longest_mods - int(mods.size() - 1), ' ');
       result.append(":offset-assert ");
-      result.append(std::to_string(field.offset()));
+    } else {
+      if (has_offset_assert) {
+        result.append(":offset        ");
+      } else {
+        result.append(":offset ");
+      }
     }
 
+    result.append(fmt::format("{:3d}", field.offset()));
     result.append(")\n   ");
   }
 
diff --git a/decompiler/ObjectFile/ObjectFileDB_IR2.cpp b/decompiler/ObjectFile/ObjectFileDB_IR2.cpp
index 86878ff43f..86db7687b4 100644
--- a/decompiler/ObjectFile/ObjectFileDB_IR2.cpp
+++ b/decompiler/ObjectFile/ObjectFileDB_IR2.cpp
@@ -410,15 +410,41 @@ void ObjectFileDB::ir2_register_usage_pass() {
       func.ir2.env.set_reg_use(analyze_ir2_register_usage(func));
 
       auto block_0_start = func.ir2.env.reg_use().block.at(0).input;
+      std::vector<Register> dep_regs;
       for (auto x : block_0_start) {
-        if (x.get_kind() == Reg::VF && x.get_vf() != 0) {
-          lg::error("Bad vf dependency on {} in {}", x.to_charp(), func.guessed_name.to_string());
-          func.warnings.bad_vf_dependency("{}", x.to_string());
+        dep_regs.push_back(x);
+      }
+
+      if (!dep_regs.empty()) {
+        std::sort(dep_regs.begin(), dep_regs.end(),
+                  [](const Register& a, const Register& b) { return a.reg_id() < b.reg_id(); });
+
+        int end_valid_argument = Register(Reg::GPR, Reg::T3).reg_id() + 1;
+        if (func.type.arg_count() > 0) {
+          // end_valid_argument = Register::get_arg_reg(func.type.arg_count() - 1).reg_id();
+          end_valid_argument = Register(Reg::GPR, Reg::A0).reg_id() + func.type.arg_count() - 1;
         }
 
-        if (x.get_kind() == Reg::SPECIAL) {
-          lg::error("Bad vf dependency on {} in {}", x.to_charp(), func.guessed_name.to_string());
-          func.warnings.bad_vf_dependency("{}", x.to_string());
+        for (auto& x : dep_regs) {
+          if ((x.get_kind() == Reg::VF && x.get_vf() != 0) || x.get_kind() == Reg::SPECIAL) {
+            lg::error("Bad vf dependency on {} in {}", x.to_charp(), func.guessed_name.to_string());
+            func.warnings.bad_vf_dependency("{}", x.to_string());
+            continue;
+          }
+
+          if (x == Register(Reg::GPR, Reg::S6) || x == Register(Reg::GPR, Reg::S7) ||
+              x == Register(Reg::GPR, Reg::SP) || x == Register(Reg::VF, 0)) {
+            continue;
+          }
+
+          if (x.reg_id() < end_valid_argument) {
+            continue;
+          }
+
+          lg::error("Bad register dependency on {} in {}", x.to_charp(),
+                    func.guessed_name.to_string());
+          func.warnings.general_warning("Function may read a register that is not set: {}",
+                                        x.to_string());
         }
       }
     }
diff --git a/decompiler/util/DecompilerTypeSystem.cpp b/decompiler/util/DecompilerTypeSystem.cpp
index f8893781c6..03738de7c2 100644
--- a/decompiler/util/DecompilerTypeSystem.cpp
+++ b/decompiler/util/DecompilerTypeSystem.cpp
@@ -387,14 +387,23 @@ int DecompilerTypeSystem::get_format_arg_count(const std::string& str) const {
   if (str == "ERROR: dma tag has data in reserved bits ~X~%") {
     return 0;
   }
+
+  if (str == "#<surface f0:~m f1:~f tf+:~f tf-:~f sf:~f tvv:~m") {
+    return 5;
+  }
   int arg_count = 0;
   for (size_t i = 0; i < str.length(); i++) {
     if (str.at(i) == '~') {
       i++;  // also eat the next character.
-      if (i < str.length() && (str.at(i) == '%' || str.at(i) == 'T' || str.at(i) == '0')) {
+      if (i < str.length() && (str.at(i) == '%' || str.at(i) == 'T')) {
         // newline (~%) or tab (~T) don't take an argument.
         continue;
       }
+
+      // ~3L, ~0L do'nt seem to take arguments either.
+      if (i + 1 < str.length() && (str.at(i) == '0' || str.at(i) == '3') && str.at(i + 1) == 'L') {
+        continue;
+      }
       arg_count++;
     }
   }
diff --git a/test/decompiler/reference/all_forward_declarations.gc b/test/decompiler/reference/all_forward_declarations.gc
deleted file mode 100644
index ba45f2411c..0000000000
--- a/test/decompiler/reference/all_forward_declarations.gc
+++ /dev/null
@@ -1,1096 +0,0 @@
-;; GCOMMON
-(define-extern name= (function basic basic symbol))
-(define-extern fact (function int int))
-(define-extern max (function int int int))
-(define-extern min (function int int int))
-(define-extern valid? (function object type basic basic object symbol))
-
-;; KERNEL
-(declare-type process basic)
-(declare-type stack-frame basic)
-(declare-type state basic)
-(declare-type cpu-thread basic)
-(declare-type dead-pool basic)
-(declare-type event-message-block structure)
-(declare-type thread basic)
-
-(deftype process (process-tree)
-  ((pool dead-pool :offset-assert #x20)
-   (status basic :offset-assert #x24)
-   (pid int32 :offset-assert #x28)
-   (main-thread cpu-thread :offset-assert #x2c)
-   (top-thread thread :offset-assert #x30)
-   (entity basic :offset-assert #x34) ;; Pretty sure this needs to be a res-lump, but get `not fully defined error`s
-   (state state :offset-assert #x38)
-   (trans-hook function :offset-assert #x3c)
-   (post-hook function :offset-assert #x40)
-   (event-hook (function basic int basic event-message-block object) :offset-assert #x44)
-   (allocated-length int32 :offset-assert #x48)
-   (next-state state :offset-assert #x4c)
-   (heap-base pointer :offset-assert #x50)
-   (heap-top pointer :offset-assert #x54)
-   (heap-cur pointer :offset-assert #x58)
-   (stack-frame-top stack-frame :offset-assert #x5c)
-   (connection-list connectable :inline :offset-assert #x60)
-   (stack uint8 :dynamic :offset-assert #x70)
-   )
-
-  (:methods
-    (new (symbol type basic int) _type_ 0)
-    (activate (_type_ process-tree basic pointer) process-tree 9)
-    (deactivate  (process) none 10)
-    (dummy-method-11 () none 11)
-    (run-logic? (process) symbol 12)
-    (dummy-method () none 13)
-   )
-
-  :size-assert #x70
-  :method-count-assert 14
-  :no-runtime-type ;; already defined by kscheme. Don't do it again.
-  )
-
-(declare-type dead-pool-heap basic)
-(define-extern *debug-dead-pool* dead-pool-heap)
-(define-extern change-parent (function process-tree process-tree process-tree))
-(define-extern *null-process* process)
-(define-extern *vis-boot* basic)
-(define-extern *stdcon* string)
-(declare-type kernel-context basic)
-(define-extern iterate-process-tree (function process-tree (function object object) kernel-context object))
-(define-extern execute-process-tree (function process-tree (function object object) kernel-context object))
-(define-extern search-process-tree (function process-tree (function process-tree object) process-tree))
-
-(define-extern *listener-process* process)
-(define-extern *active-pool* process-tree)
-(define-extern reset-and-call (function thread function object))
-(defun ash ((value int) (shift-amount int))
-  "Arithmetic shift value by shift-amount.
-  A positive shift-amount will shift to the left and a negative will shift to the right.
-  "
-  ;; OpenGOAL does not support ash in the compiler, so we implement it here as an inline function.
-  (declare (inline))
-  (if (> shift-amount 0)
-      (shl value shift-amount)
-      (sar value (- shift-amount))
-      )
-  )
-(define-extern inspect-process-tree (function process-tree int int symbol process-tree))
-(define-extern set-to-run-bootstrap (function none))
-(define-extern dead-state state)
-(define-extern *display-pool* process-tree)
-(define-extern *camera-pool* process-tree)
-(define-extern *target-pool* process-tree)
-(define-extern *entity-pool* process-tree)
-(define-extern *default-pool* process-tree)
-(define-extern *stdcon0* string)
-(define-extern *stdcon1* string)
-(define-extern *debug-draw-pauseable* symbol)
-
-;; gstate
-(define-extern enter-state (function object object object object object object object))
-(define-extern throw (function symbol object int))
-(defmacro suspend()
-  '(none)
-  )
-
-(defmacro empty-form ()
-  '(none)
-  )
-
-(define-extern get-current-time (function uint))
-(define-extern get-integral-current-time (function uint))
-
-;; math
-(define-extern fabs (function float float))
-(define-extern abs (function int int))
-(define-extern rand-vu-init (function float none))
-(define-extern rand-vu (function float))
-
-;; matrix
-(declare-type matrix structure)
-(declare-type vector structure)
-(define-extern matrix-transpose! (function matrix matrix matrix))
-(define-extern sin (function float float))
-(define-extern cos (function float float))
-(define-extern vector-sincos! (function vector vector vector int))
-(define-extern matrix-axis-sin-cos! (function matrix vector float float none))
-(define-extern atan (function float float float))
-
-;; transform
-(define-extern vector-identity! (function vector vector))
-
-;; quaternion
-(define-extern acos (function float float))
-(define-extern acos-rad (function float float))
-(define-extern atan2-rad (function float float float))
-(define-extern vector-length (function vector float))
-(define-extern sincos-rad! (function (pointer float) float int))
-(define-extern atan-series-rad (function float float))
-(define-extern vector-sin-rad! (function vector vector vector))
-(define-extern vector-rad<-vector-deg/2! (function vector vector int))
-(define-extern vector-sincos-rad! (function vector vector vector int))
-(define-extern deg-diff (function float float float))
-(define-extern vector-xz-normalize! (function vector float vector))
-(declare-type quaternion structure)
-(define-extern quaternion-from-two-vectors-max-angle! (function quaternion vector vector float quaternion))
-(define-extern vector-xz-length (function vector float))
-
-;; trigonometry
-(defconstant PI (the-as float #x40490fda))
-(defconstant MINUS_PI (the-as float #xc0490fda))
-(define-extern sin-rad (function float float))
-(define-extern cos-rad (function float float))
-
-(defmacro .sync.l ()
-  `(none))
-
-;; timer-h
-(defenum timer-clock-selection
-  :type uint8
-  (busclk 0)
-  (busclk/16 1)
-  (busclk/256 2)
-  (hblank 3)
-  )
-
-;; dma
-(declare-type dma-buffer basic)
-
-(defenum vif-cmd
-    :bitfield #f
-    :type uint8
-    (nop          0)  ;; no-op, can still have irq set.
-    (stcycl       1)  ;; set write recycle register
-    (offset       2)  ;; set offset register
-    (base         3)  ;; set base register
-    (itop         4)  ;; set data pointer register (itops)
-    (stmod        5)  ;; set mode register
-    (mskpath3     6)  ;; set path 3 mask
-    (mark         7)  ;; set mark register
-    (flushe       16) ;; wait for end of microprogram
-    (flush        17) ;; wait for end of microprogram and transfer (path1/path2)
-    (flusha       19) ;; wait for end of microprogram and transfer (path1/path2/path3)
-    (mscal        20) ;; activate microprogram (call)
-    (mscalf       21) ;; flushe and activate (call)
-    (mscnt        23) ;; activate microprogram (continue)
-    (stmask       32) ;; set MASK register.
-    (strow        48) ;; set filling data
-    (stcol        49) ;; set filling data
-    (mpg          74) ;; transfer microprogram
-    (direct       80) ;; straight to GIF.
-    (directhl     81)
-    (unpack-s-32  96)
-    (unpack-s-16  97)
-    (unpack-s-8   98)
-    ;; 99 is invllid
-    (unpack-v2-32 100)
-    (unpack-v2-16 101)
-    (unpack-v2-8  102)
-    ;; 103 is invalid
-    (unpack-v3-32 104)
-    (unpack-v3-16 105)
-    (unpack-v3-8  106)
-    ;; 107 is invalid
-    (unpack-v4-32 108)
-    (unpack-v4-16 109)
-    (unpack-v4-8  110)
-    (unpack-v4-5  111)
-    (cmd-mask     239)
-    )
-
-(defenum vif-cmd-32
-    :bitfield #f
-    :type uint32
-    :copy-entries vif-cmd
-    )
-
-(defenum dma-tag-id
-    :bitfield #f
-    :type uint8
-    (refe 0)      ;; addr=ADDR, ends after this transfer
-    (cnt 1)       ;; addr=after tag, next-tag=after data
-    (next 2)      ;; addr=after tag, next-tag=ADDR
-    (ref 3)       ;; addr=ADDR, next-tag=after tag
-    (refs 4)      ;; ref, but stall controled
-    (call 5)      ;;
-    (ret 6)       ;;
-    (end 7)       ;; next, but ends.
-    )
-
-(defenum gs-psm
-    :bitfield #f
-    :type uint8
-    (ct32 0)
-    (ct24 1)
-    (ct16 2)
-    (ct16s 10)
-    (mt8 19)
-    (mt4 20)
-    (mt8h 27)
-    (mt4hl 36)
-    (mt4hh 44)
-    (mz32 48)
-    (mz24 49)
-    (mz16 50)
-    (mz16s 58)
-    )
-(defenum gs-prim-type
-  :type uint8
-  (point 0)
-  (line 1)
-  (line-strip 2)
-  (tri 3)
-  (tri-strip 4)
-  (tri-fan 5)
-  (sprite 6)
-  )
-
-(defenum gif-reg-id
-  :bitfield #f
-  :type uint8
-  (prim 0)
-  (rgbaq 1)
-  (st 2)
-  (uv 3)
-  (xyzf2 4)
-  (xyz2 5)
-  (tex0-1 6)
-  (tex0-2 7)
-  (clamp-1 8)
-  (clamp-2 9)
-  (fog 10)
-  (xyzf3 12)
-  (xyz3 13)
-  (a+d 14)
-  (nop 15)
-  )
-
-(deftype gif-tag-regs (uint64)
-  ((regs0   gif-reg-id :offset 0  :size 4)
-   (regs1   gif-reg-id :offset 4  :size 4)
-   (regs2   gif-reg-id :offset 8  :size 4)
-   (regs3   gif-reg-id :offset 12  :size 4)
-   (regs4   gif-reg-id :offset 16  :size 4)
-   (regs5   gif-reg-id :offset 20  :size 4)
-   (regs6   gif-reg-id :offset 24  :size 4)
-   (regs7   gif-reg-id :offset 28  :size 4)
-   (regs8   gif-reg-id :offset 32  :size 4)
-   (regs9   gif-reg-id :offset 36 :size 4)
-   (regs10  gif-reg-id :offset 40 :size 4)
-   (regs11  gif-reg-id :offset 44 :size 4)
-   (regs12  gif-reg-id :offset 48 :size 4)
-   (regs13  gif-reg-id :offset 52 :size 4)
-   (regs14  gif-reg-id :offset 56 :size 4)
-   (regs15  gif-reg-id :offset 60 :size 4)
-   )
-  )
-
-
-;; display-h
-(declare-type display basic)
-(define-extern set-display (function display int int int int int display))
-(define-extern *display* display)
-
-;; pad
-(defenum pad-buttons
-    :bitfield #t
-    :type uint32
-    (select   0)
-    (l3       1)
-    (r3       2)
-    (start    3)
-    (up       4)
-    (right    5)
-    (down     6)
-    (left     7)
-    (l2       8)
-    (r2       9)
-    (l1       10)
-    (r1       11)
-    (triangle 12)
-    (circle   13)
-    (x        14)
-    (square   15)
-    )
-
-;; vector
-;; only because trig isn't in the reference yet.
-(define-extern deg-lerp-clamp (function float float float float))
-
-;; file-io
-(defenum file-kind
-    :bitfield #f
-    (level-bt 0) ;; aka bsp-header.
-    (art-group 1)
-    (tpage 2)
-    (dir-tpage 3)
-    (level-vs 4)
-    (tx 5)
-    (vis 6)
-    )
-
-;; loader-h
-(declare-type art-group basic)
-
-;; math-camera
-(declare-type math-camera basic)
-(define-extern *math-camera* math-camera)
-
-;; level-h
-(declare-type entity-links structure)
-(declare-type level-group basic)
-(define-extern *level* level-group)
-(define-extern log2 (function int int))
-
-(defenum gs-reg
-  :type uint8
-  (prim 0)
-  (rgbaq 1)
-  (st 2)
-  (uv 3)
-  (xyzf2 4)
-  (xyz2 5)
-  (tex0-1 6)
-  (tex0-2 7)
-  (clamp-1 8)
-  (clamp-2 9)
-  (fog 10)
-  (xyzf3 12)
-  (xyz3 13)
-  (tex1-1 20)
-  (tex1-2 21)
-  (tex2-1 22)
-  (tex2-2 23)
-  (xyoffset-1 24)
-  (xyoffset-2 25)
-  (prmodecont 26)
-  (prmode 27)
-  (texclut 28)
-  (scanmsk 34)
-  (miptbp1-1 52)
-  (miptbp1-2 53)
-  (miptbp2-1 54)
-  (miptbp2-2 55)
-  (texa 59)
-  (fogcol 61)
-  (texflush 63)
-  (scissor-1 64)
-  (scissor-2 65)
-  (alpha-1 66)
-  (alpha-2 67)
-  (dimx 68)
-  (dthe 69)
-  (colclamp 70)
-  (test-1 71)
-  (test-2 72)
-  (pabe 73)
-  (fba-1 74)
-  (fba-2 75)
-  (frame-1 76)
-  (frame-2 77)
-  (zbuf-1 78)
-  (zbuf-2 79)
-  (bitbltbuf 80)
-  (trxpos 81)
-  (trxreg 82)
-  (trxdir 83)
-  (hwreg 84)
-  (signal 96)
-  (finish 97)
-  (label 98)
-  )
-
-(defenum gs-reg64
-  :type uint64
-  :copy-entries gs-reg
-  )
-
-;; connect
-(declare-type engine basic)
-
-(defmacro make-u128 (upper lower)
-  `(rlet ((result :class i128)
-          (upper-xmm :class i128)
-          (lower-xmm :class i128))
-     (.mov upper-xmm ,upper)
-     (.mov lower-xmm ,lower)
-     (.pcpyld result upper-xmm lower-xmm)
-     (the uint result)
-     )
-  )
-
-;; texture
-
-(declare-type texture-page basic)
-(declare-type level basic)
-
-;; main-h
-(define-extern *dproc* process)
-
-;; GEOMETRY - TODO
-(define-extern vector-deg-slerp (function vector vector vector float vector))
-
-;; bones - TODO
-(declare-type vu-lights structure)
-(declare-type light-group structure)
-(define-extern vu-lights<-light-group! (function vu-lights light-group none))
-
-;; game-h - TODO
-(declare-type trsqv basic)
-(declare-type draw-control basic)
-
-;; game-h - TODO
-(deftype vector (structure)
-  ((data float 4 :offset-assert 0)
-   (x float :offset 0)
-   (y float :offset 4)
-   (z float :offset 8)
-   (w float :offset 12)
-   (quad uint128 :offset 0)
-   )
-  :method-count-assert 9
-  :size-assert         #x10
-  :flag-assert         #x900000010
-  )
-
-(deftype plane (vector)
-  ((a float :offset   0)
-   (b float :offset   4)
-   (c float :offset   8)
-   (d float :offset  12)
-   )
-  :method-count-assert 9
-  :size-assert         #x10
-  :flag-assert         #x900000010
-  )
-
-;; definition of type quaternion
-(deftype quaternion (structure)
-  ((x    float                       :offset-assert 0)
-   (y    float                       :offset-assert 4)
-   (z    float                       :offset-assert 8)
-   (w    float                       :offset-assert 12)
-   (data float   4 :offset   0)
-   (vec  vector  :inline :offset   0)
-   (quad uint128 :offset   0)
-   )
-  :method-count-assert 9
-  :size-assert         #x10
-  :flag-assert         #x900000010
-  )
-
-(deftype transform (structure)
-  ((trans vector :inline :offset-assert 0)
-   (rot   vector :inline :offset-assert 16)
-   (scale vector :inline :offset-assert 32)
-   )
-  :method-count-assert 9
-  :size-assert         #x30
-  :flag-assert         #x900000030
-  )
-
-;; transformq
-(deftype transformq (transform)
-  ;; this overlays the rot field of transform.
-  ((quat  quaternion :inline :offset 16)
-   )
-  :method-count-assert 9
-  :size-assert         #x30
-  :flag-assert         #x900000030
-  )
-
-
-(declare-type target basic)
-(define-extern *target* target)
-
-(declare-type sidekick basic)
-(define-extern *sidekick* sidekick)
-
-;; mood tables
-(declare-type ocean-map basic)
-(define-extern *ocean-map-village2* ocean-map)
-
-(deftype continue-point (basic)
-  ((name          basic           :offset-assert 4)
-   (level         basic           :offset-assert 8)
-   (flags         uint32          :offset-assert 12)
-   (trans         vector  :inline :offset-assert 16)
-   (quat          vector  :inline :offset-assert 32)
-   (camera-trans  vector  :inline :offset-assert 48)
-   (camera-rot    float 9       :offset-assert 64)
-   (load-commands pair           :offset-assert 100)
-   (vis-nick      basic           :offset-assert 104)
-   (lev0          basic           :offset-assert 108)
-   (disp0         basic           :offset-assert 112)
-   (lev1          basic           :offset-assert 116)
-   (disp1         basic           :offset-assert 120)
-   )
-  :method-count-assert 10
-  :size-assert         #x7c
-  :flag-assert         #xa0000007c
-  (:methods
-    (dummy-9 () none 9)
-    )
-  )
-
-; This was likely originally defined inside `wind-h`
-; but the decompiler won't output it, so we have to manually define it
-(declare-type wind-work basic)
-(define-extern *wind-work* wind-work)
-
-(define-extern vector-y-angle (function vector float))
-(define-extern atan0 (function float float float))
-(define-extern vector-rad<-vector-deg! (function vector vector none))
-(define-extern vector-rad<-vector-deg/2! (function vector vector int))
-
-(define-extern sprite-distorter-generate-tables (function none))
-
-(defenum load-msg-result
-  :type uint16
-  :bitfield #f
-  (done 0)
-  (error 1)
-  (more 2)
-  (aborted 3)
-  (invalid 666)
-  )
-
-(declare-type rpc-buffer-pair basic)
-(define-extern string->sound-name (function string uint128))
-(define-extern *dgo-name* string)
-(define-extern *load-dgo-rpc* rpc-buffer-pair)
-(define-extern *load-str-rpc* rpc-buffer-pair)
-(define-extern *play-str-rpc* rpc-buffer-pair)
-(define-extern *load-str-lock* symbol)
-(define-extern *que-str-lock* symbol)
-
-(define-extern get-video-mode (function symbol))
-(define-extern draw-string-xy (function string dma-buffer int int int int none))
-(declare-type game-info basic)
-(define-extern *game-info* game-info)
-
-;; shadow-cpu
-(deftype shadow-settings (structure)
-  ((center        vector :inline :offset-assert 0)
-   (flags         int32          :offset 12)
-   (shadow-dir    vector :inline :offset-assert 16)
-   (dist-to-locus float          :offset 28)
-   (bot-plane     plane  :inline :offset-assert 32)
-   (top-plane     plane  :inline :offset-assert 48)
-   (fade-dist     float          :offset-assert 64)
-   (fade-start    float          :offset-assert 68)
-   (dummy-2       int32          :offset-assert 72)
-   (dummy-3       int32          :offset-assert 76)
-   )
-  :method-count-assert 9
-  :size-assert         #x50
-  :flag-assert         #x900000050
-  )
-
-(defmacro init-vf0-vector ()
-  "Initializes the VF0 vector which is a constant vector in the VU set to <0,0,0,1>"
-  `(.lvf vf0 (new 'static 'vector :x 0.0 :y 0.0 :z 0.0 :w 1.0))
-  )
-
-(defenum bucket-id
-    :type int32
-    :bitfield #f
-
-    (tfrag-tex0 5)
-    ;; merc0 10
-    ;; generic0 11
-
-    (tfrag-tex1 12)
-    ;; merc1 17
-    ;; generic1 18
-
-    (shrub-tex0 19)
-
-    (shrub-tex1 25)
-
-    (alpha-tex0 31)
-
-    (alpha-tex1 38)
-
-    (pris-tex0 48)
-    ;; merc0 49
-    ;; generic0 50
-
-    (pris-tex1 51)
-    ;; merc1 52
-    ;; generic1 53
-
-    (water-tex0 57)
-    ;; merc0 58     (+ default)
-    ;; generic0 59  (+ default)
-
-    (water-tex1 60)
-    ;; merc1 61
-    ;; generic1 62
-    ;; debug spheres? 67
-    (debug-draw0 67)
-    ;; debug text 68
-    (debug-draw1 68)
-    )
-
-;; TODO - for trajectory.gc
-(declare-type trajectory structure)
-(deftype rgba (uint32)
-  ((r uint8 :offset 0)
-   (g uint8 :offset 8)
-   (b uint8 :offset 16)
-   (a uint8 :offset 24)
-   )
-  :flag-assert #x900000004
-  )
-(define-extern add-debug-line (function symbol bucket-id vector vector rgba symbol rgba symbol))
-
-;; early declarations for draw-control
-(declare-type ripple-control basic)
-(declare-type shadow-geo basic)
-(declare-type shadow-control basic)
-
-;; early declarations for lod-group
-(declare-type merc-ctrl basic)
-
-;; TODO - for ripple
-(define-extern add-debug-sphere (function symbol bucket-id vector float rgba symbol))
-
-(defconstant SYM_TO_STRING_OFFSET #xff38)
-(defmacro symbol->string (sym)
-  "Convert a symbol to a goal string."
-  `(-> (the-as (pointer string) (+ SYM_TO_STRING_OFFSET (the-as int ,sym))))
-  )
-
-
-(defmacro new-stack-matrix0 ()
-  "Get a new matrix on the stack that's set to zero."
-  `(let ((mat (new 'stack-no-clear 'matrix)))
-     (set! (-> mat quad 0) (the-as uint128 0))
-     (set! (-> mat quad 1) (the-as uint128 0))
-     (set! (-> mat quad 2) (the-as uint128 0))
-     (set! (-> mat quad 3) (the-as uint128 0))
-     mat
-     )
-  )
-
-(defmacro new-stack-vector0 ()
-  "Get a stack vector that's set to 0.
-   This is more efficient than (new 'stack 'vector) because
-   this doesn't call the constructor."
-  `(let ((vec (new 'stack-no-clear 'vector)))
-     (set! (-> vec quad) (the-as uint128 0))
-     vec
-     )
-  )
-
-;; TODO - for entity-h
-(declare-type nav-mesh basic)
-(define-extern entity-nav-login function)
-
-;; NOTE - forward declaration needed for cam-interface
-(define-extern *camera-dummy-vector* vector)
-(define-extern send-event-function (function process event-message-block object))
-(define-extern *debug-engine* engine)
-(deftype res-tag-pair (uint64)
-  ((lo  uint32 :offset 0)
-   (hi  uint32 :offset 32)
-   )
-   )
-
-(declare-type surface basic)
-
-(define-extern *tread-surface* surface)
-(define-extern *ice-surface* surface)
-(define-extern *tar-surface* surface)
-(define-extern *quicksand-surface* surface)
-(define-extern *slope-surface* surface)
-(define-extern *wade-surface* surface)
-(define-extern *edge-surface* surface)
-(define-extern *stone-surface* surface)
-(define-extern *flop-land-mods* surface)
-(define-extern *uppercut-jump-mods* surface)
-(define-extern *duck-mods* surface)
-(define-extern *pole-mods* surface)
-(define-extern *grab-mods* surface)
-(define-extern *edge-grab-mods* surface)
-(define-extern *grass-surface* surface)
-
-(defenum pat-material
-  :type uint8
-  (stone)
-  (ice)
-  (quicksand)
-  (waterbottom)
-  (tar)
-  (sand)
-  (wood)
-  (grass)
-  (pcmetal)
-  (snow)
-  (deepsnow)
-  (hotcoals)
-  (lava)
-  (crwood)
-  (gravel)
-  (dirt)
-  (metal)
-  (straw)
-  (tube)
-  (swamp)
-  (stopproj)
-  (rotate)
-  (neutral)
-  )
-
-(defenum pat-mode
-  :type uint8
-  (ground)
-  (wall)
-  (obstacle)
-  )
-
-(defenum pat-event
-  :type uint8
-  (none)
-  (deadly)
-  (endlessfall)
-  (burn)
-  (deadlyup)
-  (burnup)
-  (melt)
-  )
-
-(defenum pickup-type
-  (none)
-  (eco-yellow)
-  (eco-red)
-  (eco-blue)
-  (eco-green)
-  (money)
-  (fuel-cell)
-  (eco-pill)
-  (buzzer)
-  (eco-pill-random)
-  )
-
-(define-extern process-drawable-art-error state)
-(define-extern *res-static-buf* pointer)
-(define-extern vector-dot (function vector vector float))
-
-(declare-type cspace structure)
-
-(define-extern joint-mod-look-at-handler (function cspace transformq none))
-(define-extern joint-mod-world-look-at-handler (function cspace transformq none))
-(define-extern joint-mod-rotate-handler (function cspace transformq none))
-(define-extern joint-mod-joint-set-handler (function cspace transformq none))
-(define-extern joint-mod-joint-set*-handler (function cspace transformq none))
-
-(defenum joint-mod-handler-mode
-    :bitfield #t
-    :type uint32
-    (flex-blend 0)  ;; 1
-    (look-at 1)     ;; 2
-    (world-look-at 2) ;; 4
-    (rotate 3)        ;; 8
-    (joint-set 4)     ;; 16
-    (joint-set* 5)    ;; 32
-    ;; ??             ;; 64
-    (reset 7) ;; 128
-    )
-
-(define-extern cspace<-parented-transformq-joint! (function cspace transformq none))
-(define-extern cspace<-transformq! (function cspace transformq matrix))
-(define-extern vector<-cspace! (function vector cspace vector))
-(define-extern add-debug-text-sphere (function symbol bucket-id vector float string rgba symbol))
-(define-extern add-debug-matrix (function symbol bucket-id matrix matrix))
-
-(define-extern vector-flatten! (function vector vector vector vector))
-
-
-(defenum collide-list-enum
-  (hit-by-player)
-  (usually-hit-by-player)
-  (hit-by-others)
-  (player)
-  )
-
-
-(declare-type collide-cache-tri structure)
-(declare-type joint-control basic)
-(declare-type process-drawable basic)
-(declare-type joint-control-channel structure)
-(define-extern cspace-index-by-name (function process-drawable string int))
-(define-extern cspace-by-name (function process-drawable string cspace))
-(define-extern joint-control-reset! (function joint-control joint-control-channel none))
-
-;; TODO - for credits
-(define-extern scf-get-territory (function int))
-(declare-type font-context basic)
-(define-extern print-game-text (function string font-context symbol int int float)) ; TODO decomp error, this seems correct though
-
-
-; TODO - for cam-update-h
-(define-extern *camera-look-through-other* int)
-(define-extern *camera-other-trans* vector)
-(define-extern *camera-other-root* vector)
-
-(declare-type bsp-header basic)
-(declare-type bsp-node structure)
-(define-extern inspect-bsp-tree (function bsp-header bsp-node none))
-(declare-type entity-camera basic)
-(define-extern map-bsp-tree (function (function bsp-node none) bsp-header bsp-node none))
-
-
-(deftype vif-tag (uint32)
-  ((imm uint16  :offset 0 :size 16)
-   (num uint8   :offset 16 :size 8)
-   (cmd vif-cmd :offset 24 :size 7)
-   (irq uint8   :offset 31 :size 1)
-   (msk uint8   :offset 28 :size 1)
-   )
-  :method-count-assert 9
-  :size-assert         #x4
-  :flag-assert         #x900000004
-  )
-
-(deftype dma-tag (uint64)
-  ((qwc uint16    :offset 0)          ;; quadword count
-   (pce uint8     :offset 26 :size 2)  ;; priority (source mode)
-   (id dma-tag-id :offset 28 :size 3)   ;; ID (what the tag means)
-   (irq uint8     :offset 31 :size 1)  ;; interrupt at the end?
-   (addr uint32   :offset 32 :size 31) ;; address (31 bits)
-   (spr uint8     :offset 63 :size 1)    ;; spr or not flag.
-   )
-  :method-count-assert 9
-  :size-assert         #x8
-  :flag-assert         #x900000008
-  )
-
-(deftype dma-packet (structure)
-  ((dma  dma-tag   :offset-assert 0)
-   (vif0 vif-tag   :offset-assert 8)
-   (vif1 vif-tag   :offset-assert 12)
-   (quad uint128  :offset 0)
-   )
-  :method-count-assert 9
-  :size-assert         #x10
-  :flag-assert         #x900000010
-  )
-
-(deftype shadow-data (structure)
-  ((texoffset           vector     :inline :offset-assert 0)
-   (texscale            vector     :inline :offset-assert 16)
-   (clrs                uint128    2       :offset-assert 32)
-   (dma-unpack-template dma-packet :inline :offset-assert 64)
-   (dma-cnt             uint64             :offset-assert 80)
-   (vif-nop             uint32             :offset-assert 88)
-   (vif-unpack-v4-8     uint32             :offset-assert 92)
-   (pdc                 basic              :offset-assert 96)
-   (dist                float              :offset-assert 100)
-   (oddeven             uint8              :offset-assert 104)
-   (waits               uint32             :offset-assert 108)
-   )
-  :method-count-assert 9
-  :size-assert         #x70
-  :flag-assert         #x900000070
-  )
-
-(deftype shadow-work (structure)
-  ((shadow-data shadow-data :inline :offset-assert 0)
-   (inbuf       uint128     600     :offset-assert 112)
-   )
-  :method-count-assert 9
-  :size-assert         #x25f0
-  :flag-assert         #x9000025f0
-  )
-
-(defenum entity-perm-status
-  :bitfield #t
-  :type uint16
-  (bit-1 1)
-  (dead 2)
-  (complete 6))
-
-(defenum sound-command
-  :type uint16
-  (load-bank)
-  (load-music)
-  (unload-bank)
-  (play)
-  (pause-sound)
-  (stop-sound)
-  (continue-sound)
-  (set-param)
-  (set-master-volume)
-  (pause-group)
-  (stop-group)
-  (continue-group)
-  (get-irx-version)
-  (set-falloff-curve)
-  (set-sound-falloff)
-  (reload-info)
-  (set-language)
-  (set-flava)
-  (set-reverb)
-  (set-ear-trans)
-  (shutdown)
-  (list-sounds)
-  (unload-music)
-  )
-
-(declare-type res-lump basic)
-(declare-type entity res-lump)
-
-;; TODO - for prototype
-(declare-type adgif-shader structure)
-(define-extern adgif-shader-login-no-remap (function adgif-shader none))
-
-;; TODO - for video
-(declare-type setting-control basic)
-(define-extern *setting-control* setting-control)
-(declare-type shadow-control basic)
-(define-extern *shadow-data* shadow-data)
-(define-extern *pause-context* font-context)
-(define-extern *profile-y* int)
-(define-extern get-aspect-ratio (function symbol))
-(declare-type video-parms structure)
-(define-extern set-hud-aspect-ratio (function symbol symbol none))
-(deftype progress (process)
-  ((current-debug-string         int32           :offset-assert 112)
-   (current-debug-language       int32           :offset-assert 116)
-   (current-debug-group          int32           :offset-assert 120)
-   (in-out-position              int32           :offset-assert 124)
-   (display-state                uint64          :offset-assert 128)
-   (next-display-state           uint64          :offset-assert 136)
-   (option-index                 int32           :offset-assert 144)
-   (selected-option              basic           :offset-assert 148)
-   (completion-percentage        float           :offset-assert 152)
-   (ready-to-run                 basic           :offset-assert 156)
-   (display-level-index          int32           :offset-assert 160)
-   (next-level-index             int32           :offset-assert 164)
-   (task-index                   int32           :offset-assert 168)
-   (in-transition                basic           :offset-assert 172)
-   (last-in-transition           basic           :offset-assert 176)
-   (force-transition             basic           :offset-assert 180)
-   (stat-transition              basic           :offset-assert 184)
-   (level-transition             int32           :offset-assert 188)
-   (language-selection           uint64          :offset-assert 192)
-   (language-direction           basic           :offset-assert 200)
-   (language-transition          basic           :offset-assert 204)
-   (language-x-offset            int32           :offset-assert 208)
-   (sides-x-scale                float           :offset-assert 212)
-   (sides-y-scale                float           :offset-assert 216)
-   (left-x-offset                int32           :offset-assert 220)
-   (right-x-offset               int32           :offset-assert 224)
-   (button-scale                 float           :offset-assert 228)
-   (slot-scale                   float           :offset-assert 232)
-   (left-side-x-scale            float           :offset-assert 236)
-   (left-side-y-scale            float           :offset-assert 240)
-   (right-side-x-scale           float           :offset-assert 244)
-   (right-side-y-scale           float           :offset-assert 248)
-   (small-orb-y-offset           int32           :offset-assert 252)
-   (big-orb-y-offset             int32           :offset-assert 256)
-   (transition-offset            int32           :offset-assert 260)
-   (transition-offset-invert     int32           :offset-assert 264)
-   (transition-percentage        float           :offset-assert 268)
-   (transition-percentage-invert float           :offset-assert 272)
-   (transition-speed             float           :offset-assert 276)
-   (total-nb-of-power-cells      int32           :offset-assert 280)
-   (total-nb-of-orbs             int32           :offset-assert 284)
-   (total-nb-of-buzzers          int32           :offset-assert 288)
-   (card-info                    mc-slot-info    :offset-assert 292)
-   (last-option-index-change     uint64          :offset-assert 296)
-   (video-mode-timeout           uint64          :offset-assert 304)
-   (display-state-stack          uint64       5  :offset-assert 312)
-   (option-index-stack           uint32       5  :offset-assert 352)
-   (display-state-pos            int32           :offset-assert 372)
-   (nb-of-icons                  int32           :offset-assert 376)
-   (icons                        uint32       6  :offset-assert 380)
-   (max-nb-of-particles          int32           :offset-assert 404)
-   (nb-of-particles              int32           :offset-assert 408)
-   (particles                    uint32       40 :offset-assert 412)
-   (particle-state               uint32       40 :offset-assert 572)
-   )
-  :method-count-assert 59
-  :size-assert         #x2dc
-  :flag-assert         #x3b000002dc
-  (:methods
-    (dummy-14 () none 14)
-    (dummy-15 () none 15)
-    (dummy-16 () none 16)
-    (dummy-17 () none 17)
-    (dummy-18 () none 18)
-    (dummy-19 () none 19)
-    (dummy-20 () none 20)
-    (dummy-21 () none 21)
-    (dummy-22 () none 22)
-    (TODO-RENAME-23 (_type_ symbol symbol) none 23)
-    (dummy-24 () none 24)
-    (dummy-25 () none 25)
-    (dummy-26 () none 26)
-    (dummy-27 () none 27)
-    (dummy-28 () none 28)
-    (dummy-29 () none 29)
-    (dummy-30 () none 30)
-    (dummy-31 () none 31)
-    (dummy-32 () none 32)
-    (dummy-33 () none 33)
-    (dummy-34 () none 34)
-    (dummy-35 () none 35)
-    (dummy-36 () none 36)
-    (dummy-37 () none 37)
-    (dummy-38 () none 38)
-    (dummy-39 () none 39)
-    (dummy-40 () none 40)
-    (dummy-41 () none 41)
-    (dummy-42 () none 42)
-    (dummy-43 () none 43)
-    (dummy-44 () none 44)
-    (dummy-45 () none 45)
-    (dummy-46 () none 46)
-    (dummy-47 () none 47)
-    (dummy-48 () none 48)
-    (dummy-49 () none 49)
-    (dummy-50 () none 50)
-    (dummy-51 () none 51)
-    (dummy-52 () none 52)
-    (dummy-53 () none 53)
-    (dummy-54 () none 54)
-    (dummy-55 () none 55)
-    (dummy-56 () none 56)
-    (dummy-57 () none 57)
-    (dummy-58 () none 58)
-    )
-  )
-(define-extern *progress-process* (pointer progress))
-
-(declare-type art-element basic)
-(declare-type water-control basic)
-(declare-type joint-anim-compressed-hdr structure)
-
-(define-extern entity-by-name (function string entity))
-(define-extern entity-by-aid (function uint entity))
-
-(declare-type nav-mesh basic)
-(define-extern *default-nav-mesh* nav-mesh)
-
-(defenum path-control-flag
-  :bitfield #t
-  :type uint32
-  (display 0)
-  (not-found 4)
-  )
-
-(defenum nav-control-flags
-  :bitfield #t
-  :type uint32
-  (display-marks 0)
-  (bit8 8)
-  (bit13 13)
-  )
-
-(defmacro with-pp (&rest body)
-  `(rlet ((pp :reg r13 :reset-here #t :type process))
-         ,@body)
-  )
diff --git a/test/decompiler/reference/decompiler-macros.gc b/test/decompiler/reference/decompiler-macros.gc
new file mode 100644
index 0000000000..465a039592
--- /dev/null
+++ b/test/decompiler/reference/decompiler-macros.gc
@@ -0,0 +1,81 @@
+;; This file should contain an implementation for all macros that the decompiler uses in its output.
+
+(defun ash ((value int) (shift-amount int))
+  "Arithmetic shift value by shift-amount.
+  A positive shift-amount will shift to the left and a negative will shift to the right.
+  "
+  ;; OpenGOAL does not support ash in the compiler, so we implement it here as an inline function.
+  (declare (inline))
+  (if (> shift-amount 0)
+      (shl value shift-amount)
+      (sar value (- shift-amount))
+      )
+  )
+
+(defmacro suspend()
+  '(none)
+  )
+
+(defmacro empty-form ()
+  '(none)
+  )
+
+(defmacro .sync.l ()
+  `(none))
+
+(defmacro make-u128 (upper lower)
+  `(rlet ((result :class i128)
+          (upper-xmm :class i128)
+          (lower-xmm :class i128))
+     (.mov upper-xmm ,upper)
+     (.mov lower-xmm ,lower)
+     (.pcpyld result upper-xmm lower-xmm)
+     (the uint result)
+     )
+  )
+
+(defmacro init-vf0-vector ()
+  "Initializes the VF0 vector which is a constant vector in the VU set to <0,0,0,1>"
+  `(.lvf vf0 (new 'static 'vector :x 0.0 :y 0.0 :z 0.0 :w 1.0))
+  )
+
+(defconstant SYM_TO_STRING_OFFSET #xff38)
+(defmacro symbol->string (sym)
+  "Convert a symbol to a goal string."
+  `(-> (the-as (pointer string) (+ SYM_TO_STRING_OFFSET (the-as int ,sym))))
+  )
+
+(defmacro new-stack-matrix0 ()
+  "Get a new matrix on the stack that's set to zero."
+  `(let ((mat (new 'stack-no-clear 'matrix)))
+     (set! (-> mat quad 0) (the-as uint128 0))
+     (set! (-> mat quad 1) (the-as uint128 0))
+     (set! (-> mat quad 2) (the-as uint128 0))
+     (set! (-> mat quad 3) (the-as uint128 0))
+     mat
+     )
+  )
+
+(defmacro new-stack-vector0 ()
+  "Get a stack vector that's set to 0.
+   This is more efficient than (new 'stack 'vector) because
+   this doesn't call the constructor."
+  `(let ((vec (new 'stack-no-clear 'vector)))
+     (set! (-> vec quad) (the-as uint128 0))
+     vec
+     )
+  )
+
+(defmacro with-pp (&rest body)
+  `(rlet ((pp :reg r13 :reset-here #t :type process))
+         ,@body)
+  )
+
+(defmacro fabs (x)
+  `(if (< (the float ,x) 0)
+       (- (the float ,x))
+       (the float ,x))
+  )
+
+(defconstant PI (the-as float #x40490fda))
+(defconstant MINUS_PI (the-as float #xc0490fda))
\ No newline at end of file
diff --git a/test/decompiler/reference/engine/anim/aligner-h_REF.gc b/test/decompiler/reference/engine/anim/aligner-h_REF.gc
index bbdaef1320..88ec4fd844 100644
--- a/test/decompiler/reference/engine/anim/aligner-h_REF.gc
+++ b/test/decompiler/reference/engine/anim/aligner-h_REF.gc
@@ -3,15 +3,15 @@
 
 ;; definition of type align-control
 (deftype align-control (basic)
-  ((flags       uint32                         :offset-assert 4)
-   (process     process                        :offset-assert 8)
-   (frame-group basic                          :offset-assert 12)
-   (frame-num   float                          :offset-assert 16)
-   (matrix      matrix     2 :inline           :offset-assert 32)
-   (transform   transform  2 :inline           :offset-assert 160)
-   (delta       transformq :inline             :offset-assert 256)
-   (last-speed  float                          :offset-assert 304)
-   (align       transformq :inline :offset 160)
+  ((flags       uint32               :offset-assert   4)
+   (process     process              :offset-assert   8)
+   (frame-group basic                :offset-assert  12)
+   (frame-num   float                :offset-assert  16)
+   (matrix      matrix     2 :inline :offset-assert  32)
+   (transform   transform  2 :inline :offset-assert 160)
+   (delta       transformq :inline   :offset-assert 256)
+   (last-speed  float                :offset-assert 304)
+   (align       transformq :inline   :offset        160)
    )
   :method-count-assert 14
   :size-assert         #x134
diff --git a/test/decompiler/reference/engine/anim/bones-h_REF.gc b/test/decompiler/reference/engine/anim/bones-h_REF.gc
index f9be65863e..c4b9e3ad30 100644
--- a/test/decompiler/reference/engine/anim/bones-h_REF.gc
+++ b/test/decompiler/reference/engine/anim/bones-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type bone-buffer
 (deftype bone-buffer (structure)
-  ((joint joint-anim-compressed-hdr 16 :inline :offset-assert 0)
+  ((joint joint-anim-compressed-hdr 16 :inline :offset-assert   0)
    (bone  bone                      16 :inline :offset-assert 1024)
    (_pad  uint8                     2048       :offset-assert 2560)
    )
@@ -23,11 +23,11 @@
 
 ;; definition of type bone-layout
 (deftype bone-layout (structure)
-  ((joint  joint  2             :offset-assert 0)
-   (bone   bone   2             :offset-assert 8)
-   (data   uint16 8 :offset   0)
-   (output uint32 2             :offset-assert 16)
-   (cache  uint32 2             :offset-assert 24)
+  ((joint  joint  2 :offset-assert   0)
+   (bone   bone   2 :offset-assert   8)
+   (data   uint16 8 :offset          0)
+   (output uint32 2 :offset-assert  16)
+   (cache  uint32 2 :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -47,9 +47,9 @@
 
 ;; definition of type bone-regs
 (deftype bone-regs (structure)
-  ((joint-ptr (pointer joint)  :offset-assert 0)
-   (bone-ptr  (pointer bone)   :offset-assert 4)
-   (num-bones uint32           :offset-assert 8)
+  ((joint-ptr (pointer joint)  :offset-assert   0)
+   (bone-ptr  (pointer bone)   :offset-assert   4)
+   (num-bones uint32           :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -67,9 +67,9 @@
 
 ;; definition of type bone-work
 (deftype bone-work (structure)
-  ((layout     bone-layout :inline :offset-assert 0)
-   (bounds     sphere      :inline :offset-assert 32)
-   (lights     vu-lights   :inline :offset-assert 48)
+  ((layout     bone-layout :inline :offset-assert   0)
+   (bounds     sphere      :inline :offset-assert  32)
+   (lights     vu-lights   :inline :offset-assert  48)
    (distance   vector      :inline :offset-assert 160)
    (next-tag   dma-packet  :inline :offset-assert 176)
    (dma-buf    dma-buffer          :offset-assert 192)
@@ -109,8 +109,8 @@
 
 ;; definition of type bone-debug
 (deftype bone-debug (structure)
-  ((time-ctr uint32     :offset-assert 0)
-   (timing   uint32 360 :offset-assert 4)
+  ((time-ctr uint32     :offset-assert   0)
+   (timing   uint32 360 :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x5a4
@@ -127,9 +127,9 @@
 
 ;; definition of type bone-memory
 (deftype bone-memory (structure)
-  ((work     bone-work   :inline             :offset-assert 0)
-   (buffer   bone-buffer 2 :inline           :offset-assert 240)
-   (dma-list dma-packet  :inline :offset 240)
+  ((work     bone-work   :inline   :offset-assert   0)
+   (buffer   bone-buffer 2 :inline :offset-assert 240)
+   (dma-list dma-packet  :inline   :offset        240)
    )
   :method-count-assert 9
   :size-assert         #x24f0
@@ -162,9 +162,9 @@
 
 ;; definition of type merc-globals
 (deftype merc-globals (structure)
-  ((first uint32  :offset-assert 0)
-   (next  uint32  :offset-assert 4)
-   (sink  basic   :offset-assert 8)
+  ((first uint32  :offset-assert   0)
+   (next  uint32  :offset-assert   4)
+   (sink  basic   :offset-assert   8)
    )
   :allow-misaligned  :method-count-assert 9
   :size-assert         #xc
@@ -182,8 +182,8 @@
 
 ;; definition of type merc-global-array
 (deftype merc-global-array (structure)
-  ((count   uint32                 :offset-assert 0)
-   (globals merc-globals 8 :inline :offset-assert 4)
+  ((count   uint32                 :offset-assert   0)
+   (globals merc-globals 8 :inline :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x84
@@ -203,9 +203,9 @@
 
 ;; definition of type shadow-dma-packet
 (deftype shadow-dma-packet (structure)
-  ((tag      generic-merc-tag :inline :offset-assert 0)
-   (settings shadow-settings  :inline :offset-assert 16)
-   (geo-ref  dma-packet       :inline :offset-assert 96)
+  ((tag      generic-merc-tag :inline :offset-assert   0)
+   (settings shadow-settings  :inline :offset-assert  16)
+   (geo-ref  dma-packet       :inline :offset-assert  96)
    (mtx-ref  dma-packet       :inline :offset-assert 112)
    (end-tag  dma-packet       :inline :offset-assert 128)
    )
diff --git a/test/decompiler/reference/engine/anim/joint-h_REF.gc b/test/decompiler/reference/engine/anim/joint-h_REF.gc
index 393e4cc4e2..6c003f1f16 100644
--- a/test/decompiler/reference/engine/anim/joint-h_REF.gc
+++ b/test/decompiler/reference/engine/anim/joint-h_REF.gc
@@ -3,18 +3,18 @@
 
 ;; definition of type joint-control-channel
 (deftype joint-control-channel (structure)
-  ((parent           joint-control                                        :offset-assert 0)
-   (command          symbol                                               :offset-assert 4)
-   (frame-interp     float                                                :offset-assert 8)
-   (frame-group      art-joint-anim                                       :offset-assert 12)
-   (frame-num        float                                                :offset-assert 16)
-   (num-func         (function joint-control-channel float float float)   :offset-assert 20)
-   (param            float                                              2 :offset-assert 24)
-   (group-sub-index  int16                                                :offset-assert 32)
-   (group-size       int16                                                :offset-assert 34)
-   (dist             float                                                :offset-assert 36)
-   (eval-time        uint32                                               :offset-assert 40)
-   (inspector-amount float                                                :offset-assert 44)
+  ((parent           joint-control                                        :offset-assert   0)
+   (command          symbol                                               :offset-assert   4)
+   (frame-interp     float                                                :offset-assert   8)
+   (frame-group      art-joint-anim                                       :offset-assert  12)
+   (frame-num        float                                                :offset-assert  16)
+   (num-func         (function joint-control-channel float float float)   :offset-assert  20)
+   (param            float                                              2 :offset-assert  24)
+   (group-sub-index  int16                                                :offset-assert  32)
+   (group-size       int16                                                :offset-assert  34)
+   (dist             float                                                :offset-assert  36)
+   (eval-time        uint32                                               :offset-assert  40)
+   (inspector-amount float                                                :offset-assert  44)
    )
   :method-count-assert 10
   :size-assert         #x30
@@ -44,25 +44,25 @@
 
 ;; definition of type joint-control
 (deftype joint-control (basic)
-  ((status                  uint16                            :offset-assert 4)
-   (allocated-length        int16                             :offset-assert 6)
-   (root-channel            joint-control-channel :offset  16)
-   (blend-index             int32                             :offset-assert 20)
-   (active-channels         int32                             :offset-assert 24)
-   (generate-frame-function basic                             :offset-assert 28)
-   (prebind-function        basic                             :offset-assert 32)
-   (postbind-function       basic                             :offset-assert 36)
-   (effect                  basic                             :offset-assert 40)
-   (channel                 joint-control-channel 3 :inline   :offset-assert 48)
-   (frame-group0            art-joint-anim        :offset  60)
-   (frame-num0              float                 :offset  64)
-   (frame-interp0           float                 :offset  56)
-   (frame-group1            art-joint-anim        :offset 108)
-   (frame-num1              float                 :offset 112)
-   (frame-interp1           float                 :offset 104)
-   (frame-group2            art-joint-anim        :offset 156)
-   (frame-num2              float                 :offset 160)
-   (frame-interp2           float                 :offset 152)
+  ((status                  uint16                          :offset-assert   4)
+   (allocated-length        int16                           :offset-assert   6)
+   (root-channel            joint-control-channel           :offset         16)
+   (blend-index             int32                           :offset-assert  20)
+   (active-channels         int32                           :offset-assert  24)
+   (generate-frame-function basic                           :offset-assert  28)
+   (prebind-function        basic                           :offset-assert  32)
+   (postbind-function       basic                           :offset-assert  36)
+   (effect                  basic                           :offset-assert  40)
+   (channel                 joint-control-channel 3 :inline :offset-assert  48)
+   (frame-group0            art-joint-anim                  :offset         60)
+   (frame-num0              float                           :offset         64)
+   (frame-interp0           float                           :offset         56)
+   (frame-group1            art-joint-anim                  :offset        108)
+   (frame-num1              float                           :offset        112)
+   (frame-interp1           float                           :offset        104)
+   (frame-group2            art-joint-anim                  :offset        156)
+   (frame-num2              float                           :offset        160)
+   (frame-interp2           float                           :offset        152)
    )
   :method-count-assert 11
   :size-assert         #xc0
@@ -101,8 +101,8 @@
 
 ;; definition of type matrix-stack
 (deftype matrix-stack (structure)
-  ((top  matrix            :offset-assert 0)
-   (data matrix 24 :inline :offset-assert 16)
+  ((top  matrix            :offset-assert   0)
+   (data matrix 24 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x610
@@ -119,12 +119,12 @@
 
 ;; definition of type channel-upload-info
 (deftype channel-upload-info (structure)
-  ((fixed     joint-anim-compressed-fixed  :offset-assert 0)
-   (fixed-qwc int32                        :offset-assert 4)
-   (frame     joint-anim-compressed-frame  :offset-assert 8)
-   (frame-qwc int32                        :offset-assert 12)
-   (amount    float                        :offset-assert 16)
-   (interp    float                        :offset-assert 20)
+  ((fixed     joint-anim-compressed-fixed  :offset-assert   0)
+   (fixed-qwc int32                        :offset-assert   4)
+   (frame     joint-anim-compressed-frame  :offset-assert   8)
+   (frame-qwc int32                        :offset-assert  12)
+   (amount    float                        :offset-assert  16)
+   (interp    float                        :offset-assert  20)
    )
   :pack-me
   :method-count-assert 9
@@ -146,8 +146,8 @@
 
 ;; definition of type joint-work
 (deftype joint-work (structure)
-  ((temp-mtx       matrix                      :inline     :offset-assert 0)
-   (joint-stack    matrix-stack                :inline     :offset-assert 64)
+  ((temp-mtx       matrix                      :inline     :offset-assert   0)
+   (joint-stack    matrix-stack                :inline     :offset-assert  64)
    (fix-jmp-table  (function none)             16          :offset-assert 1616)
    (frm-jmp-table  (function none)             16          :offset-assert 1680)
    (pair-jmp-table (function none)             16          :offset-assert 1744)
diff --git a/test/decompiler/reference/engine/anim/mspace-h_REF.gc b/test/decompiler/reference/engine/anim/mspace-h_REF.gc
index ec3fd2a895..57a5e95bdd 100644
--- a/test/decompiler/reference/engine/anim/mspace-h_REF.gc
+++ b/test/decompiler/reference/engine/anim/mspace-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type joint
 (deftype joint (basic)
-  ((name      basic          :offset-assert 4)
-   (number    int32          :offset-assert 8)
-   (parent    joint          :offset-assert 12)
-   (bind-pose matrix :inline :offset-assert 16)
+  ((name      basic          :offset-assert   4)
+   (number    int32          :offset-assert   8)
+   (parent    joint          :offset-assert  12)
+   (bind-pose matrix :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -25,10 +25,10 @@
 
 ;; definition of type bone-cache
 (deftype bone-cache (structure)
-  ((bone-matrix   uint32  :offset-assert 0)
-   (parent-matrix uint32  :offset-assert 4)
-   (dummy         uint32  :offset-assert 8)
-   (frame         uint32  :offset-assert 12)
+  ((bone-matrix   uint32  :offset-assert   0)
+   (parent-matrix uint32  :offset-assert   4)
+   (dummy         uint32  :offset-assert   8)
+   (frame         uint32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -47,10 +47,10 @@
 
 ;; definition of type bone
 (deftype bone (structure)
-  ((transform matrix     :inline             :offset-assert 0)
-   (position  vector     :inline :offset  48)
-   (scale     vector     :inline             :offset-assert 64)
-   (cache     bone-cache :inline             :offset-assert 80)
+  ((transform matrix     :inline :offset-assert   0)
+   (position  vector     :inline :offset         48)
+   (scale     vector     :inline :offset-assert  64)
+   (cache     bone-cache :inline :offset-assert  80)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -89,14 +89,14 @@
 
 ;; definition of type cspace
 (deftype cspace (structure)
-  ((parent    cspace    :offset-assert 0)
-   (joint     joint     :offset-assert 4)
-   (joint-num int16     :offset-assert 8)
-   (geo       basic     :offset-assert 12)
-   (bone      bone      :offset-assert 16)
-   (param0    function  :offset-assert 20)
-   (param1    basic     :offset-assert 24)
-   (param2    basic     :offset-assert 28)
+  ((parent    cspace    :offset-assert   0)
+   (joint     joint     :offset-assert   4)
+   (joint-num int16     :offset-assert   8)
+   (geo       basic     :offset-assert  12)
+   (bone      bone      :offset-assert  16)
+   (param0    function  :offset-assert  20)
+   (param1    basic     :offset-assert  24)
+   (param2    basic     :offset-assert  28)
    )
   :method-count-assert 10
   :size-assert         #x20
@@ -123,7 +123,7 @@
 
 ;; definition of type cspace-array
 (deftype cspace-array (inline-array-class)
-  ((data cspace :inline :dynamic :offset-assert 16)
+  ((data cspace :inline :dynamic :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/camera/camera-h_REF.gc b/test/decompiler/reference/engine/camera/camera-h_REF.gc
index 1ce84a0d5b..0ebd2ab266 100644
--- a/test/decompiler/reference/engine/camera/camera-h_REF.gc
+++ b/test/decompiler/reference/engine/camera/camera-h_REF.gc
@@ -3,16 +3,16 @@
 
 ;; definition of type camera-bank
 (deftype camera-bank (basic)
-  ((collide-move-rad        float   :offset-assert 4)
-   (joypad                  uint32  :offset-assert 8)
-   (min-detectable-velocity float   :offset-assert 12)
-   (attack-timeout          uint64  :offset-assert 16)
-   (default-string-max-y    float   :offset-assert 24)
-   (default-string-min-y    float   :offset-assert 28)
-   (default-string-max-z    float   :offset-assert 32)
-   (default-string-min-z    float   :offset-assert 36)
-   (default-string-push-z   float   :offset-assert 40)
-   (default-tilt-adjust     float   :offset-assert 44)
+  ((collide-move-rad        float   :offset-assert   4)
+   (joypad                  uint32  :offset-assert   8)
+   (min-detectable-velocity float   :offset-assert  12)
+   (attack-timeout          uint64  :offset-assert  16)
+   (default-string-max-y    float   :offset-assert  24)
+   (default-string-min-y    float   :offset-assert  28)
+   (default-string-max-z    float   :offset-assert  32)
+   (default-string-min-z    float   :offset-assert  36)
+   (default-string-push-z   float   :offset-assert  40)
+   (default-tilt-adjust     float   :offset-assert  44)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -73,8 +73,8 @@
 
 ;; definition of type cam-index
 (deftype cam-index (structure)
-  ((flags uint32    :offset-assert 0)
-   (vec   uint128 2 :offset-assert 16)
+  ((flags uint32    :offset-assert   0)
+   (vec   uint128 2 :offset-assert  16)
    )
   :method-count-assert 11
   :size-assert         #x30
@@ -95,11 +95,11 @@
 
 ;; definition of type tracking-point
 (deftype tracking-point (structure)
-  ((position    vector :inline :offset-assert 0)
-   (direction   vector :inline :offset-assert 16)
-   (tp-length   float          :offset-assert 32)
-   (next        int32          :offset-assert 36)
-   (incarnation int32          :offset-assert 40)
+  ((position    vector :inline :offset-assert   0)
+   (direction   vector :inline :offset-assert  16)
+   (tp-length   float          :offset-assert  32)
+   (next        int32          :offset-assert  36)
+   (incarnation int32          :offset-assert  40)
    )
   :method-count-assert 9
   :size-assert         #x2c
@@ -119,8 +119,8 @@
 
 ;; definition of type tracking-spline-sampler
 (deftype tracking-spline-sampler (structure)
-  ((cur-pt     int32  :offset-assert 0)
-   (partial-pt float  :offset-assert 4)
+  ((cur-pt     int32  :offset-assert   0)
+   (partial-pt float  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -137,7 +137,7 @@
 
 ;; definition of type tracking-spline
 (deftype tracking-spline (structure)
-  ((point              tracking-point 32 :inline :offset-assert 0)
+  ((point              tracking-point 32 :inline :offset-assert   0)
    (summed-len         float                     :offset-assert 1536)
    (free-point         int32                     :offset-assert 1540)
    (used-point         int32                     :offset-assert 1544)
@@ -204,12 +204,12 @@
 
 ;; definition of type cam-float-seeker
 (deftype cam-float-seeker (structure)
-  ((target      float  :offset-assert 0)
-   (value       float  :offset-assert 4)
-   (vel         float  :offset-assert 8)
-   (accel       float  :offset-assert 12)
-   (max-vel     float  :offset-assert 16)
-   (max-partial float  :offset-assert 20)
+  ((target      float  :offset-assert   0)
+   (value       float  :offset-assert   4)
+   (vel         float  :offset-assert   8)
+   (accel       float  :offset-assert  12)
+   (max-vel     float  :offset-assert  16)
+   (max-partial float  :offset-assert  20)
    )
   :pack-me
   :method-count-assert 13
@@ -309,12 +309,12 @@
 
 ;; definition of type cam-vector-seeker
 (deftype cam-vector-seeker (structure)
-  ((target      vector :inline :offset-assert 0)
-   (value       vector :inline :offset-assert 16)
-   (vel         vector :inline :offset-assert 32)
-   (accel       float          :offset-assert 48)
-   (max-vel     float          :offset-assert 52)
-   (max-partial float          :offset-assert 56)
+  ((target      vector :inline :offset-assert   0)
+   (value       vector :inline :offset-assert  16)
+   (vel         vector :inline :offset-assert  32)
+   (accel       float          :offset-assert  48)
+   (max-vel     float          :offset-assert  52)
+   (max-partial float          :offset-assert  56)
    )
   :method-count-assert 11
   :size-assert         #x3c
@@ -496,10 +496,10 @@
 
 ;; definition of type cam-rotation-tracker
 (deftype cam-rotation-tracker (structure)
-  ((inv-mat                 matrix           :inline :offset-assert 0)
-   (no-follow               basic                    :offset-assert 64)
-   (follow-pt               vector           :inline :offset-assert 80)
-   (follow-off              vector           :inline :offset-assert 96)
+  ((inv-mat                 matrix           :inline :offset-assert   0)
+   (no-follow               basic                    :offset-assert  64)
+   (follow-pt               vector           :inline :offset-assert  80)
+   (follow-off              vector           :inline :offset-assert  96)
    (follow-blend            float                    :offset-assert 112)
    (tilt-adjust             cam-float-seeker :inline :offset-assert 116)
    (use-point-of-interest   basic                    :offset-assert 140)
diff --git a/test/decompiler/reference/engine/camera/math-camera-h_REF.gc b/test/decompiler/reference/engine/camera/math-camera-h_REF.gc
index be396e5a04..9d5b85e8e0 100644
--- a/test/decompiler/reference/engine/camera/math-camera-h_REF.gc
+++ b/test/decompiler/reference/engine/camera/math-camera-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type vis-gif-tag
 (deftype vis-gif-tag (structure)
-  ((fog0  uint32  :offset-assert 0)
-   (strip uint32  :offset-assert 4)
-   (regs  uint32  :offset-assert 8)
-   (fan   uint32  :offset-assert 12)
+  ((fog0  uint32  :offset-assert   0)
+   (strip uint32  :offset-assert   4)
+   (regs  uint32  :offset-assert   8)
+   (fan   uint32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -25,22 +25,22 @@
 
 ;; definition of type cull-info
 (deftype cull-info (structure)
-  ((x-fact      float  :offset-assert 0)
-   (y-fact      float  :offset-assert 4)
-   (z-fact      float  :offset-assert 8)
-   (cam-radius  float  :offset-assert 12)
-   (cam-x       float  :offset-assert 16)
-   (cam-y       float  :offset-assert 20)
-   (xz-dir-ax   float  :offset-assert 24)
-   (xz-dir-az   float  :offset-assert 28)
-   (xz-dir-bx   float  :offset-assert 32)
-   (xz-dir-bz   float  :offset-assert 36)
-   (xz-cross-ab float  :offset-assert 40)
-   (yz-dir-ay   float  :offset-assert 44)
-   (yz-dir-az   float  :offset-assert 48)
-   (yz-dir-by   float  :offset-assert 52)
-   (yz-dir-bz   float  :offset-assert 56)
-   (yz-cross-ab float  :offset-assert 60)
+  ((x-fact      float  :offset-assert   0)
+   (y-fact      float  :offset-assert   4)
+   (z-fact      float  :offset-assert   8)
+   (cam-radius  float  :offset-assert  12)
+   (cam-x       float  :offset-assert  16)
+   (cam-y       float  :offset-assert  20)
+   (xz-dir-ax   float  :offset-assert  24)
+   (xz-dir-az   float  :offset-assert  28)
+   (xz-dir-bx   float  :offset-assert  32)
+   (xz-dir-bz   float  :offset-assert  36)
+   (xz-cross-ab float  :offset-assert  40)
+   (yz-dir-ay   float  :offset-assert  44)
+   (yz-dir-az   float  :offset-assert  48)
+   (yz-dir-by   float  :offset-assert  52)
+   (yz-dir-bz   float  :offset-assert  56)
+   (yz-cross-ab float  :offset-assert  60)
    )
   :pack-me
   :method-count-assert 9
@@ -72,54 +72,54 @@
 
 ;; definition of type math-camera
 (deftype math-camera (basic)
-  ((d                          float                     :offset-assert 4)
-   (f                          float                     :offset-assert 8)
-   (fov                        float                     :offset-assert 12)
-   (x-ratio                    float                     :offset-assert 16)
-   (y-ratio                    float                     :offset-assert 20)
-   (x-pix                      float                     :offset-assert 24)
-   (x-clip                     float                     :offset-assert 28)
-   (x-clip-ratio-in            float                     :offset-assert 32)
-   (x-clip-ratio-over          float                     :offset-assert 36)
-   (y-pix                      float                     :offset-assert 40)
-   (y-clip                     float                     :offset-assert 44)
-   (y-clip-ratio-in            float                     :offset-assert 48)
-   (y-clip-ratio-over          float                     :offset-assert 52)
-   (cull-info                  cull-info   :inline       :offset-assert 56)
-   (fog-start                  float                     :offset-assert 120)
-   (fog-end                    float                     :offset-assert 124)
-   (fog-max                    float                     :offset-assert 128)
-   (fog-min                    float                     :offset-assert 132)
-   (reset                      int32                     :offset-assert 136)
-   (smooth-step                float                     :offset-assert 140)
-   (smooth-t                   float                     :offset-assert 144)
-   (perspective                matrix      :inline       :offset-assert 160)
-   (isometric                  matrix      :inline       :offset-assert 224)
-   (sprite-2d                  matrix      :inline       :offset-assert 288)
-   (sprite-2d-hvdf             vector      :inline       :offset-assert 352)
-   (camera-rot                 matrix      :inline       :offset-assert 368)
-   (inv-camera-rot             matrix      :inline       :offset-assert 432)
-   (inv-camera-rot-smooth      matrix      :inline       :offset-assert 496)
-   (inv-camera-rot-smooth-from quaternion  :inline       :offset-assert 560)
-   (camera-temp                matrix      :inline       :offset-assert 576)
-   (prev-camera-temp           matrix      :inline       :offset-assert 640)
-   (hmge-scale                 vector      :inline       :offset-assert 704)
-   (inv-hmge-scale             vector      :inline       :offset-assert 720)
-   (hvdf-off                   vector      :inline       :offset-assert 736)
-   (guard                      vector      :inline       :offset-assert 752)
-   (vis-gifs                   vis-gif-tag 4 :inline     :offset-assert 768)
-   (vis-gifs-quads             uint128     4 :offset 768)
-   (giftex                     vis-gif-tag :offset 768)
-   (gifgr                      vis-gif-tag :offset 784)
-   (giftex-trans               vis-gif-tag :offset 800)
-   (gifgr-trans                vis-gif-tag :offset 816)
-   (pfog0                      float                     :offset-assert 832)
-   (pfog1                      float                     :offset-assert 836)
-   (trans                      vector      :inline       :offset-assert 848)
-   (plane                      uint128     4             :offset-assert 864)
-   (guard-plane                uint128     4             :offset-assert 928)
-   (shrub-mat                  matrix      :inline       :offset-assert 992)
-   (fov-correction-factor      float                     :offset-assert 1056)
+  ((d                          float                 :offset-assert   4)
+   (f                          float                 :offset-assert   8)
+   (fov                        float                 :offset-assert  12)
+   (x-ratio                    float                 :offset-assert  16)
+   (y-ratio                    float                 :offset-assert  20)
+   (x-pix                      float                 :offset-assert  24)
+   (x-clip                     float                 :offset-assert  28)
+   (x-clip-ratio-in            float                 :offset-assert  32)
+   (x-clip-ratio-over          float                 :offset-assert  36)
+   (y-pix                      float                 :offset-assert  40)
+   (y-clip                     float                 :offset-assert  44)
+   (y-clip-ratio-in            float                 :offset-assert  48)
+   (y-clip-ratio-over          float                 :offset-assert  52)
+   (cull-info                  cull-info   :inline   :offset-assert  56)
+   (fog-start                  float                 :offset-assert 120)
+   (fog-end                    float                 :offset-assert 124)
+   (fog-max                    float                 :offset-assert 128)
+   (fog-min                    float                 :offset-assert 132)
+   (reset                      int32                 :offset-assert 136)
+   (smooth-step                float                 :offset-assert 140)
+   (smooth-t                   float                 :offset-assert 144)
+   (perspective                matrix      :inline   :offset-assert 160)
+   (isometric                  matrix      :inline   :offset-assert 224)
+   (sprite-2d                  matrix      :inline   :offset-assert 288)
+   (sprite-2d-hvdf             vector      :inline   :offset-assert 352)
+   (camera-rot                 matrix      :inline   :offset-assert 368)
+   (inv-camera-rot             matrix      :inline   :offset-assert 432)
+   (inv-camera-rot-smooth      matrix      :inline   :offset-assert 496)
+   (inv-camera-rot-smooth-from quaternion  :inline   :offset-assert 560)
+   (camera-temp                matrix      :inline   :offset-assert 576)
+   (prev-camera-temp           matrix      :inline   :offset-assert 640)
+   (hmge-scale                 vector      :inline   :offset-assert 704)
+   (inv-hmge-scale             vector      :inline   :offset-assert 720)
+   (hvdf-off                   vector      :inline   :offset-assert 736)
+   (guard                      vector      :inline   :offset-assert 752)
+   (vis-gifs                   vis-gif-tag 4 :inline :offset-assert 768)
+   (vis-gifs-quads             uint128     4         :offset        768)
+   (giftex                     vis-gif-tag           :offset        768)
+   (gifgr                      vis-gif-tag           :offset        784)
+   (giftex-trans               vis-gif-tag           :offset        800)
+   (gifgr-trans                vis-gif-tag           :offset        816)
+   (pfog0                      float                 :offset-assert 832)
+   (pfog1                      float                 :offset-assert 836)
+   (trans                      vector      :inline   :offset-assert 848)
+   (plane                      uint128     4         :offset-assert 864)
+   (guard-plane                uint128     4         :offset-assert 928)
+   (shrub-mat                  matrix      :inline   :offset-assert 992)
+   (fov-correction-factor      float                 :offset-assert 1056)
    )
   :method-count-assert 9
   :size-assert         #x424
diff --git a/test/decompiler/reference/engine/camera/math-camera_REF.gc b/test/decompiler/reference/engine/camera/math-camera_REF.gc
index e35a38d4a6..a9633b4871 100644
--- a/test/decompiler/reference/engine/camera/math-camera_REF.gc
+++ b/test/decompiler/reference/engine/camera/math-camera_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type fog-corrector
 (deftype fog-corrector (structure)
-  ((fog-end   float  :offset-assert 0)
-   (fog-start float  :offset-assert 4)
+  ((fog-end   float  :offset-assert   0)
+   (fog-start float  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
diff --git a/test/decompiler/reference/engine/collide/collide-cache-h_REF.gc b/test/decompiler/reference/engine/collide/collide-cache-h_REF.gc
index da6119293c..f005b9da3c 100644
--- a/test/decompiler/reference/engine/collide/collide-cache-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-cache-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type collide-using-spheres-params
 (deftype collide-using-spheres-params (structure)
-  ((spheres      uint32  :offset-assert 0)
-   (num-spheres  uint32  :offset-assert 4)
-   (collide-with uint64  :offset-assert 8)
-   (proc         basic   :offset-assert 16)
-   (ignore-pat   uint32  :offset-assert 20)
-   (solid-only   basic   :offset-assert 24)
+  ((spheres      uint32  :offset-assert   0)
+   (num-spheres  uint32  :offset-assert   4)
+   (collide-with uint64  :offset-assert   8)
+   (proc         basic   :offset-assert  16)
+   (ignore-pat   uint32  :offset-assert  20)
+   (solid-only   basic   :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -32,8 +32,8 @@
 
 ;; definition of type collide-puss-sphere
 (deftype collide-puss-sphere (structure)
-  ((bsphere sphere         :inline :offset-assert 0)
-   (bbox4w  bounding-box4w :inline :offset-assert 16)
+  ((bsphere sphere         :inline :offset-assert   0)
+   (bbox4w  bounding-box4w :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -50,11 +50,11 @@
 
 ;; definition of type collide-puss-work
 (deftype collide-puss-work (structure)
-  ((closest-pt     vector              :inline    :offset-assert 0)
-   (tri-normal     vector              :inline    :offset-assert 16)
-   (tri-bbox4w     bounding-box4w      :inline    :offset-assert 32)
-   (spheres-bbox4w bounding-box4w      :inline    :offset-assert 64)
-   (spheres        collide-puss-sphere 64 :inline :offset-assert 96)
+  ((closest-pt     vector              :inline    :offset-assert   0)
+   (tri-normal     vector              :inline    :offset-assert  16)
+   (tri-bbox4w     bounding-box4w      :inline    :offset-assert  32)
+   (spheres-bbox4w bounding-box4w      :inline    :offset-assert  64)
+   (spheres        collide-puss-sphere 64 :inline :offset-assert  96)
    )
   :method-count-assert 11
   :size-assert         #xc60
@@ -82,11 +82,11 @@
 
 ;; definition of type collide-puyp-work
 (deftype collide-puyp-work (structure)
-  ((best-u     float                      :offset-assert 0)
-   (ignore-pat uint32                     :offset-assert 4)
-   (tri-out    collide-tri-result         :offset-assert 8)
-   (start-pos  vector             :inline :offset-assert 16)
-   (move-dist  vector             :inline :offset-assert 32)
+  ((best-u     float                      :offset-assert   0)
+   (ignore-pat uint32                     :offset-assert   4)
+   (tri-out    collide-tri-result         :offset-assert   8)
+   (start-pos  vector             :inline :offset-assert  16)
+   (move-dist  vector             :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -106,11 +106,11 @@
 
 ;; definition of type collide-cache-tri
 (deftype collide-cache-tri (structure)
-  ((vertex     vector 3 :inline :offset-assert 0)
-   (pat        uint32           :offset-assert 48)
-   (prim-index uint16           :offset-assert 52)
-   (user16     uint16           :offset-assert 54)
-   (user32     uint32 2         :offset-assert 56)
+  ((vertex     vector 3 :inline :offset-assert   0)
+   (pat        uint32           :offset-assert  48)
+   (prim-index uint16           :offset-assert  52)
+   (user16     uint16           :offset-assert  54)
+   (user32     uint32 2         :offset-assert  56)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -131,17 +131,17 @@
 
 ;; definition of type collide-cache-prim
 (deftype collide-cache-prim (structure)
-  ((prim-core    collide-prim-core :inline             :offset-assert 0)
-   (ccache       basic                                 :offset-assert 32)
-   (prim         basic                                 :offset-assert 36)
-   (first-tri    uint16                                :offset-assert 40)
-   (num-tris     uint16                                :offset-assert 42)
-   (unused       uint8             4                   :offset-assert 44)
-   (world-sphere vector            :inline :offset   0)
-   (collide-as   uint64            :offset  16)
-   (action       uint32            :offset  24)
-   (offense      int8              :offset  28)
-   (prim-type    int8              :offset  29)
+  ((prim-core    collide-prim-core :inline :offset-assert   0)
+   (ccache       basic                     :offset-assert  32)
+   (prim         basic                     :offset-assert  36)
+   (first-tri    uint16                    :offset-assert  40)
+   (num-tris     uint16                    :offset-assert  42)
+   (unused       uint8             4       :offset-assert  44)
+   (world-sphere vector            :inline :offset          0)
+   (collide-as   uint64                    :offset         16)
+   (action       uint32                    :offset         24)
+   (offense      int8                      :offset         28)
+   (prim-type    int8                      :offset         29)
    )
   :method-count-assert 11
   :size-assert         #x30
@@ -172,13 +172,13 @@
 
 ;; definition of type collide-cache
 (deftype collide-cache (basic)
-  ((num-tris      int32                          :offset-assert 4)
-   (num-prims     int32                          :offset-assert 8)
-   (ignore-mask   uint32                         :offset-assert 12)
-   (proc          basic                          :offset-assert 16)
-   (collide-box   bounding-box       :inline     :offset-assert 32)
-   (collide-box4w bounding-box4w     :inline     :offset-assert 64)
-   (collide-with  uint64                         :offset-assert 96)
+  ((num-tris      int32                          :offset-assert   4)
+   (num-prims     int32                          :offset-assert   8)
+   (ignore-mask   uint32                         :offset-assert  12)
+   (proc          basic                          :offset-assert  16)
+   (collide-box   bounding-box       :inline     :offset-assert  32)
+   (collide-box4w bounding-box4w     :inline     :offset-assert  64)
+   (collide-with  uint64                         :offset-assert  96)
    (prims         collide-cache-prim 100 :inline :offset-assert 112)
    (tris          collide-cache-tri  461 :inline :offset-assert 4912)
    )
@@ -234,8 +234,8 @@
 
 ;; definition of type collide-list-item
 (deftype collide-list-item (structure)
-  ((mesh basic  :offset-assert 0)
-   (inst basic  :offset-assert 4)
+  ((mesh basic  :offset-assert   0)
+   (inst basic  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -252,8 +252,8 @@
 
 ;; definition of type collide-list
 (deftype collide-list (structure)
-  ((num-items int32                         :offset-assert 0)
-   (items     collide-list-item 256 :inline :offset-assert 16)
+  ((num-items int32                         :offset-assert   0)
+   (items     collide-list-item 256 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x1010
@@ -270,9 +270,9 @@
 
 ;; definition of type collide-work
 (deftype collide-work (structure)
-  ((collide-sphere-neg-r sphere         :inline :offset-assert 0)
-   (collide-box4w        bounding-box4w :inline :offset-assert 16)
-   (inv-mat              matrix         :inline :offset-assert 48)
+  ((collide-sphere-neg-r sphere         :inline :offset-assert   0)
+   (collide-box4w        bounding-box4w :inline :offset-assert  16)
+   (inv-mat              matrix         :inline :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -304,7 +304,3 @@
 
 ;; definition (perm) for symbol *collide-list*, type collide-list
 (define-perm *collide-list* collide-list (new 'global 'collide-list))
-
-
-
-
diff --git a/test/decompiler/reference/engine/collide/collide-edge-grab-h_REF.gc b/test/decompiler/reference/engine/collide/collide-edge-grab-h_REF.gc
index fa7aa1f5d7..77f006de9f 100644
--- a/test/decompiler/reference/engine/collide/collide-edge-grab-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-edge-grab-h_REF.gc
@@ -3,18 +3,18 @@
 
 ;; definition of type edge-grab-info
 (deftype edge-grab-info (structure)
-  ((world-vertex             vector 6 :inline             :offset-assert 0)
-   (local-vertex             vector 6 :inline             :offset-assert 96)
-   (actor-cshape-prim-offset int32                        :offset-assert 192)
-   (actor-handle             uint64                       :offset-assert 200)
-   (hanging-matrix           matrix :inline               :offset-assert 208)
-   (edge-vertex              vector 2 :inline :offset   0)
-   (center-hold              vector :inline :offset  32)
-   (tri-vertex               vector 3 :inline :offset  48)
-   (left-hand-hold           vector :inline               :offset-assert 272)
-   (right-hand-hold          vector :inline               :offset-assert 288)
-   (center-hold-old          vector :inline               :offset-assert 304)
-   (edge-tri-pat             uint32                       :offset-assert 320)
+  ((world-vertex             vector 6 :inline :offset-assert   0)
+   (local-vertex             vector 6 :inline :offset-assert  96)
+   (actor-cshape-prim-offset int32            :offset-assert 192)
+   (actor-handle             uint64           :offset-assert 200)
+   (hanging-matrix           matrix :inline   :offset-assert 208)
+   (edge-vertex              vector 2 :inline :offset          0)
+   (center-hold              vector :inline   :offset         32)
+   (tri-vertex               vector 3 :inline :offset         48)
+   (left-hand-hold           vector :inline   :offset-assert 272)
+   (right-hand-hold          vector :inline   :offset-assert 288)
+   (center-hold-old          vector :inline   :offset-assert 304)
+   (edge-tri-pat             uint32           :offset-assert 320)
    )
   :method-count-assert 11
   :size-assert         #x144
@@ -49,8 +49,8 @@
 
 ;; definition of type collide-edge-tri
 (deftype collide-edge-tri (structure)
-  ((ctri   collide-cache-tri         :offset-assert 0)
-   (normal vector            :inline :offset-assert 16)
+  ((ctri   collide-cache-tri         :offset-assert   0)
+   (normal vector            :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -67,11 +67,11 @@
 
 ;; definition of type collide-edge-edge
 (deftype collide-edge-edge (structure)
-  ((ignore        basic                    :offset-assert 0)
-   (etri          collide-edge-tri         :offset-assert 4)
-   (vertex-ptr    vector           2       :offset-assert 8)
-   (outward       vector           :inline :offset-assert 16)
-   (edge-vec-norm vector           :inline :offset-assert 32)
+  ((ignore        basic                    :offset-assert   0)
+   (etri          collide-edge-tri         :offset-assert   4)
+   (vertex-ptr    vector           2       :offset-assert   8)
+   (outward       vector           :inline :offset-assert  16)
+   (edge-vec-norm vector           :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -91,12 +91,12 @@
 
 ;; definition of type collide-edge-hold-item
 (deftype collide-edge-hold-item (structure)
-  ((next       collide-edge-hold-item         :offset-assert 0)
-   (rating     float                          :offset-assert 4)
-   (split      int8                           :offset-assert 8)
-   (edge       collide-edge-edge              :offset-assert 12)
-   (center-pt  vector                 :inline :offset-assert 16)
-   (outward-pt vector                 :inline :offset-assert 32)
+  ((next       collide-edge-hold-item         :offset-assert   0)
+   (rating     float                          :offset-assert   4)
+   (split      int8                           :offset-assert   8)
+   (edge       collide-edge-edge              :offset-assert  12)
+   (center-pt  vector                 :inline :offset-assert  16)
+   (outward-pt vector                 :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -117,10 +117,10 @@
 
 ;; definition of type collide-edge-hold-list
 (deftype collide-edge-hold-list (structure)
-  ((num-allocs   uint32                            :offset-assert 0)
-   (num-attempts uint32                            :offset-assert 4)
-   (head         collide-edge-hold-item            :offset-assert 8)
-   (items        collide-edge-hold-item 32 :inline :offset-assert 16)
+  ((num-allocs   uint32                            :offset-assert   0)
+   (num-attempts uint32                            :offset-assert   4)
+   (head         collide-edge-hold-item            :offset-assert   8)
+   (items        collide-edge-hold-item 32 :inline :offset-assert  16)
    (attempts     qword                  32 :inline :offset-assert 1552)
    )
   :method-count-assert 11
@@ -145,32 +145,32 @@
 
 ;; definition of type collide-edge-work
 (deftype collide-edge-work (structure)
-  ((ccache                       basic                                        :offset-assert 0)
-   (cshape                       basic                                        :offset-assert 4)
-   (num-verts                    uint32                                       :offset-assert 8)
-   (num-edges                    uint32                                       :offset-assert 12)
-   (num-tris                     uint32                                       :offset-assert 16)
-   (cache-fill-box               bounding-box           :inline               :offset-assert 32)
-   (within-reach-box             bounding-box           :inline               :offset-assert 64)
-   (within-reach-box4w           bounding-box4w         :inline               :offset-assert 96)
-   (search-pt                    vector                 :inline               :offset-assert 128)
-   (search-dir-vec               vector                 :inline               :offset-assert 144)
-   (max-dist-sqrd-to-outward-pt  float                                        :offset-assert 160)
-   (max-dir-cosa-delta           float                                        :offset-assert 164)
-   (split-dists                  float                  2                     :offset-assert 168)
-   (outward-offset               vector                 :inline               :offset-assert 176)
-   (local-cache-fill-box         bounding-box           :inline               :offset-assert 192)
-   (local-within-reach-box       bounding-box           :inline               :offset-assert 224)
-   (local-player-spheres         sphere                 12 :inline            :offset-assert 256)
-   (world-player-spheres         sphere                 12 :inline            :offset-assert 448)
-   (local-player-hanging-spheres sphere                 6 :inline :offset 256)
-   (world-player-hanging-spheres sphere                 6 :inline :offset 448)
-   (local-player-leap-up-spheres sphere                 6 :inline :offset 352)
-   (world-player-leap-up-spheres sphere                 6 :inline :offset 544)
-   (verts                        vector                 64 :inline            :offset-assert 640)
-   (edges                        collide-edge-edge      96 :inline            :offset-assert 1664)
-   (tris                         collide-edge-tri       48 :inline            :offset-assert 6272)
-   (hold-list                    collide-edge-hold-list :inline               :offset-assert 7808)
+  ((ccache                       basic                             :offset-assert   0)
+   (cshape                       basic                             :offset-assert   4)
+   (num-verts                    uint32                            :offset-assert   8)
+   (num-edges                    uint32                            :offset-assert  12)
+   (num-tris                     uint32                            :offset-assert  16)
+   (cache-fill-box               bounding-box           :inline    :offset-assert  32)
+   (within-reach-box             bounding-box           :inline    :offset-assert  64)
+   (within-reach-box4w           bounding-box4w         :inline    :offset-assert  96)
+   (search-pt                    vector                 :inline    :offset-assert 128)
+   (search-dir-vec               vector                 :inline    :offset-assert 144)
+   (max-dist-sqrd-to-outward-pt  float                             :offset-assert 160)
+   (max-dir-cosa-delta           float                             :offset-assert 164)
+   (split-dists                  float                  2          :offset-assert 168)
+   (outward-offset               vector                 :inline    :offset-assert 176)
+   (local-cache-fill-box         bounding-box           :inline    :offset-assert 192)
+   (local-within-reach-box       bounding-box           :inline    :offset-assert 224)
+   (local-player-spheres         sphere                 12 :inline :offset-assert 256)
+   (world-player-spheres         sphere                 12 :inline :offset-assert 448)
+   (local-player-hanging-spheres sphere                 6 :inline  :offset        256)
+   (world-player-hanging-spheres sphere                 6 :inline  :offset        448)
+   (local-player-leap-up-spheres sphere                 6 :inline  :offset        352)
+   (world-player-leap-up-spheres sphere                 6 :inline  :offset        544)
+   (verts                        vector                 64 :inline :offset-assert 640)
+   (edges                        collide-edge-edge      96 :inline :offset-assert 1664)
+   (tris                         collide-edge-tri       48 :inline :offset-assert 6272)
+   (hold-list                    collide-edge-hold-list :inline    :offset-assert 7808)
    )
   :method-count-assert 20
   :size-assert         #x2690
diff --git a/test/decompiler/reference/engine/collide/collide-frag-h_REF.gc b/test/decompiler/reference/engine/collide/collide-frag-h_REF.gc
index 11b2a4766a..cafa36fbf9 100644
--- a/test/decompiler/reference/engine/collide/collide-frag-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-frag-h_REF.gc
@@ -24,15 +24,15 @@
 
 ;; definition of type collide-frag-mesh
 (deftype collide-frag-mesh (basic)
-  ((packed-data     uint32             :offset-assert 4)
-   (pat-array       uint32             :offset-assert 8)
-   (strip-data-len  uint16             :offset-assert 12)
-   (poly-count      uint16             :offset-assert 14)
-   (base-trans      vector :inline     :offset-assert 16)
-   (vertex-count    uint8  :offset  28)
-   (vertex-data-qwc uint8  :offset  29)
-   (total-qwc       uint8  :offset  30)
-   (unused          uint8  :offset  31)
+  ((packed-data     uint32         :offset-assert   4)
+   (pat-array       uint32         :offset-assert   8)
+   (strip-data-len  uint16         :offset-assert  12)
+   (poly-count      uint16         :offset-assert  14)
+   (base-trans      vector :inline :offset-assert  16)
+   (vertex-count    uint8          :offset         28)
+   (vertex-data-qwc uint8          :offset         29)
+   (total-qwc       uint8          :offset         30)
+   (unused          uint8          :offset         31)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -56,7 +56,7 @@
 
 ;; definition of type collide-fragment
 (deftype collide-fragment (drawable)
-  ((mesh collide-frag-mesh :offset   8)
+  ((mesh collide-frag-mesh  :offset   8)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -74,8 +74,8 @@
 
 ;; definition of type drawable-inline-array-collide-fragment
 (deftype drawable-inline-array-collide-fragment (drawable-inline-array)
-  ((data collide-fragment 1 :inline :offset-assert 32)
-   (pad  uint32                     :offset-assert 64)
+  ((data collide-fragment 1 :inline :offset-assert  32)
+   (pad  uint32                     :offset-assert  64)
    )
   :method-count-assert 18
   :size-assert         #x44
diff --git a/test/decompiler/reference/engine/collide/collide-mesh-h_REF.gc b/test/decompiler/reference/engine/collide/collide-mesh-h_REF.gc
index 33f7a9da8f..364cff33c6 100644
--- a/test/decompiler/reference/engine/collide/collide-mesh-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-mesh-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type collide-tri-result
 (deftype collide-tri-result (structure)
-  ((vertex    vector 3 :inline :offset-assert 0)
-   (intersect vector :inline   :offset-assert 48)
-   (normal    vector :inline   :offset-assert 64)
-   (pat       uint32           :offset-assert 80)
+  ((vertex    vector 3 :inline :offset-assert   0)
+   (intersect vector :inline   :offset-assert  48)
+   (normal    vector :inline   :offset-assert  64)
+   (pat       uint32           :offset-assert  80)
    )
   :method-count-assert 9
   :size-assert         #x54
@@ -25,9 +25,9 @@
 
 ;; definition of type collide-mesh-tri
 (deftype collide-mesh-tri (structure)
-  ((vertex-index uint8  3 :offset-assert 0)
-   (unused       uint8    :offset-assert 3)
-   (pat          uint32   :offset-assert 4)
+  ((vertex-index uint8  3 :offset-assert   0)
+   (unused       uint8    :offset-assert   3)
+   (pat          uint32   :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -46,11 +46,11 @@
 
 ;; definition of type collide-mesh
 (deftype collide-mesh (basic)
-  ((joint-id    int32                                  :offset-assert 4)
-   (num-tris    uint32                                 :offset-assert 8)
-   (num-verts   uint32                                 :offset-assert 12)
-   (vertex-data uint32                                 :offset-assert 16)
-   (tris        collide-mesh-tri 1 :inline :offset  32)
+  ((joint-id    int32                      :offset-assert   4)
+   (num-tris    uint32                     :offset-assert   8)
+   (num-verts   uint32                     :offset-assert  12)
+   (vertex-data uint32                     :offset-assert  16)
+   (tris        collide-mesh-tri 1 :inline :offset         32)
    )
   :method-count-assert 16
   :size-assert         #x28
@@ -79,10 +79,10 @@
 
 ;; definition of type collide-mesh-cache
 (deftype collide-mesh-cache (basic)
-  ((used-size uint32                   :offset-assert 4)
-   (max-size  uint32                   :offset-assert 8)
-   (id        uint64                   :offset-assert 16)
-   (data      uint8  40960 :offset  32)
+  ((used-size uint32       :offset-assert   4)
+   (max-size  uint32       :offset-assert   8)
+   (id        uint64       :offset-assert  16)
+   (data      uint8  40960 :offset         32)
    )
   :method-count-assert 12
   :size-assert         #xa020
@@ -114,10 +114,10 @@
 
 ;; definition of type collide-mesh-cache-tri
 (deftype collide-mesh-cache-tri (structure)
-  ((vertex vector         3 :inline   :offset-assert 0)
-   (normal vector         :inline     :offset-assert 48)
-   (bbox4w bounding-box4w :inline     :offset-assert 64)
-   (pat    uint32         :offset  60)
+  ((vertex vector         3 :inline :offset-assert   0)
+   (normal vector         :inline   :offset-assert  48)
+   (bbox4w bounding-box4w :inline   :offset-assert  64)
+   (pat    uint32                   :offset         60)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -147,7 +147,3 @@
 
 ;; failed to figure out what this is:
 (set! (-> *collide-mesh-cache* max-size) (the-as uint #xa000))
-
-
-
-
diff --git a/test/decompiler/reference/engine/collide/collide-shape-h_REF.gc b/test/decompiler/reference/engine/collide/collide-shape-h_REF.gc
index d3545cdc87..fa24eb150c 100644
--- a/test/decompiler/reference/engine/collide/collide-shape-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-shape-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type collide-sticky-rider
 (deftype collide-sticky-rider (structure)
-  ((rider-handle    handle         :offset-assert 0)
-   (sticky-prim     basic          :offset-assert 8)
-   (prim-ry         float          :offset-assert 12)
-   (rider-local-pos vector :inline :offset-assert 16)
+  ((rider-handle    handle         :offset-assert   0)
+   (sticky-prim     basic          :offset-assert   8)
+   (prim-ry         float          :offset-assert  12)
+   (rider-local-pos vector :inline :offset-assert  16)
    )
   :method-count-assert 10
   :size-assert         #x20
@@ -38,9 +38,9 @@
 
 ;; definition of type collide-sticky-rider-group
 (deftype collide-sticky-rider-group (basic)
-  ((num-riders       int32                          :offset-assert 4)
-   (allocated-riders int32                          :offset-assert 8)
-   (rider            collide-sticky-rider 1 :inline :offset-assert 16)
+  ((num-riders       int32                          :offset-assert   4)
+   (allocated-riders int32                          :offset-assert   8)
+   (rider            collide-sticky-rider 1 :inline :offset-assert  16)
    )
   :method-count-assert 11
   :size-assert         #x30
@@ -69,10 +69,10 @@
 
 ;; definition of type pull-rider-info
 (deftype pull-rider-info (structure)
-  ((rider          collide-sticky-rider         :offset-assert 0)
-   (rider-cshape   basic                        :offset-assert 4)
-   (rider-delta-ry float                        :offset-assert 8)
-   (rider-dest     vector               :inline :offset-assert 16)
+  ((rider          collide-sticky-rider         :offset-assert   0)
+   (rider-cshape   basic                        :offset-assert   4)
+   (rider-delta-ry float                        :offset-assert   8)
+   (rider-dest     vector               :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -91,9 +91,9 @@
 
 ;; definition of type collide-shape-intersect
 (deftype collide-shape-intersect (basic)
-  ((move-vec       vector             :inline :offset-assert 16)
-   (best-u         float                      :offset-assert 32)
-   (best-tri       collide-tri-result :inline :offset-assert 48)
+  ((move-vec       vector             :inline :offset-assert  16)
+   (best-u         float                      :offset-assert  32)
+   (best-tri       collide-tri-result :inline :offset-assert  48)
    (best-from-prim basic                      :offset-assert 132)
    (best-to-prim   basic                      :offset-assert 136)
    )
@@ -118,10 +118,10 @@
 
 ;; definition of type collide-overlap-result
 (deftype collide-overlap-result (structure)
-  ((best-dist      float                      :offset-assert 0)
-   (best-from-prim basic                      :offset-assert 4)
-   (best-to-prim   basic                      :offset-assert 8)
-   (best-from-tri  collide-tri-result :inline :offset-assert 16)
+  ((best-dist      float                      :offset-assert   0)
+   (best-from-prim basic                      :offset-assert   4)
+   (best-to-prim   basic                      :offset-assert   8)
+   (best-from-tri  collide-tri-result :inline :offset-assert  16)
    )
   :method-count-assert 10
   :size-assert         #x64
@@ -156,8 +156,8 @@
 
 ;; definition of type overlaps-others-params
 (deftype overlaps-others-params (structure)
-  ((options uint32  :offset-assert 0)
-   (tlist   basic   :offset-assert 4)
+  ((options uint32  :offset-assert   0)
+   (tlist   basic   :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -195,13 +195,13 @@
 
 ;; definition of type collide-prim-core
 (deftype collide-prim-core (structure)
-  ((world-sphere vector  :inline       :offset-assert 0)
-   (collide-as   uint64                :offset-assert 16)
-   (action       uint32                :offset-assert 24)
-   (offense      int8                  :offset-assert 28)
-   (prim-type    int8                  :offset-assert 29)
-   (extra        uint8   2             :offset-assert 30)
-   (quad         uint128 2 :offset   0)
+  ((world-sphere vector  :inline :offset-assert   0)
+   (collide-as   uint64          :offset-assert  16)
+   (action       uint32          :offset-assert  24)
+   (offense      int8            :offset-assert  28)
+   (prim-type    int8            :offset-assert  29)
+   (extra        uint8   2       :offset-assert  30)
+   (quad         uint128 2       :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -223,18 +223,18 @@
 
 ;; definition of type collide-shape-prim
 (deftype collide-shape-prim (basic)
-  ((cshape          basic                                 :offset-assert 4)
-   (prim-id         uint32                                :offset-assert 8)
-   (transform-index int8                                  :offset-assert 12)
-   (prim-core       collide-prim-core :inline             :offset-assert 16)
-   (local-sphere    vector            :inline             :offset-assert 48)
-   (collide-with    uint64                                :offset-assert 64)
-   (world-sphere    vector            :inline :offset  16)
-   (collide-as      uint64            :offset  32)
-   (action          uint32            :offset  40)
-   (offense         int8              :offset  44)
-   (prim-type       int8              :offset  45)
-   (radius          float             :offset  60)
+  ((cshape          basic                     :offset-assert   4)
+   (prim-id         uint32                    :offset-assert   8)
+   (transform-index int8                      :offset-assert  12)
+   (prim-core       collide-prim-core :inline :offset-assert  16)
+   (local-sphere    vector            :inline :offset-assert  48)
+   (collide-with    uint64                    :offset-assert  64)
+   (world-sphere    vector            :inline :offset         16)
+   (collide-as      uint64                    :offset         32)
+   (action          uint32                    :offset         40)
+   (offense         int8                      :offset         44)
+   (prim-type       int8                      :offset         45)
+   (radius          float                     :offset         60)
    )
   :method-count-assert 28
   :size-assert         #x48
@@ -283,7 +283,7 @@
 
 ;; definition of type collide-shape-prim-sphere
 (deftype collide-shape-prim-sphere (collide-shape-prim)
-  ((pat uint32  :offset-assert 72)
+  ((pat uint32  :offset-assert  72)
    )
   :method-count-assert 28
   :size-assert         #x4c
@@ -314,10 +314,10 @@
 
 ;; definition of type collide-shape-prim-mesh
 (deftype collide-shape-prim-mesh (collide-shape-prim)
-  ((mesh            basic   :offset-assert 72)
-   (mesh-id         int32   :offset-assert 76)
-   (mesh-cache-id   uint64  :offset-assert 80)
-   (mesh-cache-tris uint32  :offset-assert 88)
+  ((mesh            basic   :offset-assert  72)
+   (mesh-id         int32   :offset-assert  76)
+   (mesh-cache-id   uint64  :offset-assert  80)
+   (mesh-cache-tris uint32  :offset-assert  88)
    )
   :method-count-assert 29
   :size-assert         #x5c
@@ -352,9 +352,9 @@
 
 ;; definition of type collide-shape-prim-group
 (deftype collide-shape-prim-group (collide-shape-prim)
-  ((num-prims       int32    :offset-assert 72)
-   (allocated-prims int32    :offset-assert 76)
-   (prim            uint32 1 :offset-assert 80)
+  ((num-prims       int32    :offset-assert  72)
+   (allocated-prims int32    :offset-assert  76)
+   (prim            uint32 1 :offset-assert  80)
    )
   :method-count-assert 30
   :size-assert         #x54
diff --git a/test/decompiler/reference/engine/collide/collide-target-h_REF.gc b/test/decompiler/reference/engine/collide/collide-target-h_REF.gc
index f79b56d506..479889562e 100644
--- a/test/decompiler/reference/engine/collide/collide-target-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-target-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type collide-history
 (deftype collide-history (structure)
-  ((intersect      vector :inline :offset-assert 0)
-   (trans          vector :inline :offset-assert 16)
-   (transv         vector :inline :offset-assert 32)
-   (transv-out     vector :inline :offset-assert 48)
-   (local-normal   vector :inline :offset-assert 64)
-   (surface-normal vector :inline :offset-assert 80)
-   (time           uint64         :offset-assert 96)
+  ((intersect      vector :inline :offset-assert   0)
+   (trans          vector :inline :offset-assert  16)
+   (transv         vector :inline :offset-assert  32)
+   (transv-out     vector :inline :offset-assert  48)
+   (local-normal   vector :inline :offset-assert  64)
+   (surface-normal vector :inline :offset-assert  80)
+   (time           uint64         :offset-assert  96)
    (status         uint64         :offset-assert 104)
    (pat            uint32         :offset-assert 112)
    (reaction-flag  uint32         :offset-assert 116)
@@ -40,7 +40,7 @@
 
 ;; definition of type control-info
 (deftype control-info (collide-shape-moving)
-  ((array-size    int16           :offset 2490)
+  ((array-size    int16                       :offset        2490)
    (history-array collide-history 128 :inline :offset-assert 2496)
    (pad           uint32          27          :offset-assert 18880)
    )
@@ -72,7 +72,3 @@
   (set! (-> obj pat) (-> cshape cur-pat))
   obj
   )
-
-
-
-
diff --git a/test/decompiler/reference/engine/collide/collide-touch-h_REF.gc b/test/decompiler/reference/engine/collide/collide-touch-h_REF.gc
index e8bf58c710..1a2593bed1 100644
--- a/test/decompiler/reference/engine/collide/collide-touch-h_REF.gc
+++ b/test/decompiler/reference/engine/collide/collide-touch-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type touching-prim
 (deftype touching-prim (structure)
-  ((cprim    basic                      :offset-assert 0)
-   (has-tri? basic                      :offset-assert 4)
-   (tri      collide-tri-result :inline :offset-assert 16)
+  ((cprim    basic                      :offset-assert   0)
+   (has-tri? basic                      :offset-assert   4)
+   (tri      collide-tri-result :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x64
@@ -23,11 +23,11 @@
 
 ;; definition of type touching-prims-entry
 (deftype touching-prims-entry (structure)
-  ((next       touching-prims-entry         :offset-assert 0)
-   (prev       touching-prims-entry         :offset-assert 4)
-   (allocated? basic                        :offset-assert 8)
-   (u          float                        :offset-assert 12)
-   (prim1      touching-prim        :inline :offset-assert 16)
+  ((next       touching-prims-entry         :offset-assert   0)
+   (prev       touching-prims-entry         :offset-assert   4)
+   (allocated? basic                        :offset-assert   8)
+   (u          float                        :offset-assert  12)
+   (prim1      touching-prim        :inline :offset-assert  16)
    (prim2      touching-prim        :inline :offset-assert 128)
    )
   :method-count-assert 13
@@ -55,8 +55,8 @@
 
 ;; definition of type touching-prims-entry-pool
 (deftype touching-prims-entry-pool (structure)
-  ((head  touching-prims-entry            :offset-assert 0)
-   (nodes touching-prims-entry 64 :inline :offset-assert 16)
+  ((head  touching-prims-entry            :offset-assert   0)
+   (nodes touching-prims-entry 64 :inline :offset-assert  16)
    )
   :method-count-assert 13
   :size-assert         #x3c10
@@ -124,10 +124,10 @@
 
 ;; definition of type touching-shapes-entry
 (deftype touching-shapes-entry (structure)
-  ((cshape1   basic                 :offset-assert 0)
-   (cshape2   basic                 :offset-assert 4)
-   (resolve-u int8                  :offset-assert 8)
-   (head      touching-prims-entry  :offset-assert 12)
+  ((cshape1   basic                 :offset-assert   0)
+   (cshape2   basic                 :offset-assert   4)
+   (resolve-u int8                  :offset-assert   8)
+   (head      touching-prims-entry  :offset-assert  12)
    )
   :allow-misaligned  :method-count-assert 18
   :size-assert         #x10
@@ -157,9 +157,9 @@
 
 ;; definition of type touching-list
 (deftype touching-list (structure)
-  ((num-touching-shapes int32                            :offset-assert 0)
-   (resolve-u           int8                             :offset-assert 4)
-   (touching-shapes     touching-shapes-entry 32 :inline :offset-assert 8)
+  ((num-touching-shapes int32                            :offset-assert   0)
+   (resolve-u           int8                             :offset-assert   4)
+   (touching-shapes     touching-shapes-entry 32 :inline :offset-assert   8)
    )
   :method-count-assert 15
   :size-assert         #x208
@@ -220,7 +220,3 @@
 
 ;; definition (perm) for symbol *touching-list*, type touching-list
 (define-perm *touching-list* touching-list (new 'global 'touching-list))
-
-
-
-
diff --git a/test/decompiler/reference/engine/data/art-h_REF.gc b/test/decompiler/reference/engine/data/art-h_REF.gc
index 058e7618d9..ec9558f085 100644
--- a/test/decompiler/reference/engine/data/art-h_REF.gc
+++ b/test/decompiler/reference/engine/data/art-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type joint-anim
 (deftype joint-anim (basic)
-  ((name   string  :offset-assert 4)
-   (number int16   :offset-assert 8)
-   (length int16   :offset-assert 10)
+  ((name   string  :offset-assert   4)
+   (number int16   :offset-assert   8)
+   (length int16   :offset-assert  10)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -41,7 +41,7 @@
 
 ;; definition of type joint-anim-drawable
 (deftype joint-anim-drawable (joint-anim)
-  ((data drawable :dynamic :offset-assert 12)
+  ((data drawable :dynamic :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -60,7 +60,7 @@
 
 ;; definition of type joint-anim-compressed
 (deftype joint-anim-compressed (joint-anim)
-  ((data joint-anim-compressed-hdr :dynamic :offset-assert 12)
+  ((data joint-anim-compressed-hdr :dynamic :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -78,7 +78,7 @@
 
 ;; definition of type joint-anim-frame
 (deftype joint-anim-frame (structure)
-  ((matrices matrix 2 :inline :offset-assert 0)
+  ((matrices matrix 2 :inline :offset-assert   0)
    (data     uint32 :dynamic  :offset-assert 128)
    )
   :method-count-assert 9
@@ -117,9 +117,9 @@
 
 ;; definition of type joint-anim-compressed-hdr
 (deftype joint-anim-compressed-hdr (structure)
-  ((control-bits uint32 14 :offset-assert 0)
-   (num-joints   uint32    :offset-assert 56)
-   (matrix-bits  uint32    :offset-assert 60)
+  ((control-bits uint32 14 :offset-assert   0)
+   (num-joints   uint32    :offset-assert  56)
+   (matrix-bits  uint32    :offset-assert  60)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -137,12 +137,12 @@
 
 ;; definition of type joint-anim-compressed-fixed
 (deftype joint-anim-compressed-fixed (structure)
-  ((hdr       joint-anim-compressed-hdr :inline     :offset-assert 0)
-   (offset-64 uint32                                :offset-assert 64)
-   (offset-32 uint32                                :offset-assert 68)
-   (offset-16 uint32                                :offset-assert 72)
-   (reserved  uint32                                :offset-assert 76)
-   (data      vector                    133 :inline :offset-assert 80)
+  ((hdr       joint-anim-compressed-hdr :inline     :offset-assert   0)
+   (offset-64 uint32                                :offset-assert  64)
+   (offset-32 uint32                                :offset-assert  68)
+   (offset-16 uint32                                :offset-assert  72)
+   (reserved  uint32                                :offset-assert  76)
+   (data      vector                    133 :inline :offset-assert  80)
    )
   :method-count-assert 9
   :size-assert         #x8a0
@@ -166,11 +166,11 @@
 
 ;; definition of type joint-anim-compressed-frame
 (deftype joint-anim-compressed-frame (structure)
-  ((offset-64 uint32             :offset-assert 0)
-   (offset-32 uint32             :offset-assert 4)
-   (offset-16 uint32             :offset-assert 8)
-   (reserved  uint32             :offset-assert 12)
-   (data      vector 133 :inline :offset-assert 16)
+  ((offset-64 uint32             :offset-assert   0)
+   (offset-32 uint32             :offset-assert   4)
+   (offset-16 uint32             :offset-assert   8)
+   (reserved  uint32             :offset-assert  12)
+   (data      vector 133 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x860
@@ -193,11 +193,11 @@
 
 ;; definition of type joint-anim-compressed-control
 (deftype joint-anim-compressed-control (structure)
-  ((num-frames uint32                        :offset-assert 0)
-   (fixed-qwc  uint32                        :offset-assert 4)
-   (frame-qwc  uint32                        :offset-assert 8)
-   (fixed      joint-anim-compressed-fixed   :offset-assert 12)
-   (data       uint32                      1 :offset-assert 16)
+  ((num-frames uint32                        :offset-assert   0)
+   (fixed-qwc  uint32                        :offset-assert   4)
+   (frame-qwc  uint32                        :offset-assert   8)
+   (fixed      joint-anim-compressed-fixed   :offset-assert  12)
+   (data       uint32                      1 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -220,9 +220,9 @@
 
 ;; definition of type art
 (deftype art (basic)
-  ((name   string :offset   8)
-   (length int32              :offset-assert 12)
-   (extra  entity             :offset-assert 16)
+  ((name   string  :offset          8)
+   (length int32   :offset-assert  12)
+   (extra  entity  :offset-assert  16)
    )
   :method-count-assert 13
   :size-assert         #x14
@@ -246,7 +246,7 @@
 
 ;; definition of type art-element
 (deftype art-element (art)
-  ((pad uint8 12 :offset-assert 20)
+  ((pad uint8 12 :offset-assert  20)
    )
   :method-count-assert 13
   :size-assert         #x20
@@ -272,14 +272,14 @@
 
 ;; definition of type art-joint-anim
 (deftype art-joint-anim (art-element)
-  ((_unknown               (pointer int16)       :offset   4)
-   (speed                  float                 :offset  20)
-   (artist-base            float                 :offset  24)
-   (artist-step            float                 :offset  28)
-   (master-art-group-name  string                :offset  32)
-   (master-art-group-index int32                 :offset  36)
-   (frames                 pointer               :offset  44)
-   (data                   joint-anim-compressed :dynamic    :offset-assert 48)
+  ((_unknown               (pointer int16)                :offset          4)
+   (speed                  float                          :offset         20)
+   (artist-base            float                          :offset         24)
+   (artist-step            float                          :offset         28)
+   (master-art-group-name  string                         :offset         32)
+   (master-art-group-index int32                          :offset         36)
+   (frames                 pointer                        :offset         44)
+   (data                   joint-anim-compressed :dynamic :offset-assert  48)
    )
   :method-count-assert 13
   :size-assert         #x30
@@ -288,7 +288,7 @@
 
 ;; definition of type art-group
 (deftype art-group (art)
-  ((info file-info   :offset   4)
+  ((info file-info            :offset   4)
    (data art-element :dynamic :offset  32)
    )
   :method-count-assert 15
@@ -302,7 +302,7 @@
 
 ;; definition of type art-mesh-geo
 (deftype art-mesh-geo (art-element)
-  ((data basic :dynamic :offset-assert 32)
+  ((data basic :dynamic :offset-assert  32)
    )
   :method-count-assert 13
   :size-assert         #x20
@@ -311,7 +311,7 @@
 
 ;; definition of type art-joint-geo
 (deftype art-joint-geo (art-element)
-  ((data joint :dynamic :offset-assert 32)
+  ((data joint :dynamic :offset-assert  32)
    )
   :method-count-assert 13
   :size-assert         #x20
@@ -320,20 +320,20 @@
 
 ;; definition of type skeleton-group
 (deftype skeleton-group (basic)
-  ((art-group-name basic              :offset-assert 4)
-   (jgeo           int32              :offset-assert 8)
-   (janim          int32              :offset-assert 12)
-   (bounds         vector :inline     :offset-assert 16)
-   (radius         float  :offset  28)
-   (mgeo           uint16 4           :offset-assert 32)
-   (max-lod        int32              :offset-assert 40)
-   (lod-dist       float  4           :offset-assert 44)
-   (longest-edge   float              :offset-assert 60)
-   (texture-level  int8               :offset-assert 64)
-   (version        int8               :offset-assert 65)
-   (shadow         int8               :offset-assert 66)
-   (sort           int8               :offset-assert 67)
-   (_pad           uint8  4           :offset-assert 68)
+  ((art-group-name basic          :offset-assert   4)
+   (jgeo           int32          :offset-assert   8)
+   (janim          int32          :offset-assert  12)
+   (bounds         vector :inline :offset-assert  16)
+   (radius         float          :offset         28)
+   (mgeo           uint16 4       :offset-assert  32)
+   (max-lod        int32          :offset-assert  40)
+   (lod-dist       float  4       :offset-assert  44)
+   (longest-edge   float          :offset-assert  60)
+   (texture-level  int8           :offset-assert  64)
+   (version        int8           :offset-assert  65)
+   (shadow         int8           :offset-assert  66)
+   (sort           int8           :offset-assert  67)
+   (_pad           uint8  4       :offset-assert  68)
    )
   :method-count-assert 9
   :size-assert         #x48
@@ -361,8 +361,8 @@
 
 ;; definition of type lod-group
 (deftype lod-group (structure)
-  ((geo  merc-ctrl  :offset-assert 0)
-   (dist float      :offset-assert 4)
+  ((geo  merc-ctrl  :offset-assert   0)
+   (dist float      :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -380,8 +380,8 @@
 
 ;; definition of type lod-set
 (deftype lod-set (structure)
-  ((lod     lod-group 4 :inline :offset-assert 0)
-   (max-lod int8                :offset-assert 32)
+  ((lod     lod-group 4 :inline :offset-assert   0)
+   (max-lod int8                :offset-assert  32)
    )
   :pack-me
   :method-count-assert 10
@@ -402,46 +402,46 @@
 
 ;; definition of type draw-control
 (deftype draw-control (basic)
-  ((status                   uint8                                           :offset-assert 4)
-   (matrix-type              uint8                                           :offset-assert 5)
-   (data-format              uint8                                           :offset-assert 6)
-   (global-effect            uint8                                           :offset-assert 7)
-   (art-group                art-group                                       :offset-assert 8)
-   (jgeo                     art-joint-geo                                   :offset-assert 12)
-   (mgeo                     merc-ctrl                                       :offset-assert 16)
-   (dma-add-func             function                                        :offset-assert 20)
-   (skeleton                 skeleton-group                                  :offset-assert 24)
-   (lod-set                  lod-set                   :inline               :offset-assert 28)
-   (lod                      lod-group                 4 :inline :offset  28)
-   (max-lod                  int8                      :offset  60)
-   (force-lod                int8                                            :offset-assert 61)
-   (cur-lod                  int8                                            :offset-assert 62)
-   (desired-lod              int8                                            :offset-assert 63)
-   (ripple                   ripple-control                                  :offset-assert 64)
-   (longest-edge             float                                           :offset-assert 68)
-   (longest-edge?            uint32                    :offset  68)
-   (light-index              uint8                                           :offset-assert 72)
-   (dummy                    uint8                     2                     :offset-assert 73)
-   (death-draw-overlap       uint8                                           :offset-assert 75)
-   (death-timer              uint8                                           :offset-assert 76)
-   (death-timer-org          uint8                                           :offset-assert 77)
-   (death-vertex-skip        uint16                                          :offset-assert 78)
-   (death-effect             uint32                                          :offset-assert 80)
-   (sink-group               dma-foreground-sink-group                       :offset-assert 84)
-   (process                  process                                         :offset-assert 88)
-   (shadow                   shadow-geo                                      :offset-assert 92)
-   (shadow-ctrl              shadow-control                                  :offset-assert 96)
-   (origin                   vector                    :inline               :offset-assert 112)
-   (bounds                   vector                    :inline               :offset-assert 128)
-   (radius                   float                     :offset 140)
-   (color-mult               rgbaf                     :inline               :offset-assert 144)
-   (color-emissive           rgbaf                     :inline               :offset-assert 160)
-   (secondary-interp         float                                           :offset-assert 176)
-   (current-secondary-interp float                                           :offset-assert 180)
-   (shadow-mask              uint8                                           :offset-assert 184)
-   (level-index              uint8                                           :offset-assert 185)
-   (origin-joint-index       uint8                                           :offset-assert 186)
-   (shadow-joint-index       uint8                                           :offset-assert 187)
+  ((status                   uint8                               :offset-assert   4)
+   (matrix-type              uint8                               :offset-assert   5)
+   (data-format              uint8                               :offset-assert   6)
+   (global-effect            uint8                               :offset-assert   7)
+   (art-group                art-group                           :offset-assert   8)
+   (jgeo                     art-joint-geo                       :offset-assert  12)
+   (mgeo                     merc-ctrl                           :offset-assert  16)
+   (dma-add-func             function                            :offset-assert  20)
+   (skeleton                 skeleton-group                      :offset-assert  24)
+   (lod-set                  lod-set                   :inline   :offset-assert  28)
+   (lod                      lod-group                 4 :inline :offset         28)
+   (max-lod                  int8                                :offset         60)
+   (force-lod                int8                                :offset-assert  61)
+   (cur-lod                  int8                                :offset-assert  62)
+   (desired-lod              int8                                :offset-assert  63)
+   (ripple                   ripple-control                      :offset-assert  64)
+   (longest-edge             float                               :offset-assert  68)
+   (longest-edge?            uint32                              :offset         68)
+   (light-index              uint8                               :offset-assert  72)
+   (dummy                    uint8                     2         :offset-assert  73)
+   (death-draw-overlap       uint8                               :offset-assert  75)
+   (death-timer              uint8                               :offset-assert  76)
+   (death-timer-org          uint8                               :offset-assert  77)
+   (death-vertex-skip        uint16                              :offset-assert  78)
+   (death-effect             uint32                              :offset-assert  80)
+   (sink-group               dma-foreground-sink-group           :offset-assert  84)
+   (process                  process                             :offset-assert  88)
+   (shadow                   shadow-geo                          :offset-assert  92)
+   (shadow-ctrl              shadow-control                      :offset-assert  96)
+   (origin                   vector                    :inline   :offset-assert 112)
+   (bounds                   vector                    :inline   :offset-assert 128)
+   (radius                   float                               :offset        140)
+   (color-mult               rgbaf                     :inline   :offset-assert 144)
+   (color-emissive           rgbaf                     :inline   :offset-assert 160)
+   (secondary-interp         float                               :offset-assert 176)
+   (current-secondary-interp float                               :offset-assert 180)
+   (shadow-mask              uint8                               :offset-assert 184)
+   (level-index              uint8                               :offset-assert 185)
+   (origin-joint-index       uint8                               :offset-assert 186)
+   (shadow-joint-index       uint8                               :offset-assert 187)
    )
   :method-count-assert 12
   :size-assert         #xbc
diff --git a/test/decompiler/reference/engine/data/res-h_REF.gc b/test/decompiler/reference/engine/data/res-h_REF.gc
index 6c0169dad0..91f14911e7 100644
--- a/test/decompiler/reference/engine/data/res-h_REF.gc
+++ b/test/decompiler/reference/engine/data/res-h_REF.gc
@@ -17,30 +17,30 @@
 
 ;; definition of type res-lump
 (deftype res-lump (basic)
-  ((length           int32              :offset-assert 4)
-   (allocated-length int32              :offset-assert 8)
-   (data-base        pointer            :offset-assert 12)
-   (data-top         pointer            :offset-assert 16)
-   (data-size        int32              :offset-assert 20)
-   (extra            basic              :offset-assert 24)
-   (tag              (pointer res-tag)  :offset-assert 28)
+  ((length           int32              :offset-assert   4)
+   (allocated-length int32              :offset-assert   8)
+   (data-base        pointer            :offset-assert  12)
+   (data-top         pointer            :offset-assert  16)
+   (data-size        int32              :offset-assert  20)
+   (extra            basic              :offset-assert  24)
+   (tag              (pointer res-tag)  :offset-assert  28)
    )
   :method-count-assert 22
   :size-assert         #x20
   :flag-assert         #x1600000020
   (:methods
     (new (symbol type int int) _type_ 0)
-    (get-property-data (_type_ symbol symbol float pointer (pointer res-tag) pointer) pointer 9)
-    (get-property-struct (_type_ symbol symbol float structure (pointer res-tag) pointer) structure 10)
-    (get-property-value (_type_ symbol symbol float uint128 (pointer res-tag) pointer) uint128 11)
-    (get-property-value-float (_type_ symbol symbol float float (pointer res-tag) pointer) float 12)
+    (get-property-data (_type_ symbol symbol float pointer (pointer res-tag) pointer) pointer :no-virtual 9)
+    (get-property-struct (_type_ symbol symbol float structure (pointer res-tag) pointer) structure :no-virtual 10)
+    (get-property-value (_type_ symbol symbol float uint128 (pointer res-tag) pointer) uint128 :no-virtual 11)
+    (get-property-value-float (_type_ symbol symbol float float (pointer res-tag) pointer) float :no-virtual 12)
     (get-tag-index-data (_type_ int) pointer 13)
     (get-tag-data (_type_ res-tag) pointer 14)
     (dummy-15 (_type_ res-tag) res-tag 15)
     (sort! (_type_) _type_ 16)
     (dummy-17 (_type_ res-tag pointer) res-lump 17)
     (dummy-18 (_type_ res-tag res-tag) res-lump 18)
-    (lookup-tag-idx (_type_ symbol symbol float) res-tag-pair 19)
+    (lookup-tag-idx (_type_ symbol symbol float) res-tag-pair :no-virtual 19)
     (make-property-data (_type_ float res-tag-pair pointer) pointer 20)
     (get-curve-data! (_type_ curve symbol symbol float) symbol 21)
     )
diff --git a/test/decompiler/reference/engine/debug/assert-h_REF.gc b/test/decompiler/reference/engine/debug/assert-h_REF.gc
index 5afc72f1ca..f42d1ede77 100644
--- a/test/decompiler/reference/engine/debug/assert-h_REF.gc
+++ b/test/decompiler/reference/engine/debug/assert-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type __assert-info-private-struct
 (deftype __assert-info-private-struct (structure)
-  ((filename   string  :offset-assert 0)
-   (line-num   uint16  :offset-assert 4)
-   (column-num uint16  :offset-assert 6)
+  ((filename   string  :offset-assert   0)
+   (line-num   uint16  :offset-assert   4)
+   (column-num uint16  :offset-assert   6)
    )
   :method-count-assert 11
   :size-assert         #x8
@@ -64,7 +64,3 @@
 ;; failed to figure out what this is:
 (let ((v0-4 0))
   )
-
-
-
-
diff --git a/test/decompiler/reference/engine/debug/debug-h_REF.gc b/test/decompiler/reference/engine/debug/debug-h_REF.gc
index e7abdec501..76fff43780 100644
--- a/test/decompiler/reference/engine/debug/debug-h_REF.gc
+++ b/test/decompiler/reference/engine/debug/debug-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type pos-history
 (deftype pos-history (structure)
-  ((points     (inline-array vector)  :offset-assert 0)
-   (num-points int32                  :offset-assert 4)
-   (h-first    int32                  :offset-assert 8)
-   (h-last     int32                  :offset-assert 12)
+  ((points     (inline-array vector)  :offset-assert   0)
+   (num-points int32                  :offset-assert   4)
+   (h-first    int32                  :offset-assert   8)
+   (h-last     int32                  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -25,10 +25,10 @@
 
 ;; definition of type debug-vertex
 (deftype debug-vertex (structure)
-  ((trans  vector4w :inline :offset-assert 0)
-   (normal vector3h :inline :offset-assert 16)
-   (st     vector2h :inline :offset-assert 22)
-   (color  uint32           :offset-assert 28)
+  ((trans  vector4w :inline :offset-assert   0)
+   (normal vector3h :inline :offset-assert  16)
+   (st     vector2h :inline :offset-assert  22)
+   (color  uint32           :offset-assert  28)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -47,9 +47,9 @@
 
 ;; definition of type debug-vertex-stats
 (deftype debug-vertex-stats (basic)
-  ((length    int32                    :offset-assert 4)
-   (pos-count int32                    :offset-assert 8)
-   (vertex    debug-vertex 600 :inline :offset-assert 16)
+  ((length    int32                    :offset-assert   4)
+   (pos-count int32                    :offset-assert   8)
+   (vertex    debug-vertex 600 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x4b10
diff --git a/test/decompiler/reference/engine/debug/debug-sphere_REF.gc b/test/decompiler/reference/engine/debug/debug-sphere_REF.gc
index 362727dc8d..8e0b909590 100644
--- a/test/decompiler/reference/engine/debug/debug-sphere_REF.gc
+++ b/test/decompiler/reference/engine/debug/debug-sphere_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type debug-sphere-table
 (deftype debug-sphere-table (basic)
-  ((point vector 300 :inline :offset-assert 16)
+  ((point vector 300 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x12d0
diff --git a/test/decompiler/reference/engine/debug/memory-usage-h_REF.gc b/test/decompiler/reference/engine/debug/memory-usage-h_REF.gc
index 3206ad3e2f..5f4f4b6cc9 100644
--- a/test/decompiler/reference/engine/debug/memory-usage-h_REF.gc
+++ b/test/decompiler/reference/engine/debug/memory-usage-h_REF.gc
@@ -5,10 +5,10 @@
 (when *debug-segment*
 ;; definition of type memory-usage-info
 (deftype memory-usage-info (structure)
-  ((name  string  :offset-assert 0)
-   (count int32   :offset-assert 4)
-   (used  int32   :offset-assert 8)
-   (total int32   :offset-assert 12)
+  ((name  string  :offset-assert   0)
+   (count int32   :offset-assert   4)
+   (used  int32   :offset-assert   8)
+   (total int32   :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -27,9 +27,9 @@
 
 ;; definition of type memory-usage-block
 (deftype memory-usage-block (basic)
-  ((work-bsp basic                         :offset-assert 4)
-   (length   int32                         :offset-assert 8)
-   (data     memory-usage-info 109 :inline :offset-assert 16)
+  ((work-bsp basic                         :offset-assert   4)
+   (length   int32                         :offset-assert   8)
+   (data     memory-usage-info 109 :inline :offset-assert  16)
    )
   :method-count-assert 12
   :size-assert         #x6e0
diff --git a/test/decompiler/reference/engine/debug/stats-h_REF.gc b/test/decompiler/reference/engine/debug/stats-h_REF.gc
index b207fc86a6..b56f97b1ef 100644
--- a/test/decompiler/reference/engine/debug/stats-h_REF.gc
+++ b/test/decompiler/reference/engine/debug/stats-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type tr-stat
 (deftype tr-stat (structure)
-  ((groups    uint16  :offset-assert 0)
-   (fragments uint16  :offset-assert 2)
-   (tris      uint32  :offset-assert 4)
-   (dverts    uint32  :offset-assert 8)
-   (instances uint16  :offset-assert 12)
-   (pad       uint16  :offset-assert 14)
+  ((groups    uint16  :offset-assert   0)
+   (fragments uint16  :offset-assert   2)
+   (tris      uint32  :offset-assert   4)
+   (dverts    uint32  :offset-assert   8)
+   (instances uint16  :offset-assert  12)
+   (pad       uint16  :offset-assert  14)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -29,8 +29,8 @@
 
 ;; definition of type merc-global-stats
 (deftype merc-global-stats (structure)
-  ((merc      tr-stat :inline :offset-assert 0)
-   (mercneric tr-stat :inline :offset-assert 16)
+  ((merc      tr-stat :inline :offset-assert   0)
+   (mercneric tr-stat :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -47,19 +47,19 @@
 
 ;; definition of type perf-stat
 (deftype perf-stat (structure)
-  ((frame-number   uint32  :offset-assert 0)
-   (count          uint32  :offset-assert 4)
-   (cycles         uint32  :offset-assert 8)
-   (instructions   uint32  :offset-assert 12)
-   (icache         uint32  :offset-assert 16)
-   (dcache         uint32  :offset-assert 20)
-   (select         uint32  :offset-assert 24)
-   (ctrl           uint32  :offset-assert 28)
-   (accum0         uint32  :offset-assert 32)
-   (accum1         uint32  :offset-assert 36)
-   (to-vu0-waits   uint32  :offset-assert 40)
-   (to-spr-waits   uint32  :offset-assert 44)
-   (from-spr-waits uint32  :offset-assert 48)
+  ((frame-number   uint32  :offset-assert   0)
+   (count          uint32  :offset-assert   4)
+   (cycles         uint32  :offset-assert   8)
+   (instructions   uint32  :offset-assert  12)
+   (icache         uint32  :offset-assert  16)
+   (dcache         uint32  :offset-assert  20)
+   (select         uint32  :offset-assert  24)
+   (ctrl           uint32  :offset-assert  28)
+   (accum0         uint32  :offset-assert  32)
+   (accum1         uint32  :offset-assert  36)
+   (to-vu0-waits   uint32  :offset-assert  40)
+   (to-spr-waits   uint32  :offset-assert  44)
+   (from-spr-waits uint32  :offset-assert  48)
    )
   :method-count-assert 14
   :size-assert         #x34
diff --git a/test/decompiler/reference/engine/dma/dma-buffer_REF.gc b/test/decompiler/reference/engine/dma/dma-buffer_REF.gc
index e5e42cc045..54831ab2fb 100644
--- a/test/decompiler/reference/engine/dma/dma-buffer_REF.gc
+++ b/test/decompiler/reference/engine/dma/dma-buffer_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type dma-packet
 (deftype dma-packet (structure)
-  ((dma  dma-tag             :offset-assert 0)
-   (vif0 vif-tag             :offset-assert 8)
-   (vif1 vif-tag             :offset-assert 12)
-   (quad uint128 :offset   0)
+  ((dma  dma-tag  :offset-assert   0)
+   (vif0 vif-tag  :offset-assert   8)
+   (vif1 vif-tag  :offset-assert  12)
+   (quad uint128  :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -46,9 +46,9 @@
 
 ;; definition of type dma-gif-packet
 (deftype dma-gif-packet (structure)
-  ((dma-vif dma-packet :inline       :offset-assert 0)
-   (gif     uint64     2             :offset-assert 16)
-   (quad    uint128    2 :offset   0)
+  ((dma-vif dma-packet :inline :offset-assert   0)
+   (gif     uint64     2       :offset-assert  16)
+   (quad    uint128    2       :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -66,11 +66,11 @@
 
 ;; definition of type dma-buffer
 (deftype dma-buffer (basic)
-  ((allocated-length int32                        :offset-assert 4)
-   (base             pointer                      :offset-assert 8)
-   (end              pointer                      :offset-assert 12)
-   (data             uint64  1                    :offset-assert 16)
-   (data-buffer      uint8   :dynamic :offset  16)
+  ((allocated-length int32            :offset-assert   4)
+   (base             pointer          :offset-assert   8)
+   (end              pointer          :offset-assert  12)
+   (data             uint64  1        :offset-assert  16)
+   (data-buffer      uint8   :dynamic :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x18
diff --git a/test/decompiler/reference/engine/dma/dma-disasm_REF.gc b/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
index 068bd258da..034e8e3adc 100644
--- a/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
+++ b/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
@@ -5,12 +5,12 @@
 (when *debug-segment*
 ;; definition of type vif-disasm-element
 (deftype vif-disasm-element (structure)
-  ((mask    uint32      :offset-assert 0)
-   (tag     vif-cmd-32  :offset-assert 4)
-   (val     uint32      :offset-assert 8)
-   (print   uint32      :offset-assert 12)
-   (string1 string      :offset-assert 16)
-   (string2 string      :offset-assert 20)
+  ((mask    uint32      :offset-assert   0)
+   (tag     vif-cmd-32  :offset-assert   4)
+   (val     uint32      :offset-assert   8)
+   (print   uint32      :offset-assert  12)
+   (string1 string      :offset-assert  16)
+   (string2 string      :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x18
diff --git a/test/decompiler/reference/engine/dma/dma-h_REF.gc b/test/decompiler/reference/engine/dma/dma-h_REF.gc
index 8eb50c1477..5274501eb9 100644
--- a/test/decompiler/reference/engine/dma/dma-h_REF.gc
+++ b/test/decompiler/reference/engine/dma/dma-h_REF.gc
@@ -31,9 +31,9 @@
 
 ;; definition of type dma-bank
 (deftype dma-bank (structure)
-  ((chcr dma-chcr :offset   0)
-   (madr uint32   :offset  16)
-   (qwc  uint32   :offset  32)
+  ((chcr dma-chcr  :offset   0)
+   (madr uint32    :offset  16)
+   (qwc  uint32    :offset  32)
    )
   :method-count-assert 9
   :size-assert         #x24
@@ -51,7 +51,7 @@
 
 ;; definition of type dma-bank-source
 (deftype dma-bank-source (dma-bank)
-  ((tadr uint32 :offset  48)
+  ((tadr uint32  :offset  48)
    )
   :method-count-assert 9
   :size-assert         #x34
@@ -70,8 +70,8 @@
 
 ;; definition of type dma-bank-vif
 (deftype dma-bank-vif (dma-bank-source)
-  ((as0 uint32 :offset  64)
-   (as1 uint32 :offset  80)
+  ((as0 uint32  :offset  64)
+   (as1 uint32  :offset  80)
    )
   :method-count-assert 9
   :size-assert         #x54
@@ -92,7 +92,7 @@
 
 ;; definition of type dma-bank-spr
 (deftype dma-bank-spr (dma-bank-source)
-  ((sadr uint32 :offset 128)
+  ((sadr uint32  :offset 128)
    )
   :method-count-assert 9
   :size-assert         #x84
@@ -145,15 +145,15 @@
 
 ;; definition of type dma-bank-control
 (deftype dma-bank-control (structure)
-  ((ctrl    dma-ctrl :offset   0)
-   (stat    uint32   :offset  16)
-   (pcr     uint32   :offset  32)
-   (sqwc    dma-sqwc :offset  48)
-   (rbsr    uint32   :offset  64)
-   (rbor    uint32   :offset  80)
-   (stadr   uint32   :offset  96)
-   (enabler uint32   :offset 5408)
-   (enablew uint32   :offset 5520)
+  ((ctrl    dma-ctrl  :offset   0)
+   (stat    uint32    :offset  16)
+   (pcr     uint32    :offset  32)
+   (sqwc    dma-sqwc  :offset  48)
+   (rbsr    uint32    :offset  64)
+   (rbor    uint32    :offset  80)
+   (stadr   uint32    :offset  96)
+   (enabler uint32    :offset 5408)
+   (enablew uint32    :offset 5520)
    )
   :method-count-assert 9
   :size-assert         #x1594
@@ -177,10 +177,10 @@
 
 ;; definition of type vu-code-block
 (deftype vu-code-block (basic)
-  ((name         basic   :offset-assert 4)
-   (code         uint32  :offset-assert 8)
-   (size         int32   :offset-assert 12)
-   (dest-address uint32  :offset-assert 16)
+  ((name         basic   :offset-assert   4)
+   (code         uint32  :offset-assert   8)
+   (size         int32   :offset-assert  12)
+   (dest-address uint32  :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -233,10 +233,10 @@
 
 ;; definition of type dma-bucket
 (deftype dma-bucket (structure)
-  ((tag   dma-tag                       :offset-assert 0)
-   (last  (pointer dma-tag)             :offset-assert 8)
-   (dummy uint32                        :offset-assert 12)
-   (next  uint32            :offset   4)
+  ((tag   dma-tag            :offset-assert   0)
+   (last  (pointer dma-tag)  :offset-assert   8)
+   (dummy uint32             :offset-assert  12)
+   (next  uint32             :offset          4)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -333,8 +333,3 @@
 
 ;; definition for function dma-count-until-done
 ;; ERROR: function was not converted to expressions. Cannot decompile.
-
-
-
-
-
diff --git a/test/decompiler/reference/engine/draw/draw-node-h_REF.gc b/test/decompiler/reference/engine/draw/draw-node-h_REF.gc
index b8b1836a28..af1328fbd9 100644
--- a/test/decompiler/reference/engine/draw/draw-node-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/draw-node-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type draw-node
 (deftype draw-node (drawable)
-  ((child-count uint8  :offset   6)
-   (flags       uint8  :offset   7)
-   (child       uint32 :offset   8)
-   (distance    float  :offset  12)
+  ((child-count uint8   :offset   6)
+   (flags       uint8   :offset   7)
+   (child       uint32  :offset   8)
+   (distance    float   :offset  12)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -29,7 +29,7 @@
 
 ;; definition of type draw-node-dma
 (deftype draw-node-dma (structure)
-  ((banka draw-node 32 :inline :offset-assert 0)
+  ((banka draw-node 32 :inline :offset-assert   0)
    (bankb draw-node 32 :inline :offset-assert 1024)
    )
   :method-count-assert 9
diff --git a/test/decompiler/reference/engine/draw/drawable-actor-h_REF.gc b/test/decompiler/reference/engine/draw/drawable-actor-h_REF.gc
index f8c09c4ef2..c497df66e8 100644
--- a/test/decompiler/reference/engine/draw/drawable-actor-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/drawable-actor-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type drawable-actor
 (deftype drawable-actor (drawable)
-  ((actor basic :offset   8)
+  ((actor basic  :offset   8)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -29,8 +29,8 @@
 
 ;; definition of type drawable-inline-array-actor
 (deftype drawable-inline-array-actor (drawable-inline-array)
-  ((data drawable-actor 1 :inline :offset-assert 32)
-   (pad  uint8          4         :offset-assert 64)
+  ((data drawable-actor 1 :inline :offset-assert  32)
+   (pad  uint8          4         :offset-assert  64)
    )
   :method-count-assert 18
   :size-assert         #x44
diff --git a/test/decompiler/reference/engine/draw/drawable-ambient-h_REF.gc b/test/decompiler/reference/engine/draw/drawable-ambient-h_REF.gc
index 8fa3e9b2a5..633095ee99 100644
--- a/test/decompiler/reference/engine/draw/drawable-ambient-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/drawable-ambient-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type drawable-ambient
 (deftype drawable-ambient (drawable)
-  ((ambient basic :offset   8)
+  ((ambient basic  :offset   8)
    )
   :method-count-assert 19
   :size-assert         #x20
@@ -32,8 +32,8 @@
 
 ;; definition of type drawable-inline-array-ambient
 (deftype drawable-inline-array-ambient (drawable-inline-array)
-  ((data drawable-ambient 1 :inline :offset-assert 32)
-   (pad  uint8            4         :offset-assert 64)
+  ((data drawable-ambient 1 :inline :offset-assert  32)
+   (pad  uint8            4         :offset-assert  64)
    )
   :method-count-assert 18
   :size-assert         #x44
@@ -94,8 +94,8 @@
 
 ;; definition of type ambient-list
 (deftype ambient-list (structure)
-  ((num-items int32       :offset-assert 0)
-   (items     uint32 2048 :offset-assert 4)
+  ((num-items int32       :offset-assert   0)
+   (items     uint32 2048 :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x2004
@@ -113,7 +113,3 @@
 ;; failed to figure out what this is:
 (let ((v0-10 0))
   )
-
-
-
-
diff --git a/test/decompiler/reference/engine/draw/drawable-group-h_REF.gc b/test/decompiler/reference/engine/draw/drawable-group-h_REF.gc
index fd78a17332..d2925e2b72 100644
--- a/test/decompiler/reference/engine/draw/drawable-group-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/drawable-group-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type drawable-group
 (deftype drawable-group (drawable)
-  ((length int16    :offset   6)
-   (data   drawable 1           :offset-assert 32)
+  ((length int16      :offset          6)
+   (data   drawable 1 :offset-assert  32)
    )
   :method-count-assert 18
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/draw/drawable-h_REF.gc b/test/decompiler/reference/engine/draw/drawable-h_REF.gc
index f775ba02d2..25c8dd1537 100644
--- a/test/decompiler/reference/engine/draw/drawable-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/drawable-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type drawable
 (deftype drawable (basic)
-  ((id      int16          :offset-assert 4)
-   (bsphere vector :inline :offset-assert 16)
+  ((id      int16          :offset-assert   4)
+   (bsphere vector :inline :offset-assert  16)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -32,7 +32,7 @@
 
 ;; definition of type drawable-error
 (deftype drawable-error (drawable)
-  ((name basic  :offset-assert 32)
+  ((name basic  :offset-assert  32)
    )
   :method-count-assert 18
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/draw/drawable-inline-array-h_REF.gc b/test/decompiler/reference/engine/draw/drawable-inline-array-h_REF.gc
index d2dc81ed91..f1f80cba66 100644
--- a/test/decompiler/reference/engine/draw/drawable-inline-array-h_REF.gc
+++ b/test/decompiler/reference/engine/draw/drawable-inline-array-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type drawable-inline-array
 (deftype drawable-inline-array (drawable)
-  ((length int16 :offset   6)
+  ((length int16  :offset   6)
    )
   :method-count-assert 18
   :size-assert         #x20
diff --git a/test/decompiler/reference/engine/engine/connect_REF.gc b/test/decompiler/reference/engine/engine/connect_REF.gc
index 7b3b032ddd..fdb021f4ba 100644
--- a/test/decompiler/reference/engine/engine/connect_REF.gc
+++ b/test/decompiler/reference/engine/engine/connect_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type connectable
 (deftype connectable (structure)
-  ((next0 connectable  :offset-assert 0)
-   (prev0 connectable  :offset-assert 4)
-   (next1 connectable  :offset-assert 8)
-   (prev1 connectable  :offset-assert 12)
+  ((next0 connectable  :offset-assert   0)
+   (prev0 connectable  :offset-assert   4)
+   (next1 connectable  :offset-assert   8)
+   (prev1 connectable  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -25,11 +25,11 @@
 
 ;; definition of type connection
 (deftype connection (connectable)
-  ((param0 (function object object object object object)               :offset-assert 16)
-   (param1 basic                                                       :offset-assert 20)
-   (param2 basic                                                       :offset-assert 24)
-   (param3 basic                                                       :offset-assert 28)
-   (quad   uint128                                       2 :offset   0)
+  ((param0 (function object object object object object)   :offset-assert  16)
+   (param1 basic                                           :offset-assert  20)
+   (param2 basic                                           :offset-assert  24)
+   (param3 basic                                           :offset-assert  28)
+   (quad   uint128                                       2 :offset          0)
    )
   :method-count-assert 14
   :size-assert         #x20
@@ -60,15 +60,15 @@
 
 ;; definition of type engine
 (deftype engine (basic)
-  ((name             basic                 :offset-assert 4)
-   (length           int16                 :offset-assert 8)
-   (allocated-length int16                 :offset-assert 10)
-   (engine-time      uint64                :offset-assert 16)
-   (alive-list       connectable :inline   :offset-assert 32)
-   (alive-list-end   connectable :inline   :offset-assert 48)
-   (dead-list        connectable :inline   :offset-assert 64)
-   (dead-list-end    connectable :inline   :offset-assert 80)
-   (data             connection  1 :inline :offset-assert 96)
+  ((name             basic                 :offset-assert   4)
+   (length           int16                 :offset-assert   8)
+   (allocated-length int16                 :offset-assert  10)
+   (engine-time      uint64                :offset-assert  16)
+   (alive-list       connectable :inline   :offset-assert  32)
+   (alive-list-end   connectable :inline   :offset-assert  48)
+   (dead-list        connectable :inline   :offset-assert  64)
+   (dead-list-end    connectable :inline   :offset-assert  80)
+   (data             connection  1 :inline :offset-assert  96)
    )
   :method-count-assert 24
   :size-assert         #x80
diff --git a/test/decompiler/reference/engine/entity/actor-link-h_REF.gc b/test/decompiler/reference/engine/entity/actor-link-h_REF.gc
index 48b2560515..7478df1088 100644
--- a/test/decompiler/reference/engine/entity/actor-link-h_REF.gc
+++ b/test/decompiler/reference/engine/entity/actor-link-h_REF.gc
@@ -60,9 +60,9 @@
 
 ;; definition of type actor-link-info
 (deftype actor-link-info (basic)
-  ((process process       :offset-assert 4)
-   (next    entity-actor  :offset-assert 8)
-   (prev    entity-actor  :offset-assert 12)
+  ((process process       :offset-assert   4)
+   (next    entity-actor  :offset-assert   8)
+   (prev    entity-actor  :offset-assert  12)
    )
   :method-count-assert 26
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/entity/entity-h_REF.gc b/test/decompiler/reference/engine/entity/entity-h_REF.gc
index e1c926f730..25ca0c6094 100644
--- a/test/decompiler/reference/engine/entity/entity-h_REF.gc
+++ b/test/decompiler/reference/engine/entity/entity-h_REF.gc
@@ -12,20 +12,20 @@
 
 ;; definition of type entity-perm
 (deftype entity-perm (structure)
-  ((user-object object             2             :offset-assert 0)
-   (user-uint64 uint64             :offset   0)
-   (user-float  float              2 :offset   0)
-   (user-int32  int32              2 :offset   0)
-   (user-uint32 uint32             2 :offset   0)
-   (user-int16  int16              4 :offset   0)
-   (user-uint16 uint16             4 :offset   0)
-   (user-int8   int8               8 :offset   0)
-   (user-uint8  uint8              8 :offset   0)
-   (status      entity-perm-status               :offset-assert 8)
-   (dummy       uint8              1             :offset-assert 10)
-   (task        uint8                            :offset-assert 11)
-   (aid         uint32                           :offset-assert 12)
-   (quad        uint128            :offset   0)
+  ((user-object object             2 :offset-assert   0)
+   (user-uint64 uint64               :offset          0)
+   (user-float  float              2 :offset          0)
+   (user-int32  int32              2 :offset          0)
+   (user-uint32 uint32             2 :offset          0)
+   (user-int16  int16              4 :offset          0)
+   (user-uint16 uint16             4 :offset          0)
+   (user-int8   int8               8 :offset          0)
+   (user-uint8  uint8              8 :offset          0)
+   (status      entity-perm-status   :offset-assert   8)
+   (dummy       uint8              1 :offset-assert  10)
+   (task        uint8                :offset-assert  11)
+   (aid         uint32               :offset-assert  12)
+   (quad        uint128              :offset          0)
    )
   :pack-me
   :method-count-assert 10
@@ -59,17 +59,17 @@
 
 ;; definition of type entity-links
 (deftype entity-links (structure)
-  ((prev-link entity-links             :offset-assert 0)
-   (next-link entity-links             :offset-assert 4)
-   (entity    basic                    :offset-assert 8)
-   (process   process                  :offset-assert 12)
-   (level     level                    :offset-assert 16)
-   (vis-id    int32                    :offset-assert 20)
-   (trans     vector       :inline     :offset-assert 32)
-   (perm      entity-perm  :inline     :offset-assert 48)
-   (status    uint16       :offset  56)
-   (aid       uint32       :offset  60)
-   (task      uint8        :offset  59)
+  ((prev-link entity-links         :offset-assert   0)
+   (next-link entity-links         :offset-assert   4)
+   (entity    basic                :offset-assert   8)
+   (process   process              :offset-assert  12)
+   (level     level                :offset-assert  16)
+   (vis-id    int32                :offset-assert  20)
+   (trans     vector       :inline :offset-assert  32)
+   (perm      entity-perm  :inline :offset-assert  48)
+   (status    uint16               :offset         56)
+   (aid       uint32               :offset         60)
+   (task      uint8                :offset         59)
    )
   :method-count-assert 10
   :size-assert         #x40
@@ -138,8 +138,8 @@
 
 ;; definition of type entity
 (deftype entity (res-lump)
-  ((trans vector :inline :offset-assert 32)
-   (aid   uint32         :offset-assert 48)
+  ((trans vector :inline :offset-assert  32)
+   (aid   uint32         :offset-assert  48)
    )
   :method-count-assert 27
   :size-assert         #x34
@@ -155,7 +155,7 @@
 
 ;; definition of type entity-camera
 (deftype entity-camera (entity)
-  ((connect connectable :inline :offset-assert 64)
+  ((connect connectable :inline :offset-assert  64)
    )
   :method-count-assert 27
   :size-assert         #x50
@@ -164,17 +164,17 @@
 
 ;; definition of type entity-ambient-data
 (deftype entity-ambient-data (structure)
-  ((user-object object  3              :offset-assert 0)
-   (function    basic                  :offset-assert 12)
-   (quad        uint128 :offset   0)
-   (user-uint64 uint64  1 :offset   0)
-   (user-float  float   3 :offset   0)
-   (user-int32  int32   3 :offset   0)
-   (user-uint32 uint32  3 :offset   0)
-   (user-int16  int16   6 :offset   0)
-   (user-uint16 uint16  6 :offset   0)
-   (user-int8   int8    12 :offset   0)
-   (user-uint8  uint8   12 :offset   0)
+  ((user-object object  3  :offset-assert   0)
+   (function    basic      :offset-assert  12)
+   (quad        uint128    :offset          0)
+   (user-uint64 uint64  1  :offset          0)
+   (user-float  float   3  :offset          0)
+   (user-int32  int32   3  :offset          0)
+   (user-uint32 uint32  3  :offset          0)
+   (user-int16  int16   6  :offset          0)
+   (user-uint16 uint16  6  :offset          0)
+   (user-int8   int8    12 :offset          0)
+   (user-uint8  uint8   12 :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -233,11 +233,11 @@
 
 ;; definition of type entity-actor
 (deftype entity-actor (entity)
-  ((nav-mesh nav-mesh           :offset-assert 52)
-   (etype    basic              :offset-assert 56)
-   (task     uint8              :offset-assert 60)
-   (vis-id   uint16             :offset-assert 62)
-   (quat     quaternion :inline :offset-assert 64)
+  ((nav-mesh nav-mesh           :offset-assert  52)
+   (etype    basic              :offset-assert  56)
+   (task     uint8              :offset-assert  60)
+   (vis-id   uint16             :offset-assert  62)
+   (quat     quaternion :inline :offset-assert  64)
    )
   :method-count-assert 31
   :size-assert         #x50
@@ -252,11 +252,11 @@
 
 ;; definition of type entity-info
 (deftype entity-info (basic)
-  ((ptype     basic  :offset-assert 4)
-   (package   basic  :offset-assert 8)
-   (art-group basic  :offset-assert 12)
-   (pool      basic  :offset-assert 16)
-   (heap-size int32  :offset-assert 20)
+  ((ptype     basic  :offset-assert   4)
+   (package   basic  :offset-assert   8)
+   (art-group basic  :offset-assert  12)
+   (pool      basic  :offset-assert  16)
+   (heap-size int32  :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x18
@@ -281,9 +281,9 @@
 
 ;; definition of type actor-bank
 (deftype actor-bank (basic)
-  ((pause-dist float  :offset-assert 4)
-   (birth-dist float  :offset-assert 8)
-   (birth-max  int32  :offset-assert 12)
+  ((pause-dist float  :offset-assert   4)
+   (birth-dist float  :offset-assert   8)
+   (birth-max  int32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/game/effect-control-h_REF.gc b/test/decompiler/reference/engine/game/effect-control-h_REF.gc
index a76028077e..024d4a4015 100644
--- a/test/decompiler/reference/engine/game/effect-control-h_REF.gc
+++ b/test/decompiler/reference/engine/game/effect-control-h_REF.gc
@@ -3,14 +3,14 @@
 
 ;; definition of type effect-control
 (deftype effect-control (basic)
-  ((process          process-drawable  :offset-assert 4)
-   (flags            uint32            :offset-assert 8)
-   (last-frame-group art-joint-anim    :offset-assert 12)
-   (last-frame-num   float             :offset-assert 16)
-   (channel-offset   int32             :offset-assert 20)
-   (res              res-lump          :offset-assert 24)
-   (name             uint32            :offset-assert 28)
-   (param            uint32            :offset-assert 32)
+  ((process          process-drawable  :offset-assert   4)
+   (flags            uint32            :offset-assert   8)
+   (last-frame-group art-joint-anim    :offset-assert  12)
+   (last-frame-num   float             :offset-assert  16)
+   (channel-offset   int32             :offset-assert  20)
+   (res              res-lump          :offset-assert  24)
+   (name             uint32            :offset-assert  28)
+   (param            uint32            :offset-assert  32)
    )
   :method-count-assert 15
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/game/fact-h_REF.gc b/test/decompiler/reference/engine/game/fact-h_REF.gc
index ef98967f61..630f6225fa 100644
--- a/test/decompiler/reference/engine/game/fact-h_REF.gc
+++ b/test/decompiler/reference/engine/game/fact-h_REF.gc
@@ -3,21 +3,21 @@
 
 ;; definition of type fact-bank
 (deftype fact-bank (basic)
-  ((eco-level-max        float   :offset-assert 4)
-   (eco-single-inc       float   :offset-assert 8)
-   (eco-full-inc         float   :offset-assert 12)
-   (eco-single-timeout   uint64  :offset-assert 16)
-   (eco-full-timeout     uint64  :offset-assert 24)
-   (dummy                uint64  :offset-assert 32)
-   (health-max-default   float   :offset-assert 40)
-   (health-single-inc    float   :offset-assert 44)
-   (eco-pill-max-default float   :offset-assert 48)
-   (health-small-inc     float   :offset-assert 52)
-   (buzzer-max-default   float   :offset-assert 56)
-   (buzzer-single-inc    float   :offset-assert 60)
-   (suck-bounce-dist     float   :offset-assert 64)
-   (suck-suck-dist       float   :offset-assert 68)
-   (default-pill-inc     float   :offset-assert 72)
+  ((eco-level-max        float   :offset-assert   4)
+   (eco-single-inc       float   :offset-assert   8)
+   (eco-full-inc         float   :offset-assert  12)
+   (eco-single-timeout   uint64  :offset-assert  16)
+   (eco-full-timeout     uint64  :offset-assert  24)
+   (dummy                uint64  :offset-assert  32)
+   (health-max-default   float   :offset-assert  40)
+   (health-single-inc    float   :offset-assert  44)
+   (eco-pill-max-default float   :offset-assert  48)
+   (health-small-inc     float   :offset-assert  52)
+   (buzzer-max-default   float   :offset-assert  56)
+   (buzzer-single-inc    float   :offset-assert  60)
+   (suck-bounce-dist     float   :offset-assert  64)
+   (suck-suck-dist       float   :offset-assert  68)
+   (default-pill-inc     float   :offset-assert  72)
    )
   :method-count-assert 9
   :size-assert         #x4c
@@ -109,12 +109,12 @@
 
 ;; definition of type fact-info
 (deftype fact-info (basic)
-  ((process             process      :offset-assert 4)
-   (pickup-type         pickup-type  :offset-assert 8)
-   (pickup-amount       float        :offset-assert 12)
-   (pickup-spawn-amount float        :offset-assert 16)
-   (options             uint64       :offset-assert 24)
-   (fade-time           uint64       :offset-assert 32)
+  ((process             process      :offset-assert   4)
+   (pickup-type         pickup-type  :offset-assert   8)
+   (pickup-amount       float        :offset-assert  12)
+   (pickup-spawn-amount float        :offset-assert  16)
+   (options             uint64       :offset-assert  24)
+   (fade-time           uint64       :offset-assert  32)
    )
   :method-count-assert 12
   :size-assert         #x28
@@ -141,18 +141,18 @@
 
 ;; definition of type fact-info-target
 (deftype fact-info-target (fact-info)
-  ((eco-type              int32   :offset-assert 40)
-   (eco-level             float   :offset-assert 44)
-   (eco-pickup-time       uint64  :offset-assert 48)
-   (eco-timeout           uint64  :offset-assert 56)
-   (health                float   :offset-assert 64)
-   (health-max            float   :offset-assert 68)
-   (buzzer                float   :offset-assert 72)
-   (buzzer-max            float   :offset-assert 76)
-   (eco-pill              float   :offset-assert 80)
-   (eco-pill-max          float   :offset-assert 84)
-   (health-pickup-time    uint64  :offset-assert 88)
-   (eco-source            uint64  :offset-assert 96)
+  ((eco-type              int32   :offset-assert  40)
+   (eco-level             float   :offset-assert  44)
+   (eco-pickup-time       uint64  :offset-assert  48)
+   (eco-timeout           uint64  :offset-assert  56)
+   (health                float   :offset-assert  64)
+   (health-max            float   :offset-assert  68)
+   (buzzer                float   :offset-assert  72)
+   (buzzer-max            float   :offset-assert  76)
+   (eco-pill              float   :offset-assert  80)
+   (eco-pill-max          float   :offset-assert  84)
+   (health-pickup-time    uint64  :offset-assert  88)
+   (eco-source            uint64  :offset-assert  96)
    (eco-source-time       uint64  :offset-assert 104)
    (money-pickup-time     uint64  :offset-assert 112)
    (buzzer-pickup-time    uint64  :offset-assert 120)
@@ -198,13 +198,13 @@
 
 ;; definition of type fact-info-enemy
 (deftype fact-info-enemy (fact-info)
-  ((speed           float  :offset-assert 40)
-   (idle-distance   float  :offset-assert 44)
-   (notice-top      float  :offset-assert 48)
-   (notice-bottom   float  :offset-assert 52)
-   (cam-horz        float  :offset-assert 56)
-   (cam-vert        float  :offset-assert 60)
-   (cam-notice-dist float  :offset-assert 64)
+  ((speed           float  :offset-assert  40)
+   (idle-distance   float  :offset-assert  44)
+   (notice-top      float  :offset-assert  48)
+   (notice-bottom   float  :offset-assert  52)
+   (cam-horz        float  :offset-assert  56)
+   (cam-vert        float  :offset-assert  60)
+   (cam-notice-dist float  :offset-assert  64)
    )
   :method-count-assert 12
   :size-assert         #x44
diff --git a/test/decompiler/reference/engine/game/game-h_REF.gc b/test/decompiler/reference/engine/game/game-h_REF.gc
index f75ab908a8..98ba31a442 100644
--- a/test/decompiler/reference/engine/game/game-h_REF.gc
+++ b/test/decompiler/reference/engine/game/game-h_REF.gc
@@ -120,20 +120,20 @@
 
 ;; definition of type attack-info
 (deftype attack-info (structure)
-  ((trans        vector :inline :offset-assert 0)
-   (vector       vector :inline :offset-assert 16)
-   (intersection vector :inline :offset-assert 32)
-   (attacker     uint64         :offset-assert 48)
-   (invinc-time  uint64         :offset-assert 56)
-   (mask         uint32         :offset-assert 64)
-   (mode         basic          :offset-assert 68)
-   (shove-back   float          :offset-assert 72)
-   (shove-up     float          :offset-assert 76)
-   (speed        float          :offset-assert 80)
-   (dist         float          :offset-assert 84)
-   (control      float          :offset-assert 88)
-   (angle        basic          :offset-assert 92)
-   (rotate-to    float          :offset-assert 96)
+  ((trans        vector :inline :offset-assert   0)
+   (vector       vector :inline :offset-assert  16)
+   (intersection vector :inline :offset-assert  32)
+   (attacker     uint64         :offset-assert  48)
+   (invinc-time  uint64         :offset-assert  56)
+   (mask         uint32         :offset-assert  64)
+   (mode         basic          :offset-assert  68)
+   (shove-back   float          :offset-assert  72)
+   (shove-up     float          :offset-assert  76)
+   (speed        float          :offset-assert  80)
+   (dist         float          :offset-assert  84)
+   (control      float          :offset-assert  88)
+   (angle        basic          :offset-assert  92)
+   (rotate-to    float          :offset-assert  96)
    (prev-state   basic          :offset-assert 100)
    )
   :method-count-assert 10
@@ -170,9 +170,9 @@
 
 ;; definition of type ground-tween-info
 (deftype ground-tween-info (structure)
-  ((chan  uint8  3 :offset-assert 0)
-   (blend uint32 3 :offset-assert 4)
-   (group uint32 5 :offset-assert 16)
+  ((chan  uint8  3 :offset-assert   0)
+   (blend uint32 3 :offset-assert   4)
+   (group uint32 5 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/game/game-info-h_REF.gc b/test/decompiler/reference/engine/game/game-info-h_REF.gc
index 590d2e690b..67ce7bd9a1 100644
--- a/test/decompiler/reference/engine/game/game-info-h_REF.gc
+++ b/test/decompiler/reference/engine/game/game-info-h_REF.gc
@@ -5,11 +5,11 @@
 
 ;; definition of type game-bank
 (deftype game-bank (basic)
-  ((life-max-default   float  :offset-assert 4)
-   (life-start-default float  :offset-assert 8)
-   (life-single-inc    float  :offset-assert 12)
-   (money-task-inc     float  :offset-assert 16)
-   (money-oracle-inc   float  :offset-assert 20)
+  ((life-max-default   float  :offset-assert   4)
+   (life-start-default float  :offset-assert   8)
+   (life-single-inc    float  :offset-assert  12)
+   (money-task-inc     float  :offset-assert  16)
+   (money-oracle-inc   float  :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x18
@@ -49,10 +49,10 @@
 
 ;; definition of type level-buffer-state
 (deftype level-buffer-state (structure)
-  ((name          basic  :offset-assert 0)
-   (display?      basic  :offset-assert 4)
-   (force-vis?    basic  :offset-assert 8)
-   (force-inside? basic  :offset-assert 12)
+  ((name          basic  :offset-assert   0)
+   (display?      basic  :offset-assert   4)
+   (force-vis?    basic  :offset-assert   8)
+   (force-inside? basic  :offset-assert  12)
    )
   :pack-me
   :method-count-assert 9
@@ -72,10 +72,10 @@
 
 ;; definition of type load-state
 (deftype load-state (basic)
-  ((want          level-buffer-state 2 :inline :offset-assert 4)
-   (vis-nick      basic                        :offset-assert 36)
-   (command-list  pair                         :offset-assert 40)
-   (object-name   basic              256       :offset-assert 44)
+  ((want          level-buffer-state 2 :inline :offset-assert   4)
+   (vis-nick      basic                        :offset-assert  36)
+   (command-list  pair                         :offset-assert  40)
+   (object-name   basic              256       :offset-assert  44)
    (object-status basic              256       :offset-assert 1068)
    )
   :method-count-assert 21
@@ -118,13 +118,13 @@
 
 ;; definition of type continue-point
 (deftype continue-point (basic)
-  ((name          basic          :offset-assert 4)
-   (level         basic          :offset-assert 8)
-   (flags         uint32         :offset-assert 12)
-   (trans         vector :inline :offset-assert 16)
-   (quat          vector :inline :offset-assert 32)
-   (camera-trans  vector :inline :offset-assert 48)
-   (camera-rot    float  9       :offset-assert 64)
+  ((name          basic          :offset-assert   4)
+   (level         basic          :offset-assert   8)
+   (flags         uint32         :offset-assert  12)
+   (trans         vector :inline :offset-assert  16)
+   (quat          vector :inline :offset-assert  32)
+   (camera-trans  vector :inline :offset-assert  48)
+   (camera-rot    float  9       :offset-assert  64)
    (load-commands pair           :offset-assert 100)
    (vis-nick      basic          :offset-assert 104)
    (lev0          basic          :offset-assert 108)
@@ -161,16 +161,16 @@
 
 ;; definition of type game-info
 (deftype game-info (basic)
-  ((mode                  basic     :offset-assert 4)
-   (save-name             basic     :offset-assert 8)
-   (life                  float     :offset-assert 12)
-   (life-max              float     :offset-assert 16)
-   (money                 float     :offset-assert 20)
-   (money-total           float     :offset-assert 24)
-   (money-per-level       uint8  32 :offset-assert 28)
-   (deaths-per-level      uint8  32 :offset-assert 60)
-   (buzzer-total          float     :offset-assert 92)
-   (fuel                  float     :offset-assert 96)
+  ((mode                  basic     :offset-assert   4)
+   (save-name             basic     :offset-assert   8)
+   (life                  float     :offset-assert  12)
+   (life-max              float     :offset-assert  16)
+   (money                 float     :offset-assert  20)
+   (money-total           float     :offset-assert  24)
+   (money-per-level       uint8  32 :offset-assert  28)
+   (deaths-per-level      uint8  32 :offset-assert  60)
+   (buzzer-total          float     :offset-assert  92)
+   (fuel                  float     :offset-assert  96)
    (perm-list             basic     :offset-assert 100)
    (task-perm-list        basic     :offset-assert 104)
    (current-continue      basic     :offset-assert 108)
@@ -299,7 +299,3 @@
            gp-0
            )
   )
-
-
-
-
diff --git a/test/decompiler/reference/engine/game/generic-obs-h_REF.gc b/test/decompiler/reference/engine/game/generic-obs-h_REF.gc
index a10ffdd6a3..8637134df8 100644
--- a/test/decompiler/reference/engine/game/generic-obs-h_REF.gc
+++ b/test/decompiler/reference/engine/game/generic-obs-h_REF.gc
@@ -121,25 +121,25 @@
 
 ;; definition of type camera-tracker
 (deftype camera-tracker (process)
-  ((grab-target     uint64 :offset 120)
-   (grab-event      basic              :offset-assert 128)
-   (release-event   basic              :offset-assert 132)
-   (old-global-mask uint32             :offset-assert 136)
-   (old-self-mask   uint32             :offset-assert 140)
-   (old-parent-mask uint32             :offset-assert 144)
-   (look-at-target  uint64             :offset-assert 152)
-   (pov-target      uint64             :offset-assert 160)
-   (work-process    uint64             :offset-assert 168)
-   (anim-process    uint64             :offset-assert 176)
-   (start-time      uint64             :offset-assert 184)
-   (callback        basic              :offset-assert 192)
-   (userdata        basic              :offset-assert 196)
-   (message         basic              :offset-assert 200)
-   (border-value    basic              :offset-assert 204)
-   (mask-to-clear   uint32             :offset-assert 208)
-   (script          basic              :offset-assert 212)
-   (script-line     basic              :offset-assert 216)
-   (script-func     basic              :offset-assert 220)
+  ((grab-target     uint64  :offset        120)
+   (grab-event      basic   :offset-assert 128)
+   (release-event   basic   :offset-assert 132)
+   (old-global-mask uint32  :offset-assert 136)
+   (old-self-mask   uint32  :offset-assert 140)
+   (old-parent-mask uint32  :offset-assert 144)
+   (look-at-target  uint64  :offset-assert 152)
+   (pov-target      uint64  :offset-assert 160)
+   (work-process    uint64  :offset-assert 168)
+   (anim-process    uint64  :offset-assert 176)
+   (start-time      uint64  :offset-assert 184)
+   (callback        basic   :offset-assert 192)
+   (userdata        basic   :offset-assert 196)
+   (message         basic   :offset-assert 200)
+   (border-value    basic   :offset-assert 204)
+   (mask-to-clear   uint32  :offset-assert 208)
+   (script          basic   :offset-assert 212)
+   (script-line     basic   :offset-assert 216)
+   (script-func     basic   :offset-assert 220)
    )
   :heap-base #x70
   :method-count-assert 15
@@ -234,13 +234,13 @@
 
 ;; definition of type gui-query
 (deftype gui-query (structure)
-  ((x-position        int32  :offset-assert 0)
-   (y-position        int32  :offset-assert 4)
-   (message           basic  :offset-assert 8)
-   (decision          basic  :offset-assert 12)
-   (only-allow-cancel basic  :offset-assert 16)
-   (no-msg            basic  :offset-assert 20)
-   (message-space     int32  :offset-assert 24)
+  ((x-position        int32  :offset-assert   0)
+   (y-position        int32  :offset-assert   4)
+   (message           basic  :offset-assert   8)
+   (decision          basic  :offset-assert  12)
+   (only-allow-cancel basic  :offset-assert  16)
+   (no-msg            basic  :offset-assert  20)
+   (message-space     int32  :offset-assert  24)
    )
   :pack-me
   :method-count-assert 11
diff --git a/test/decompiler/reference/engine/game/main-h_REF.gc b/test/decompiler/reference/engine/game/main-h_REF.gc
index 656dae0bd3..3f248801dd 100644
--- a/test/decompiler/reference/engine/game/main-h_REF.gc
+++ b/test/decompiler/reference/engine/game/main-h_REF.gc
@@ -285,8 +285,8 @@
 
 ;; definition of type frame-stats
 (deftype frame-stats (structure)
-  ((field-time uint64 2 :offset-assert 0)
-   (field      int32    :offset-assert 16)
+  ((field-time uint64 2 :offset-assert   0)
+   (field      int32    :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -306,8 +306,8 @@
 
 ;; definition of type screen-filter
 (deftype screen-filter (basic)
-  ((draw? basic  :offset-assert 4)
-   (color rgba   :offset-assert 8)
+  ((draw? basic  :offset-assert   4)
+   (color rgba   :offset-assert   8)
    )
   :method-count-assert 10
   :size-assert         #xc
diff --git a/test/decompiler/reference/engine/game/settings-h_REF.gc b/test/decompiler/reference/engine/game/settings-h_REF.gc
index 6d92edfe09..bb165056b8 100644
--- a/test/decompiler/reference/engine/game/settings-h_REF.gc
+++ b/test/decompiler/reference/engine/game/settings-h_REF.gc
@@ -3,30 +3,30 @@
 
 ;; definition of type setting-data
 (deftype setting-data (structure)
-  ((border-mode          basic                :offset-assert 0)
-   (sfx-volume           float                :offset-assert 4)
-   (music-volume         float                :offset-assert 8)
-   (dialog-volume        float                :offset-assert 12)
-   (process-mask         uint32               :offset-assert 16)
-   (common-page          int32                :offset-assert 20)
-   (language             int64                :offset-assert 24)
-   (screenx              int32                :offset-assert 32)
-   (screeny              int32                :offset-assert 36)
-   (vibration            basic                :offset-assert 40)
-   (play-hints           basic                :offset-assert 44)
-   (movie                (pointer process)    :offset-assert 48)
-   (talking              (pointer process)    :offset-assert 52)
-   (spooling             (pointer process)    :offset-assert 56)
-   (hint                 (pointer process)    :offset-assert 60)
-   (ambient              (pointer process)    :offset-assert 64)
-   (video-mode           symbol               :offset-assert 68)
-   (aspect-ratio         symbol               :offset-assert 72)
-   (sound-flava          uint8                :offset-assert 76)
-   (auto-save            basic                :offset-assert 80)
-   (music-volume-movie   float                :offset-assert 84)
-   (sfx-volume-movie     float                :offset-assert 88)
-   (music                basic                :offset-assert 92)
-   (bg-r                 float                :offset-assert 96)
+  ((border-mode          basic                :offset-assert   0)
+   (sfx-volume           float                :offset-assert   4)
+   (music-volume         float                :offset-assert   8)
+   (dialog-volume        float                :offset-assert  12)
+   (process-mask         uint32               :offset-assert  16)
+   (common-page          int32                :offset-assert  20)
+   (language             int64                :offset-assert  24)
+   (screenx              int32                :offset-assert  32)
+   (screeny              int32                :offset-assert  36)
+   (vibration            basic                :offset-assert  40)
+   (play-hints           basic                :offset-assert  44)
+   (movie                (pointer process)    :offset-assert  48)
+   (talking              (pointer process)    :offset-assert  52)
+   (spooling             (pointer process)    :offset-assert  56)
+   (hint                 (pointer process)    :offset-assert  60)
+   (ambient              (pointer process)    :offset-assert  64)
+   (video-mode           symbol               :offset-assert  68)
+   (aspect-ratio         symbol               :offset-assert  72)
+   (sound-flava          uint8                :offset-assert  76)
+   (auto-save            basic                :offset-assert  80)
+   (music-volume-movie   float                :offset-assert  84)
+   (sfx-volume-movie     float                :offset-assert  88)
+   (music                basic                :offset-assert  92)
+   (bg-r                 float                :offset-assert  96)
    (bg-g                 float                :offset-assert 100)
    (bg-b                 float                :offset-assert 104)
    (bg-a                 float                :offset-assert 108)
@@ -141,7 +141,7 @@
 
 ;; definition of type setting-control
 (deftype setting-control (basic)
-  ((current setting-data :inline :offset-assert 16)
+  ((current setting-data :inline :offset-assert  16)
    (target  setting-data :inline :offset-assert 224)
    (default setting-data :inline :offset-assert 432)
    (engine  engine               :offset-assert 628)
@@ -189,14 +189,14 @@
 
 ;; definition of type scf-time
 (deftype scf-time (structure)
-  ((stat   uint8  :offset-assert 0)
-   (second uint8  :offset-assert 1)
-   (minute uint8  :offset-assert 2)
-   (hour   uint8  :offset-assert 3)
-   (week   uint8  :offset-assert 4)
-   (day    uint8  :offset-assert 5)
-   (month  uint8  :offset-assert 6)
-   (year   uint8  :offset-assert 7)
+  ((stat   uint8  :offset-assert   0)
+   (second uint8  :offset-assert   1)
+   (minute uint8  :offset-assert   2)
+   (hour   uint8  :offset-assert   3)
+   (week   uint8  :offset-assert   4)
+   (day    uint8  :offset-assert   5)
+   (month  uint8  :offset-assert   6)
+   (year   uint8  :offset-assert   7)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -220,7 +220,3 @@
 ;; failed to figure out what this is:
 (let ((v0-7 0))
   )
-
-
-
-
diff --git a/test/decompiler/reference/engine/game/task/hint-control-h_REF.gc b/test/decompiler/reference/engine/game/task/hint-control-h_REF.gc
index f30c98201b..2438678b63 100644
--- a/test/decompiler/reference/engine/game/task/hint-control-h_REF.gc
+++ b/test/decompiler/reference/engine/game/task/hint-control-h_REF.gc
@@ -3,14 +3,14 @@
 
 ;; definition of type level-hint-control
 (deftype level-hint-control (structure)
-  ((delay-before-playing        uint64  :offset-assert 0)
-   (id                          uint32  :offset-assert 8)
-   (num-attempts-before-playing int8    :offset-assert 12)
-   (num-success-before-killing  int8    :offset-assert 13)
-   (num-attempts                int8    :offset-assert 14)
-   (num-success                 int8    :offset-assert 15)
-   (start-time                  uint64  :offset-assert 16)
-   (last-time-called            uint64  :offset-assert 24)
+  ((delay-before-playing        uint64  :offset-assert   0)
+   (id                          uint32  :offset-assert   8)
+   (num-attempts-before-playing int8    :offset-assert  12)
+   (num-success-before-killing  int8    :offset-assert  13)
+   (num-attempts                int8    :offset-assert  14)
+   (num-success                 int8    :offset-assert  15)
+   (start-time                  uint64  :offset-assert  16)
+   (last-time-called            uint64  :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -41,8 +41,8 @@
 
 ;; definition of type task-hint-control
 (deftype task-hint-control (structure)
-  ((task  uint8   :offset-assert 0)
-   (delay uint64  :offset-assert 8)
+  ((task  uint8   :offset-assert   0)
+   (delay uint64  :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -59,7 +59,7 @@
 
 ;; definition of type task-hint-control-group
 (deftype task-hint-control-group (structure)
-  ((tasks basic  :offset-assert 0)
+  ((tasks basic  :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x4
diff --git a/test/decompiler/reference/engine/game/task/task-control-h_REF.gc b/test/decompiler/reference/engine/game/task/task-control-h_REF.gc
index 9d0e2a770e..4bd083bc9d 100644
--- a/test/decompiler/reference/engine/game/task/task-control-h_REF.gc
+++ b/test/decompiler/reference/engine/game/task/task-control-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type task-cstage
 (deftype task-cstage (structure)
-  ((game-task uint8   :offset-assert 0)
-   (status    uint64  :offset-assert 8)
-   (flags     uint8   :offset-assert 16)
-   (condition basic   :offset-assert 20)
+  ((game-task uint8   :offset-assert   0)
+   (status    uint64  :offset-assert   8)
+   (flags     uint8   :offset-assert  16)
+   (condition basic   :offset-assert  20)
    )
   :method-count-assert 16
   :size-assert         #x18
@@ -34,8 +34,8 @@
 
 ;; definition of type task-control
 (deftype task-control (basic)
-  ((current-stage int16  :offset-assert 4)
-   (stage         basic  :offset-assert 8)
+  ((current-stage int16  :offset-assert   4)
+   (stage         basic  :offset-assert   8)
    )
   :method-count-assert 19
   :size-assert         #xc
@@ -64,9 +64,9 @@
 
 ;; definition of type ambient-control
 (deftype ambient-control (structure)
-  ((last-ambient-time uint64  :offset-assert 0)
-   (last-ambient      basic   :offset-assert 8)
-   (last-ambient-id   uint32  :offset-assert 12)
+  ((last-ambient-time uint64  :offset-assert   0)
+   (last-ambient      basic   :offset-assert   8)
+   (last-ambient-id   uint32  :offset-assert  12)
    )
   :method-count-assert 12
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/geometry/bounding-box-h_REF.gc b/test/decompiler/reference/engine/geometry/bounding-box-h_REF.gc
index adfe6a68dd..46aca0f3a0 100644
--- a/test/decompiler/reference/engine/geometry/bounding-box-h_REF.gc
+++ b/test/decompiler/reference/engine/geometry/bounding-box-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type bounding-box
 (deftype bounding-box (structure)
-  ((min vector :inline :offset-assert 0)
-   (max vector :inline :offset-assert 16)
+  ((min vector :inline :offset-assert   0)
+   (max vector :inline :offset-assert  16)
    )
   :method-count-assert 16
   :size-assert         #x20
@@ -30,8 +30,8 @@
 
 ;; definition of type bounding-box4w
 (deftype bounding-box4w (structure)
-  ((min vector4w :inline :offset-assert 0)
-   (max vector4w :inline :offset-assert 16)
+  ((min vector4w :inline :offset-assert   0)
+   (max vector4w :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -48,8 +48,8 @@
 
 ;; definition of type bounding-box-both
 (deftype bounding-box-both (structure)
-  ((box   bounding-box   :inline :offset-assert 0)
-   (box4w bounding-box4w :inline :offset-assert 32)
+  ((box   bounding-box   :inline :offset-assert   0)
+   (box4w bounding-box4w :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x40
diff --git a/test/decompiler/reference/engine/geometry/geometry-h_REF.gc b/test/decompiler/reference/engine/geometry/geometry-h_REF.gc
index 17d5a16225..c1a9106ec8 100644
--- a/test/decompiler/reference/engine/geometry/geometry-h_REF.gc
+++ b/test/decompiler/reference/engine/geometry/geometry-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type curve
 (deftype curve (structure)
-  ((cverts     pointer  :offset-assert 0)
-   (num-cverts int32    :offset-assert 4)
-   (knots      pointer  :offset-assert 8)
-   (num-knots  int32    :offset-assert 12)
-   (length     float    :offset-assert 16)
+  ((cverts     pointer  :offset-assert   0)
+   (num-cverts int32    :offset-assert   4)
+   (knots      pointer  :offset-assert   8)
+   (num-knots  int32    :offset-assert  12)
+   (length     float    :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -27,11 +27,11 @@
 
 ;; definition of type border-plane
 (deftype border-plane (basic)
-  ((name   basic          :offset-assert 4)
-   (action basic          :offset-assert 8)
-   (slot   int8           :offset-assert 12)
-   (trans  vector :inline :offset-assert 16)
-   (normal vector :inline :offset-assert 32)
+  ((name   basic          :offset-assert   4)
+   (action basic          :offset-assert   8)
+   (slot   int8           :offset-assert  12)
+   (trans  vector :inline :offset-assert  16)
+   (normal vector :inline :offset-assert  32)
    )
   :method-count-assert 11
   :size-assert         #x30
diff --git a/test/decompiler/reference/engine/geometry/vol-h_REF.gc b/test/decompiler/reference/engine/geometry/vol-h_REF.gc
index 765ab6f377..1dcb91648d 100644
--- a/test/decompiler/reference/engine/geometry/vol-h_REF.gc
+++ b/test/decompiler/reference/engine/geometry/vol-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type plane-volume
 (deftype plane-volume (structure)
-  ((volume-type  basic   :offset-assert 0)
-   (point-count  int16   :offset-assert 4)
-   (normal-count int16   :offset-assert 6)
-   (first-point  vector  :offset-assert 8)
-   (first-normal vector  :offset-assert 12)
-   (num-planes   int32   :offset-assert 16)
-   (plane        uint32  :offset-assert 20)
+  ((volume-type  basic   :offset-assert   0)
+   (point-count  int16   :offset-assert   4)
+   (normal-count int16   :offset-assert   6)
+   (first-point  vector  :offset-assert   8)
+   (first-normal vector  :offset-assert  12)
+   (num-planes   int32   :offset-assert  16)
+   (plane        uint32  :offset-assert  20)
    )
   :pack-me
   :method-count-assert 12
@@ -37,10 +37,10 @@
 
 ;; definition of type vol-control
 (deftype vol-control (basic)
-  ((flags         uint32                      :offset-assert 4)
-   (process       process-drawable            :offset-assert 8)
-   (pos-vol-count int32                       :offset-assert 12)
-   (pos-vol       plane-volume     32 :inline :offset-assert 16)
+  ((flags         uint32                      :offset-assert   4)
+   (process       process-drawable            :offset-assert   8)
+   (pos-vol-count int32                       :offset-assert  12)
+   (pos-vol       plane-volume     32 :inline :offset-assert  16)
    (neg-vol-count int32                       :offset-assert 784)
    (neg-vol       plane-volume     32 :inline :offset-assert 788)
    (debug-point   basic                       :offset-assert 1556)
diff --git a/test/decompiler/reference/engine/gfx/background-h_REF.gc b/test/decompiler/reference/engine/gfx/background-h_REF.gc
index 26565b18f5..8801aada21 100644
--- a/test/decompiler/reference/engine/gfx/background-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/background-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type background-work
 (deftype background-work (basic)
-  ((tfrag-tree-count              int32                          :offset-assert 4)
-   (tfrag-trees                   drawable-tree-tfrag          8 :offset-assert 8)
-   (tfrag-levels                  level                        8 :offset-assert 40)
-   (trans-tfrag-tree-count        int32                          :offset-assert 72)
-   (trans-tfrag-trees             drawable-tree-trans-tfrag    8 :offset-assert 76)
+  ((tfrag-tree-count              int32                          :offset-assert   4)
+   (tfrag-trees                   drawable-tree-tfrag          8 :offset-assert   8)
+   (tfrag-levels                  level                        8 :offset-assert  40)
+   (trans-tfrag-tree-count        int32                          :offset-assert  72)
+   (trans-tfrag-trees             drawable-tree-trans-tfrag    8 :offset-assert  76)
    (trans-tfrag-levels            level                        8 :offset-assert 108)
    (dirt-tfrag-tree-count         int32                          :offset-assert 140)
    (dirt-tfrag-trees              drawable-tree-dirt-tfrag     8 :offset-assert 144)
diff --git a/test/decompiler/reference/engine/gfx/capture_REF.gc b/test/decompiler/reference/engine/gfx/capture_REF.gc
index 7b379a43ae..f415ee0cba 100644
--- a/test/decompiler/reference/engine/gfx/capture_REF.gc
+++ b/test/decompiler/reference/engine/gfx/capture_REF.gc
@@ -5,17 +5,17 @@
 (when *debug-segment*
 ;; definition of type gs-store-image-packet
 (deftype gs-store-image-packet (structure)
-  ((vifcode        vif-tag      4 :offset-assert 0)
-   (giftag         gif-tag        :offset-assert 16)
-   (bitbltbuf      gs-bitbltbuf   :offset-assert 32)
-   (bitbltbuf-addr gs-reg64       :offset-assert 40)
-   (trxpos         gs-trxpos      :offset-assert 48)
-   (trxpos-addr    gs-reg64       :offset-assert 56)
-   (trxreg         gs-trxreg      :offset-assert 64)
-   (trxreg-addr    gs-reg64       :offset-assert 72)
-   (finish         int64          :offset-assert 80)
-   (finish-addr    gs-reg64       :offset-assert 88)
-   (trxdir         gs-trxdir      :offset-assert 96)
+  ((vifcode        vif-tag      4 :offset-assert   0)
+   (giftag         gif-tag        :offset-assert  16)
+   (bitbltbuf      gs-bitbltbuf   :offset-assert  32)
+   (bitbltbuf-addr gs-reg64       :offset-assert  40)
+   (trxpos         gs-trxpos      :offset-assert  48)
+   (trxpos-addr    gs-reg64       :offset-assert  56)
+   (trxreg         gs-trxreg      :offset-assert  64)
+   (trxreg-addr    gs-reg64       :offset-assert  72)
+   (finish         int64          :offset-assert  80)
+   (finish-addr    gs-reg64       :offset-assert  88)
+   (trxdir         gs-trxdir      :offset-assert  96)
    (trxdir-addr    gs-reg64       :offset-assert 104)
    )
   :method-count-assert 9
diff --git a/test/decompiler/reference/engine/gfx/decomp-h_REF.gc b/test/decompiler/reference/engine/gfx/decomp-h_REF.gc
index 3b028fe325..fd67c659bd 100644
--- a/test/decompiler/reference/engine/gfx/decomp-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/decomp-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type decomp-work
 (deftype decomp-work (structure)
-  ((buffer0      uint8  2048 :offset-assert 0)
+  ((buffer0      uint8  2048 :offset-assert   0)
    (buffer1      uint8  2048 :offset-assert 2048)
    (indices      uint16 2048 :offset-assert 4096)
    (temp-indices uint16 2048 :offset-assert 8192)
diff --git a/test/decompiler/reference/engine/gfx/depth-cue-h_REF.gc b/test/decompiler/reference/engine/gfx/depth-cue-h_REF.gc
index 2c5a590729..7b08f2beb0 100644
--- a/test/decompiler/reference/engine/gfx/depth-cue-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/depth-cue-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type depth-cue-data
 (deftype depth-cue-data (structure)
-  ((data      vector :inline     :offset-assert 0)
-   (sharpness float  :offset   0)
-   (alpha     float  :offset   4)
-   (distance  float  :offset   8)
-   (w         float  :offset  12)
+  ((data      vector :inline :offset-assert   0)
+   (sharpness float          :offset          0)
+   (alpha     float          :offset          4)
+   (distance  float          :offset          8)
+   (w         float          :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -27,10 +27,10 @@
 
 ;; definition of type depth-cue-work
 (deftype depth-cue-work (structure)
-  ((texture-strip-tmpl dma-gif-packet :inline :offset-assert 0)
-   (temp-strip-tmpl    dma-gif-packet :inline :offset-assert 32)
-   (stencil-tmpl       dma-gif-packet :inline :offset-assert 64)
-   (clear-color        vector4w       :inline :offset-assert 96)
+  ((texture-strip-tmpl dma-gif-packet :inline :offset-assert   0)
+   (temp-strip-tmpl    dma-gif-packet :inline :offset-assert  32)
+   (stencil-tmpl       dma-gif-packet :inline :offset-assert  64)
+   (clear-color        vector4w       :inline :offset-assert  96)
    (set-color          vector4w       :inline :offset-assert 112)
    (draw-color         vector4w       :inline :offset-assert 128)
    (depth              depth-cue-data         :offset-assert 144)
diff --git a/test/decompiler/reference/engine/gfx/eye-h_REF.gc b/test/decompiler/reference/engine/gfx/eye-h_REF.gc
index 471f3b3eb7..4d55907280 100644
--- a/test/decompiler/reference/engine/gfx/eye-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/eye-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type eye
 (deftype eye (structure)
-  ((data        uint128 2           :offset-assert 0)
-   (x           float   :offset   0)
-   (y           float   :offset   4)
-   (lid         float   :offset   8)
-   (iris-scale  float   :offset  16)
-   (pupil-scale float   :offset  20)
-   (lid-scale   float   :offset  24)
+  ((data        uint128 2 :offset-assert   0)
+   (x           float     :offset          0)
+   (y           float     :offset          4)
+   (lid         float     :offset          8)
+   (iris-scale  float     :offset         16)
+   (pupil-scale float     :offset         20)
+   (lid-scale   float     :offset         24)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -31,13 +31,13 @@
 
 ;; definition of type eye-control
 (deftype eye-control (structure)
-  ((process     uint64         :offset-assert 0)
-   (random-time uint16         :offset-assert 8)
-   (level       uint16         :offset-assert 10)
-   (blink       float          :offset-assert 12)
-   (shaders     uint32         :offset-assert 16)
-   (left        eye    :inline :offset-assert 32)
-   (right       eye    :inline :offset-assert 64)
+  ((process     uint64         :offset-assert   0)
+   (random-time uint16         :offset-assert   8)
+   (level       uint16         :offset-assert  10)
+   (blink       float          :offset-assert  12)
+   (shaders     uint32         :offset-assert  16)
+   (left        eye    :inline :offset-assert  32)
+   (right       eye    :inline :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -59,7 +59,7 @@
 
 ;; definition of type eye-control-array
 (deftype eye-control-array (basic)
-  ((data eye-control 11 :inline :offset-assert 16)
+  ((data eye-control 11 :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x430
@@ -75,10 +75,10 @@
 
 ;; definition of type eye-work
 (deftype eye-work (structure)
-  ((sprite-tmpl  dma-gif-packet :inline :offset-assert 0)
-   (sprite-tmpl2 dma-gif-packet :inline :offset-assert 32)
-   (adgif-tmpl   dma-gif-packet :inline :offset-assert 64)
-   (blink-table  float          10      :offset-assert 96)
+  ((sprite-tmpl  dma-gif-packet :inline :offset-assert   0)
+   (sprite-tmpl2 dma-gif-packet :inline :offset-assert  32)
+   (adgif-tmpl   dma-gif-packet :inline :offset-assert  64)
+   (blink-table  float          10      :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x88
diff --git a/test/decompiler/reference/engine/gfx/font-h_REF.gc b/test/decompiler/reference/engine/gfx/font-h_REF.gc
index 9b9de3a163..c6ed04b0fa 100644
--- a/test/decompiler/reference/engine/gfx/font-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/font-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type char-verts
 (deftype char-verts (structure)
-  ((pos    vector 4 :inline :offset-assert 0)
-   (color  vector 4 :inline :offset-assert 64)
+  ((pos    vector 4 :inline :offset-assert   0)
+   (color  vector 4 :inline :offset-assert  64)
    (tex-st vector 4 :inline :offset-assert 128)
    )
   :method-count-assert 9
@@ -23,7 +23,7 @@
 
 ;; definition of type char-color
 (deftype char-color (structure)
-  ((color rgba 4 :offset-assert 0)
+  ((color rgba 4 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -53,16 +53,16 @@
 
 ;; definition of type font-context
 (deftype font-context (basic)
-  ((origin     vector :inline :offset-assert 16)
-   (strip-gif  vector :inline :offset-assert 32)
-   (width      float          :offset-assert 48)
-   (height     float          :offset-assert 52)
-   (projection float          :offset-assert 56)
-   (color      int64          :offset-assert 64)
-   (flags      uint32         :offset-assert 72)
-   (mat        matrix         :offset-assert 76)
-   (start-line uint32         :offset-assert 80)
-   (scale      float          :offset-assert 84)
+  ((origin     vector :inline :offset-assert  16)
+   (strip-gif  vector :inline :offset-assert  32)
+   (width      float          :offset-assert  48)
+   (height     float          :offset-assert  52)
+   (projection float          :offset-assert  56)
+   (color      int64          :offset-assert  64)
+   (flags      uint32         :offset-assert  72)
+   (mat        matrix         :offset-assert  76)
+   (start-line uint32         :offset-assert  80)
+   (scale      float          :offset-assert  84)
    )
   :method-count-assert 20
   :size-assert         #x58
@@ -227,11 +227,11 @@
 
 ;; definition of type font-work
 (deftype font-work (structure)
-  ((font-tmpl          dma-gif-packet :inline    :offset-assert 0)
-   (char-tmpl          dma-gif-packet :inline    :offset-assert 32)
-   (tex1-tmpl          uint64         2          :offset-assert 64)
-   (small-font-lo-tmpl uint64         2          :offset-assert 80)
-   (small-font-hi-tmpl uint64         2          :offset-assert 96)
+  ((font-tmpl          dma-gif-packet :inline    :offset-assert   0)
+   (char-tmpl          dma-gif-packet :inline    :offset-assert  32)
+   (tex1-tmpl          uint64         2          :offset-assert  64)
+   (small-font-lo-tmpl uint64         2          :offset-assert  80)
+   (small-font-hi-tmpl uint64         2          :offset-assert  96)
    (large-font-lo-tmpl uint64         2          :offset-assert 112)
    (large-font-hi-tmpl uint64         2          :offset-assert 128)
    (size1-small        vector         :inline    :offset-assert 144)
diff --git a/test/decompiler/reference/engine/gfx/generic/generic-h_REF.gc b/test/decompiler/reference/engine/gfx/generic/generic-h_REF.gc
index dc955bdf2a..8e9a66616a 100644
--- a/test/decompiler/reference/engine/gfx/generic/generic-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/generic/generic-h_REF.gc
@@ -3,17 +3,17 @@
 
 ;; definition of type gsf-vertex
 (deftype gsf-vertex (structure)
-  ((data uint32    8                   :offset-assert 0)
-   (byte uint8     32 :offset   0)
-   (quad uint128   2 :offset   0)
-   (vt   qword     :inline :offset   0)
-   (pos  vector3s  :inline :offset   0)
-   (tex  vector2uh :inline :offset  12)
-   (nrm  vector3s  :inline :offset  16)
-   (nc   qword     :inline :offset  16)
-   (clr  vector4ub :inline :offset  28)
-   (dtex vector2uh :inline :offset  16)
-   (dclr vector4ub :inline :offset  20)
+  ((data uint32    8       :offset-assert   0)
+   (byte uint8     32      :offset          0)
+   (quad uint128   2       :offset          0)
+   (vt   qword     :inline :offset          0)
+   (pos  vector3s  :inline :offset          0)
+   (tex  vector2uh :inline :offset         12)
+   (nrm  vector3s  :inline :offset         16)
+   (nc   qword     :inline :offset         16)
+   (clr  vector4ub :inline :offset         28)
+   (dtex vector2uh :inline :offset         16)
+   (dclr vector4ub :inline :offset         20)
    )
   :pack-me
   :method-count-assert 9
@@ -40,7 +40,7 @@
 
 ;; definition of type gsf-vertex-array
 (deftype gsf-vertex-array (structure)
-  ((vtx gsf-vertex :dynamic :offset-assert 0)
+  ((vtx gsf-vertex :dynamic :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x0
@@ -56,8 +56,8 @@
 
 ;; definition of type gsf-fx-vertex
 (deftype gsf-fx-vertex (structure)
-  ((clr vector4ub :inline :offset-assert 0)
-   (tex vector2uh :inline :offset-assert 4)
+  ((clr vector4ub :inline :offset-assert   0)
+   (tex vector2uh :inline :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -74,7 +74,7 @@
 
 ;; definition of type gsf-fx-vertex-array
 (deftype gsf-fx-vertex-array (structure)
-  ((data gsf-fx-vertex :dynamic :offset-assert 0)
+  ((data gsf-fx-vertex :dynamic :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x0
@@ -90,11 +90,11 @@
 
 ;; definition of type gsf-header
 (deftype gsf-header (structure)
-  ((num-strips  uint8     :offset-assert 0)
-   (expanded    uint8     :offset-assert 1)
-   (num-dps     uint16    :offset-assert 2)
-   (num-vtxs    uint16    :offset-assert 4)
-   (strip-table uint8  10 :offset-assert 6)
+  ((num-strips  uint8     :offset-assert   0)
+   (expanded    uint8     :offset-assert   1)
+   (num-dps     uint16    :offset-assert   2)
+   (num-vtxs    uint16    :offset-assert   4)
+   (strip-table uint8  10 :offset-assert   6)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -114,8 +114,8 @@
 
 ;; definition of type gsf-ik
 (deftype gsf-ik (structure)
-  ((index   uint8  :offset-assert 0)
-   (no-kick uint8  :offset-assert 1)
+  ((index   uint8  :offset-assert   0)
+   (no-kick uint8  :offset-assert   1)
    )
   :method-count-assert 9
   :size-assert         #x2
@@ -132,10 +132,10 @@
 
 ;; definition of type gsf-info
 (deftype gsf-info (structure)
-  ((ptr-iks   uint32  :offset-assert 0)
-   (ptr-verts uint32  :offset-assert 4)
-   (ptr-fx    uint32  :offset-assert 8)
-   (dummy2    uint32  :offset-assert 12)
+  ((ptr-iks   uint32  :offset-assert   0)
+   (ptr-verts uint32  :offset-assert   4)
+   (ptr-fx    uint32  :offset-assert   8)
+   (dummy2    uint32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -154,10 +154,10 @@
 
 ;; definition of type gsf-buffer
 (deftype gsf-buffer (structure)
-  ((data      uint8      8192                 :offset-assert 0)
-   (info      gsf-info   :inline :offset   0)
-   (header    gsf-header :inline :offset  16)
-   (work-area uint8      :dynamic :offset  32)
+  ((data      uint8      8192     :offset-assert   0)
+   (info      gsf-info   :inline  :offset          0)
+   (header    gsf-header :inline  :offset         16)
+   (work-area uint8      :dynamic :offset         32)
    )
   :method-count-assert 9
   :size-assert         #x2000
@@ -176,8 +176,8 @@
 
 ;; definition of type generic-frag
 (deftype generic-frag (structure)
-  ((start-pos uint16  :offset-assert 0)
-   (end-pos   uint16  :offset-assert 2)
+  ((start-pos uint16  :offset-assert   0)
+   (end-pos   uint16  :offset-assert   2)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -194,8 +194,8 @@
 
 ;; definition of type generic-strip
 (deftype generic-strip (structure)
-  ((pos uint16  :offset-assert 0)
-   (len uint16  :offset-assert 2)
+  ((pos uint16  :offset-assert   0)
+   (len uint16  :offset-assert   2)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -212,8 +212,8 @@
 
 ;; definition of type generic-envmap-saves
 (deftype generic-envmap-saves (structure)
-  ((index-mask vector4w :inline :offset-assert 0)
-   (verts      uint128  12      :offset-assert 16)
+  ((index-mask vector4w :inline :offset-assert   0)
+   (verts      uint128  12      :offset-assert  16)
    (kicks      uint128  4       :offset-assert 208)
    )
   :method-count-assert 9
@@ -232,13 +232,13 @@
 
 ;; definition of type generic-interp-job
 (deftype generic-interp-job (structure)
-  ((job-type uint16  :offset-assert 0)
-   (num      uint16  :offset-assert 2)
-   (first    uint16  :offset-assert 4)
-   (pad      uint16  :offset-assert 6)
-   (ptr-data uint32  :offset-assert 8)
-   (morph-z  uint16  :offset-assert 12)
-   (morph-w  uint16  :offset-assert 14)
+  ((job-type uint16  :offset-assert   0)
+   (num      uint16  :offset-assert   2)
+   (first    uint16  :offset-assert   4)
+   (pad      uint16  :offset-assert   6)
+   (ptr-data uint32  :offset-assert   8)
+   (morph-z  uint16  :offset-assert  12)
+   (morph-w  uint16  :offset-assert  14)
    )
   :pack-me
   :method-count-assert 9
@@ -261,31 +261,31 @@
 
 ;; definition of type generic-saves
 (deftype generic-saves (structure)
-  ((ptr-dma           uint32                       :offset-assert 0)
-   (ptr-vtxs          uint32                       :offset-assert 4)
-   (ptr-clrs          uint32                       :offset-assert 8)
-   (ptr-texs          uint32                       :offset-assert 12)
-   (ptr-env-clrs      uint32                       :offset-assert 16)
-   (ptr-env-texs      uint32                       :offset-assert 20)
-   (cur-outbuf        uint32                       :offset-assert 24)
-   (ptr-fx-buf        uint32                       :offset-assert 28)
-   (xor-outbufs       uint32                       :offset-assert 32)
-   (num-dps           uint32                       :offset-assert 36)
-   (qwc               uint32                       :offset-assert 40)
-   (gsf-buf           gsf-buffer                   :offset-assert 44)
-   (ptr-shaders       uint32                       :offset-assert 48)
-   (ptr-env-shader    uint32                       :offset-assert 52)
-   (is-envmap         uint32                       :offset-assert 56)
-   (basep             uint32                       :offset-assert 60)
-   (ptr-interp-job    generic-interp-job           :offset-assert 64)
-   (gifbuf-adr        uint32                       :offset-assert 68)
-   (inbuf-adr         uint32                       :offset-assert 72)
-   (fade-val          uint32                       :offset-assert 76)
-   (time-of-day-color uint32                       :offset-assert 80)
-   (to-vu0-waits      uint32                       :offset-assert 84)
-   (to-spr-waits      uint32                       :offset-assert 88)
-   (from-spr-waits    uint32                       :offset-assert 92)
-   (envmap            generic-envmap-saves :inline :offset-assert 96)
+  ((ptr-dma           uint32                       :offset-assert   0)
+   (ptr-vtxs          uint32                       :offset-assert   4)
+   (ptr-clrs          uint32                       :offset-assert   8)
+   (ptr-texs          uint32                       :offset-assert  12)
+   (ptr-env-clrs      uint32                       :offset-assert  16)
+   (ptr-env-texs      uint32                       :offset-assert  20)
+   (cur-outbuf        uint32                       :offset-assert  24)
+   (ptr-fx-buf        uint32                       :offset-assert  28)
+   (xor-outbufs       uint32                       :offset-assert  32)
+   (num-dps           uint32                       :offset-assert  36)
+   (qwc               uint32                       :offset-assert  40)
+   (gsf-buf           gsf-buffer                   :offset-assert  44)
+   (ptr-shaders       uint32                       :offset-assert  48)
+   (ptr-env-shader    uint32                       :offset-assert  52)
+   (is-envmap         uint32                       :offset-assert  56)
+   (basep             uint32                       :offset-assert  60)
+   (ptr-interp-job    generic-interp-job           :offset-assert  64)
+   (gifbuf-adr        uint32                       :offset-assert  68)
+   (inbuf-adr         uint32                       :offset-assert  72)
+   (fade-val          uint32                       :offset-assert  76)
+   (time-of-day-color uint32                       :offset-assert  80)
+   (to-vu0-waits      uint32                       :offset-assert  84)
+   (to-spr-waits      uint32                       :offset-assert  88)
+   (from-spr-waits    uint32                       :offset-assert  92)
+   (envmap            generic-envmap-saves :inline :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x170
@@ -329,12 +329,12 @@
 
 ;; definition of type generic-gif-tag
 (deftype generic-gif-tag (structure)
-  ((data       uint32 4                   :offset-assert 0)
-   (qword      qword  :inline :offset   0)
-   (fan-prim   uint32 :offset   0)
-   (str-prim   uint32 :offset   4)
-   (regs       uint32 :offset   8)
-   (num-strips uint32 :offset  12)
+  ((data       uint32 4       :offset-assert   0)
+   (qword      qword  :inline :offset          0)
+   (fan-prim   uint32         :offset          0)
+   (str-prim   uint32         :offset          4)
+   (regs       uint32         :offset          8)
+   (num-strips uint32         :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -355,15 +355,15 @@
 
 ;; definition of type ad-cmd
 (deftype ad-cmd (structure)
-  ((word uint32  4           :offset-assert 0)
-   (quad uint128 :offset   0)
-   (data uint64  :offset   0)
-   (cmds uint64  :offset   8)
-   (cmd  uint8   :offset   8)
-   (x    uint32  :offset   0)
-   (y    uint32  :offset   4)
-   (z    uint32  :offset   8)
-   (w    uint32  :offset  12)
+  ((word uint32  4 :offset-assert   0)
+   (quad uint128   :offset          0)
+   (data uint64    :offset          0)
+   (cmds uint64    :offset          8)
+   (cmd  uint8     :offset          8)
+   (x    uint32    :offset          0)
+   (y    uint32    :offset          4)
+   (z    uint32    :offset          8)
+   (w    uint32    :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -388,10 +388,10 @@
 
 ;; definition of type generic-envmap-consts
 (deftype generic-envmap-consts (structure)
-  ((consts vector          :inline :offset-assert 0)
-   (strgif generic-gif-tag :inline :offset-assert 16)
-   (colors vector4w        :inline :offset-assert 32)
-   (shader adgif-shader    :inline :offset-assert 48)
+  ((consts vector          :inline :offset-assert   0)
+   (strgif generic-gif-tag :inline :offset-assert  16)
+   (colors vector4w        :inline :offset-assert  32)
+   (shader adgif-shader    :inline :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x80
@@ -410,30 +410,30 @@
 
 ;; definition of type generic-consts
 (deftype generic-consts (structure)
-  ((dma-header        dma-packet            :inline       :offset-assert 0)
-   (vif-header        uint32                4             :offset-assert 16)
-   (dma-ref-vtxs      dma-packet            :inline       :offset-assert 32)
-   (dma-cnt-call      dma-packet            :inline       :offset-assert 48)
-   (matrix            matrix                :inline       :offset-assert 64)
-   (base-strgif       generic-gif-tag       :inline       :offset-assert 128)
-   (alpha-opaque      ad-cmd                :inline       :offset-assert 144)
-   (alpha-translucent ad-cmd                :inline       :offset-assert 160)
-   (ztest-normal      ad-cmd                :inline       :offset-assert 176)
-   (ztest-opaque      ad-cmd                :inline       :offset-assert 192)
-   (adcmd-offsets     uint8                 16            :offset-assert 208)
-   (adcmds            ad-cmd                4 :offset 144)
-   (stcycle-tag       uint32                              :offset-assert 224)
-   (unpack-vtx-tag    uint32                              :offset-assert 228)
-   (unpack-clr-tag    uint32                              :offset-assert 232)
-   (unpack-tex-tag    uint32                              :offset-assert 236)
-   (mscal-tag         uint32                              :offset-assert 240)
-   (flush-tag         uint32                              :offset-assert 244)
-   (reset-cycle-tag   uint32                              :offset-assert 248)
-   (dummy0            uint32                              :offset-assert 252)
-   (dma-tag-cnt       uint64                              :offset-assert 256)
-   (envmap            generic-envmap-consts :inline       :offset-assert 272)
-   (light-consts      vector                :inline       :offset-assert 400)
-   (texture-offset    uint16                8             :offset-assert 416)
+  ((dma-header        dma-packet            :inline :offset-assert   0)
+   (vif-header        uint32                4       :offset-assert  16)
+   (dma-ref-vtxs      dma-packet            :inline :offset-assert  32)
+   (dma-cnt-call      dma-packet            :inline :offset-assert  48)
+   (matrix            matrix                :inline :offset-assert  64)
+   (base-strgif       generic-gif-tag       :inline :offset-assert 128)
+   (alpha-opaque      ad-cmd                :inline :offset-assert 144)
+   (alpha-translucent ad-cmd                :inline :offset-assert 160)
+   (ztest-normal      ad-cmd                :inline :offset-assert 176)
+   (ztest-opaque      ad-cmd                :inline :offset-assert 192)
+   (adcmd-offsets     uint8                 16      :offset-assert 208)
+   (adcmds            ad-cmd                4       :offset        144)
+   (stcycle-tag       uint32                        :offset-assert 224)
+   (unpack-vtx-tag    uint32                        :offset-assert 228)
+   (unpack-clr-tag    uint32                        :offset-assert 232)
+   (unpack-tex-tag    uint32                        :offset-assert 236)
+   (mscal-tag         uint32                        :offset-assert 240)
+   (flush-tag         uint32                        :offset-assert 244)
+   (reset-cycle-tag   uint32                        :offset-assert 248)
+   (dummy0            uint32                        :offset-assert 252)
+   (dma-tag-cnt       uint64                        :offset-assert 256)
+   (envmap            generic-envmap-consts :inline :offset-assert 272)
+   (light-consts      vector                :inline :offset-assert 400)
+   (texture-offset    uint16                8       :offset-assert 416)
    )
   :method-count-assert 9
   :size-assert         #x1b0
@@ -476,7 +476,7 @@
 
 ;; definition of type generic-storage
 (deftype generic-storage (structure)
-  ((data uint128 16 :offset-assert 0)
+  ((data uint128 16 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x100
diff --git a/test/decompiler/reference/engine/gfx/generic/generic-vu1-h_REF.gc b/test/decompiler/reference/engine/gfx/generic/generic-vu1-h_REF.gc
index 005057f4c0..bf7985766a 100644
--- a/test/decompiler/reference/engine/gfx/generic/generic-vu1-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/generic/generic-vu1-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type pris-mtx
 (deftype pris-mtx (structure)
-  ((data   float   32 :offset   0)
+  ((data   float   32        :offset   0)
    (vector vector  8 :inline :offset   0)
-   (t-mtx  matrix  :inline :offset   0)
-   (n-mtx  matrix3 :inline :offset  64)
-   (scale  vector  :inline :offset 112)
+   (t-mtx  matrix  :inline   :offset   0)
+   (n-mtx  matrix3 :inline   :offset  64)
+   (scale  vector  :inline   :offset 112)
    )
   :method-count-assert 9
   :size-assert         #x80
@@ -27,7 +27,7 @@
 
 ;; definition of type generic-pris-mtx-save
 (deftype generic-pris-mtx-save (structure)
-  ((loc-mtx pris-mtx :inline :offset-assert 0)
+  ((loc-mtx pris-mtx :inline :offset-assert   0)
    (par-mtx pris-mtx :inline :offset-assert 128)
    (dif-mtx pris-mtx :inline :offset-assert 256)
    )
@@ -47,13 +47,13 @@
 
 ;; definition of type generic-constants
 (deftype generic-constants (structure)
-  ((fog         vector :inline :offset-assert 0)
-   (adgif       qword  :inline :offset-assert 16)
-   (giftag      qword  :inline :offset-assert 32)
-   (hvdf-offset vector :inline :offset-assert 48)
-   (hmge-scale  vector :inline :offset-assert 64)
-   (invh-scale  vector :inline :offset-assert 80)
-   (guard       vector :inline :offset-assert 96)
+  ((fog         vector :inline :offset-assert   0)
+   (adgif       qword  :inline :offset-assert  16)
+   (giftag      qword  :inline :offset-assert  32)
+   (hvdf-offset vector :inline :offset-assert  48)
+   (hmge-scale  vector :inline :offset-assert  64)
+   (invh-scale  vector :inline :offset-assert  80)
+   (guard       vector :inline :offset-assert  96)
    (adnop       qword  :inline :offset-assert 112)
    (flush       qword  :inline :offset-assert 128)
    (stores      qword  :inline :offset-assert 144)
diff --git a/test/decompiler/reference/engine/gfx/generic/generic-work-h_REF.gc b/test/decompiler/reference/engine/gfx/generic/generic-work-h_REF.gc
index 4ce1455c19..73b12255e8 100644
--- a/test/decompiler/reference/engine/gfx/generic/generic-work-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/generic/generic-work-h_REF.gc
@@ -5,7 +5,7 @@
 (deftype generic-input-buffer (structure)
   ((merc generic-merc-work :inline :offset   0)
    (tie  generic-tie-work  :inline :offset   0)
-   (data uint128           472 :offset   0)
+   (data uint128           472     :offset   0)
    )
   :method-count-assert 9
   :size-assert         #x1d80
@@ -23,8 +23,8 @@
 
 ;; definition of type generic-debug
 (deftype generic-debug (structure)
-  ((locks      uint32 4  :offset-assert 0)
-   (timer      uint32 32 :offset-assert 16)
+  ((locks      uint32 4  :offset-assert   0)
+   (timer      uint32 32 :offset-assert  16)
    (count      uint32 32 :offset-assert 144)
    (vps        uint32 32 :offset-assert 272)
    (buffer     int32     :offset-assert 400)
@@ -51,14 +51,14 @@
 
 ;; definition of type generic-vu1-header
 (deftype generic-vu1-header (structure)
-  ((matrix  matrix          :inline               :offset-assert 0)
-   (strgif  generic-gif-tag :inline               :offset-assert 64)
-   (adnop1  ad-cmd          :inline               :offset-assert 80)
-   (adnop2  ad-cmd          :inline               :offset-assert 96)
-   (adcmds  ad-cmd          2 :inline :offset  80)
-   (dps     uint16          :offset  92)
-   (kickoff uint16          :offset 108)
-   (strips  uint16          :offset  76)
+  ((matrix  matrix          :inline   :offset-assert   0)
+   (strgif  generic-gif-tag :inline   :offset-assert  64)
+   (adnop1  ad-cmd          :inline   :offset-assert  80)
+   (adnop2  ad-cmd          :inline   :offset-assert  96)
+   (adcmds  ad-cmd          2 :inline :offset         80)
+   (dps     uint16                    :offset         92)
+   (kickoff uint16                    :offset        108)
+   (strips  uint16                    :offset         76)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -81,7 +81,7 @@
 
 ;; definition of type generic-vu1-texbuf
 (deftype generic-vu1-texbuf (structure)
-  ((header generic-vu1-header :inline  :offset-assert 0)
+  ((header generic-vu1-header :inline  :offset-assert   0)
    (shader uint32             :dynamic :offset-assert 112)
    )
   :method-count-assert 9
@@ -99,8 +99,8 @@
 
 ;; definition of type generic-texbuf
 (deftype generic-texbuf (structure)
-  ((tag    dma-packet         :inline  :offset-assert 0)
-   (header generic-vu1-header :inline  :offset-assert 16)
+  ((tag    dma-packet         :inline  :offset-assert   0)
+   (header generic-vu1-header :inline  :offset-assert  16)
    (shader uint32             :dynamic :offset-assert 128)
    )
   :method-count-assert 9
@@ -119,7 +119,7 @@
 
 ;; definition of type generic-effect-work
 (deftype generic-effect-work (structure)
-  ((consts   generic-consts  :inline :offset-assert 0)
+  ((consts   generic-consts  :inline :offset-assert   0)
    (storage  generic-storage :inline :offset-assert 432)
    (storage2 generic-storage :inline :offset-assert 688)
    (lights   vu-lights       :inline :offset-assert 944)
@@ -141,7 +141,7 @@
 
 ;; definition of type generic-effect-buffer
 (deftype generic-effect-buffer (structure)
-  ((outbuf-0 uint8               3552    :offset-assert 0)
+  ((outbuf-0 uint8               3552    :offset-assert   0)
    (work     generic-effect-work :inline :offset-assert 3552)
    (outbuf-1 uint8               3552    :offset-assert 4608)
    )
@@ -161,7 +161,7 @@
 
 ;; definition of type generic-work
 (deftype generic-work (structure)
-  ((saves   generic-saves         :inline :offset-assert 0)
+  ((saves   generic-saves         :inline :offset-assert   0)
    (storage generic-storage       :inline :offset-assert 368)
    (in-buf  generic-input-buffer  :inline :offset-assert 624)
    (fx-buf  generic-effect-buffer :inline :offset-assert 8176)
diff --git a/test/decompiler/reference/engine/gfx/hw/display-h_REF.gc b/test/decompiler/reference/engine/gfx/hw/display-h_REF.gc
index 907986d8c6..2a4e8b6af5 100644
--- a/test/decompiler/reference/engine/gfx/hw/display-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/hw/display-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type display-env
 (deftype display-env (structure)
-  ((pmode   gs-pmode       :offset-assert 0)
-   (smode2  gs-smode2      :offset-assert 8)
-   (dspfb   gs-display-fb  :offset-assert 16)
-   (display gs-display     :offset-assert 24)
-   (bgcolor gs-bgcolor     :offset-assert 32)
+  ((pmode   gs-pmode       :offset-assert   0)
+   (smode2  gs-smode2      :offset-assert   8)
+   (dspfb   gs-display-fb  :offset-assert  16)
+   (display gs-display     :offset-assert  24)
+   (bgcolor gs-bgcolor     :offset-assert  32)
    )
   :pack-me
   :method-count-assert 9
@@ -28,19 +28,19 @@
 
 ;; definition of type draw-env
 (deftype draw-env (structure)
-  ((frame1         gs-frame        :offset-assert 0)
-   (frame1addr     gs-reg64        :offset-assert 8)
-   (zbuf1          gs-zbuf         :offset-assert 16)
-   (zbuf1addr      gs-reg64        :offset-assert 24)
-   (xyoffset1      gs-xy-offset    :offset-assert 32)
-   (xyoffset1addr  gs-reg64        :offset-assert 40)
-   (scissor1       gs-scissor      :offset-assert 48)
-   (scissor1addr   gs-reg64        :offset-assert 56)
-   (prmodecont     gs-prmode-cont  :offset-assert 64)
-   (prmodecontaddr gs-reg64        :offset-assert 72)
-   (colclamp       gs-color-clamp  :offset-assert 80)
-   (colclampaddr   gs-reg64        :offset-assert 88)
-   (dthe           gs-dthe         :offset-assert 96)
+  ((frame1         gs-frame        :offset-assert   0)
+   (frame1addr     gs-reg64        :offset-assert   8)
+   (zbuf1          gs-zbuf         :offset-assert  16)
+   (zbuf1addr      gs-reg64        :offset-assert  24)
+   (xyoffset1      gs-xy-offset    :offset-assert  32)
+   (xyoffset1addr  gs-reg64        :offset-assert  40)
+   (scissor1       gs-scissor      :offset-assert  48)
+   (scissor1addr   gs-reg64        :offset-assert  56)
+   (prmodecont     gs-prmode-cont  :offset-assert  64)
+   (prmodecontaddr gs-reg64        :offset-assert  72)
+   (colclamp       gs-color-clamp  :offset-assert  80)
+   (colclampaddr   gs-reg64        :offset-assert  88)
+   (dthe           gs-dthe         :offset-assert  96)
    (dtheaddr       gs-reg64        :offset-assert 104)
    (test1          gs-test         :offset-assert 112)
    (test1addr      gs-reg64        :offset-assert 120)
@@ -85,14 +85,14 @@
 
 ;; definition of type display-frame
 (deftype display-frame (basic)
-  ((calc-buf     dma-buffer  :offset   8)
-   (vu1-buf      dma-buffer  :offset   8)
-   (debug-buf    dma-buffer  :offset  36)
-   (global-buf   dma-buffer  :offset  40)
-   (bucket-group dma-bucket  :offset  44)
+  ((calc-buf     dma-buffer     :offset   8)
+   (vu1-buf      dma-buffer     :offset   8)
+   (debug-buf    dma-buffer     :offset  36)
+   (global-buf   dma-buffer     :offset  40)
+   (bucket-group dma-bucket     :offset  44)
    (buffer       uint32      11 :offset   4)
-   (profile-bar  profile-bar 2 :offset  48)
-   (run-time     uint64      :offset  56)
+   (profile-bar  profile-bar 2  :offset  48)
+   (run-time     uint64         :offset  56)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -136,11 +136,11 @@
 
 ;; definition of type virtual-frame
 (deftype virtual-frame (structure)
-  ((display      display-env    :offset-assert 0)
-   (display-last display-env    :offset-assert 4)
-   (gif          pointer        :offset-assert 8)
-   (draw         draw-env       :offset-assert 12)
-   (frame        display-frame  :offset-assert 16)
+  ((display      display-env    :offset-assert   0)
+   (display-last display-env    :offset-assert   4)
+   (gif          pointer        :offset-assert   8)
+   (draw         draw-env       :offset-assert  12)
+   (frame        display-frame  :offset-assert  16)
    )
   :allow-misaligned  :method-count-assert 9
   :size-assert         #x14
@@ -160,9 +160,9 @@
 
 ;; definition of type display
 (deftype display (basic)
-  ((display-env0                    display-env   :inline   :offset-assert 8)
-   (display-env1                    display-env   :inline   :offset-assert 48)
-   (display-env2                    display-env   :inline   :offset-assert 88)
+  ((display-env0                    display-env   :inline   :offset-assert   8)
+   (display-env1                    display-env   :inline   :offset-assert  48)
+   (display-env2                    display-env   :inline   :offset-assert  88)
    (gif-tag0                        gs-gif-tag    :inline   :offset-assert 128)
    (draw0                           draw-env      :inline   :offset-assert 144)
    (gif-tag1                        gs-gif-tag    :inline   :offset-assert 272)
diff --git a/test/decompiler/reference/engine/gfx/hw/gs_REF.gc b/test/decompiler/reference/engine/gfx/hw/gs_REF.gc
index e8985cc708..47c79d429b 100644
--- a/test/decompiler/reference/engine/gfx/hw/gs_REF.gc
+++ b/test/decompiler/reference/engine/gfx/hw/gs_REF.gc
@@ -185,19 +185,19 @@
 
 ;; definition of type gs-bank
 (deftype gs-bank (structure)
-  ((pmode    gs-pmode                  :offset-assert 0)
-   (smode2   gs-smode2     :offset  32)
-   (dspfb1   gs-display-fb :offset 112)
-   (display1 gs-display    :offset 128)
-   (dspfb2   gs-display-fb :offset 144)
-   (display2 gs-display    :offset 160)
-   (extbuf   uint64        :offset 176)
-   (extdata  uint64        :offset 192)
-   (extwrite uint64        :offset 208)
-   (bgcolor  gs-bgcolor    :offset 224)
-   (csr      gs-csr        :offset 4096)
-   (imr      uint64        :offset 4112)
-   (busdir   uint64        :offset 4160)
+  ((pmode    gs-pmode       :offset-assert   0)
+   (smode2   gs-smode2      :offset         32)
+   (dspfb1   gs-display-fb  :offset        112)
+   (display1 gs-display     :offset        128)
+   (dspfb2   gs-display-fb  :offset        144)
+   (display2 gs-display     :offset        160)
+   (extbuf   uint64         :offset        176)
+   (extdata  uint64         :offset        192)
+   (extwrite uint64         :offset        208)
+   (bgcolor  gs-bgcolor     :offset        224)
+   (csr      gs-csr         :offset        4096)
+   (imr      uint64         :offset        4112)
+   (busdir   uint64         :offset        4160)
    )
   :method-count-assert 9
   :size-assert         #x1048
@@ -647,16 +647,16 @@
 
 ;; definition of type gif-bank
 (deftype gif-bank (structure)
-  ((ctrl  gif-ctrl  :offset   0)
-   (mode  gif-mode  :offset  16)
-   (stat  gif-stat  :offset  32)
-   (tag0  uint32    :offset  64)
-   (tag1  uint32    :offset  80)
-   (tag2  uint32    :offset  96)
-   (tag3  uint32    :offset 112)
-   (cnt   gif-cnt   :offset 128)
-   (p3cnt gif-p3cnt :offset 144)
-   (p3tag gif-p3tag :offset 160)
+  ((ctrl  gif-ctrl   :offset   0)
+   (mode  gif-mode   :offset  16)
+   (stat  gif-stat   :offset  32)
+   (tag0  uint32     :offset  64)
+   (tag1  uint32     :offset  80)
+   (tag2  uint32     :offset  96)
+   (tag3  uint32     :offset 112)
+   (cnt   gif-cnt    :offset 128)
+   (p3cnt gif-p3cnt  :offset 144)
+   (p3tag gif-p3tag  :offset 160)
    )
   :method-count-assert 9
   :size-assert         #xa4
@@ -743,11 +743,11 @@
 
 ;; definition of type gs-gif-tag
 (deftype gs-gif-tag (structure)
-  ((qword uint128                    :offset-assert 0)
-   (tag   gif-tag64    :offset   0)
-   (regs  gif-tag-regs :offset   8)
-   (dword uint64       2 :offset   0)
-   (word  uint32       4 :offset   0)
+  ((qword uint128        :offset-assert   0)
+   (tag   gif-tag64      :offset          0)
+   (regs  gif-tag-regs   :offset          8)
+   (dword uint64       2 :offset          0)
+   (word  uint32       4 :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -896,10 +896,10 @@
 
 ;; definition of type gif-packet
 (deftype gif-packet (basic)
-  ((reg-count int32                  :offset-assert 4)
-   (gif-tag   gs-gif-tag :inline     :offset-assert 16)
-   (gif-tag0  uint128    :offset  16)
-   (args      uint64     1           :offset-assert 32)
+  ((reg-count int32              :offset-assert   4)
+   (gif-tag   gs-gif-tag :inline :offset-assert  16)
+   (gif-tag0  uint128            :offset         16)
+   (args      uint64     1       :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x28
@@ -968,12 +968,12 @@
 
 ;; definition of type draw-context
 (deftype draw-context (basic)
-  ((orgx   int32   :offset-assert 4)
-   (orgy   int32   :offset-assert 8)
-   (orgz   int32   :offset-assert 12)
-   (width  int32   :offset-assert 16)
-   (height int32   :offset-assert 20)
-   (color  rgba  4 :offset-assert 24)
+  ((orgx   int32   :offset-assert   4)
+   (orgy   int32   :offset-assert   8)
+   (orgz   int32   :offset-assert  12)
+   (width  int32   :offset-assert  16)
+   (height int32   :offset-assert  20)
+   (color  rgba  4 :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x28
diff --git a/test/decompiler/reference/engine/gfx/hw/video-h_REF.gc b/test/decompiler/reference/engine/gfx/hw/video-h_REF.gc
index caa9c29e15..41bc093b61 100644
--- a/test/decompiler/reference/engine/gfx/hw/video-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/hw/video-h_REF.gc
@@ -3,22 +3,22 @@
 
 ;; definition of type video-parms
 (deftype video-parms (structure)
-  ((set-video-mode              basic  :offset-assert 0)
-   (reset-video-mode            basic  :offset-assert 4)
-   (screen-sy                   int32  :offset-assert 8)
-   (screen-hy                   int32  :offset-assert 12)
-   (screen-miny                 int32  :offset-assert 16)
-   (screen-maxy                 int32  :offset-assert 20)
-   (screen-masky                int32  :offset-assert 24)
-   (display-dx                  int32  :offset-assert 28)
-   (display-dy                  int32  :offset-assert 32)
-   (screen-pages-high           int32  :offset-assert 36)
-   (_pad                        int64  :offset-assert 40)
-   (relative-x-scale            float  :offset-assert 48)
-   (relative-y-scale            float  :offset-assert 52)
-   (_pad2                       int64  :offset-assert 56)
-   (relative-x-scale-reciprical float  :offset-assert 64)
-   (relative-y-scale-reciprical float  :offset-assert 68)
+  ((set-video-mode              basic  :offset-assert   0)
+   (reset-video-mode            basic  :offset-assert   4)
+   (screen-sy                   int32  :offset-assert   8)
+   (screen-hy                   int32  :offset-assert  12)
+   (screen-miny                 int32  :offset-assert  16)
+   (screen-maxy                 int32  :offset-assert  20)
+   (screen-masky                int32  :offset-assert  24)
+   (display-dx                  int32  :offset-assert  28)
+   (display-dy                  int32  :offset-assert  32)
+   (screen-pages-high           int32  :offset-assert  36)
+   (_pad                        int64  :offset-assert  40)
+   (relative-x-scale            float  :offset-assert  48)
+   (relative-y-scale            float  :offset-assert  52)
+   (_pad2                       int64  :offset-assert  56)
+   (relative-x-scale-reciprical float  :offset-assert  64)
+   (relative-y-scale-reciprical float  :offset-assert  68)
    )
   :method-count-assert 9
   :size-assert         #x48
diff --git a/test/decompiler/reference/engine/gfx/hw/vu1-user-h_REF.gc b/test/decompiler/reference/engine/gfx/hw/vu1-user-h_REF.gc
index 87d46d503b..8fd0b75f4d 100644
--- a/test/decompiler/reference/engine/gfx/hw/vu1-user-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/hw/vu1-user-h_REF.gc
@@ -9,10 +9,10 @@
 
 ;; definition of type dma-foreground-sink
 (deftype dma-foreground-sink (basic)
-  ((bucket                   int32  :offset-assert 4)
-   (foreground-texture-page  int8   :offset-assert 8)
-   (foreground-texture-level int8   :offset-assert 9)
-   (foreground-output-bucket int8   :offset-assert 10)
+  ((bucket                   int32  :offset-assert   4)
+   (foreground-texture-page  int8   :offset-assert   8)
+   (foreground-texture-level int8   :offset-assert   9)
+   (foreground-output-bucket int8   :offset-assert  10)
    )
   :method-count-assert 9
   :size-assert         #xb
@@ -39,8 +39,8 @@
 
 ;; definition of type generic-bucket-state
 (deftype generic-bucket-state (structure)
-  ((gifbuf-adr uint32  :offset-assert 0)
-   (inbuf-adr  uint32  :offset-assert 4)
+  ((gifbuf-adr uint32  :offset-assert   0)
+   (inbuf-adr  uint32  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -58,7 +58,7 @@
 
 ;; definition of type generic-dma-foreground-sink
 (deftype generic-dma-foreground-sink (dma-foreground-sink)
-  ((state generic-bucket-state :inline :offset-assert 12)
+  ((state generic-bucket-state :inline :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -89,10 +89,10 @@
 
 ;; definition of type dma-foreground-sink-group
 (deftype dma-foreground-sink-group (basic)
-  ((sink         dma-foreground-sink         3           :offset-assert 4)
-   (merc-sink    dma-foreground-sink         :offset   4)
-   (generic-sink generic-dma-foreground-sink :offset   8)
-   (level        basic                                   :offset-assert 16)
+  ((sink         dma-foreground-sink         3 :offset-assert   4)
+   (merc-sink    dma-foreground-sink           :offset          4)
+   (generic-sink generic-dma-foreground-sink   :offset          8)
+   (level        basic                         :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
diff --git a/test/decompiler/reference/engine/gfx/lights-h_REF.gc b/test/decompiler/reference/engine/gfx/lights-h_REF.gc
index 20e150f7d1..570369fd1d 100644
--- a/test/decompiler/reference/engine/gfx/lights-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/lights-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type vu-lights
 (deftype vu-lights (structure)
-  ((direction vector 3 :inline :offset-assert 0)
-   (color     vector 3 :inline :offset-assert 48)
-   (ambient   vector :inline   :offset-assert 96)
+  ((direction vector 3 :inline :offset-assert   0)
+   (color     vector 3 :inline :offset-assert  48)
+   (ambient   vector :inline   :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -23,11 +23,11 @@
 
 ;; definition of type light
 (deftype light (structure)
-  ((direction  vector :inline     :offset-assert 0)
-   (color      rgbaf  :inline     :offset-assert 16)
-   (levels     vector :inline     :offset-assert 32)
-   (level      float  :offset  32)
-   (sort-level float  :offset  36)
+  ((direction  vector :inline :offset-assert   0)
+   (color      rgbaf  :inline :offset-assert  16)
+   (levels     vector :inline :offset-assert  32)
+   (level      float          :offset         32)
+   (sort-level float          :offset         36)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -47,14 +47,14 @@
 
 ;; definition of type light-ellipse
 (deftype light-ellipse (structure)
-  ((matrix              matrix :inline     :offset-assert 0)
-   (color               rgbaf  :inline     :offset-assert 64)
-   (name                basic  :offset  12)
-   (decay-start         float  :offset  28)
-   (ambient-point-ratio float  :offset  44)
-   (level               float  :offset  60)
-   (func-symbol         basic  :offset  76)
-   (func                basic  :offset  76)
+  ((matrix              matrix :inline :offset-assert   0)
+   (color               rgbaf  :inline :offset-assert  64)
+   (name                basic          :offset         12)
+   (decay-start         float          :offset         28)
+   (ambient-point-ratio float          :offset         44)
+   (level               float          :offset         60)
+   (func-symbol         basic          :offset         76)
+   (func                basic          :offset         76)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -95,7 +95,7 @@
 
 ;; definition of type light-volume
 (deftype light-volume (basic)
-  ((light-array basic  :offset-assert 4)
+  ((light-array basic  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -111,7 +111,7 @@
 
 ;; definition of type light-volume-sphere
 (deftype light-volume-sphere (light-volume)
-  ((bsphere sphere :inline :offset-assert 16)
+  ((bsphere sphere :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -128,7 +128,7 @@
 
 ;; definition of type light-volume-planes
 (deftype light-volume-planes (light-volume)
-  ((planes vertical-planes  :offset-assert 8)
+  ((planes vertical-planes  :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -184,11 +184,11 @@
 
 ;; definition of type light-group
 (deftype light-group (structure)
-  ((dir0   light :inline               :offset-assert 0)
-   (dir1   light :inline               :offset-assert 48)
-   (dir2   light :inline               :offset-assert 96)
-   (ambi   light :inline               :offset-assert 144)
-   (lights light 4 :inline :offset   0)
+  ((dir0   light :inline   :offset-assert   0)
+   (dir1   light :inline   :offset-assert  48)
+   (dir2   light :inline   :offset-assert  96)
+   (ambi   light :inline   :offset-assert 144)
+   (lights light 4 :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #xc0
diff --git a/test/decompiler/reference/engine/gfx/merc/generic-merc-h_REF.gc b/test/decompiler/reference/engine/gfx/merc/generic-merc-h_REF.gc
index 363dcfd4fa..338174cc3d 100644
--- a/test/decompiler/reference/engine/gfx/merc/generic-merc-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/merc/generic-merc-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type merc-matrix
 (deftype merc-matrix (structure)
-  ((quad   uint128 8                     :offset-assert 0)
-   (vector vector  8 :inline :offset   0)
-   (tag    uint64  :offset   0)
+  ((quad   uint128 8         :offset-assert   0)
+   (vector vector  8 :inline :offset          0)
+   (tag    uint64            :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x80
@@ -23,8 +23,8 @@
 
 ;; definition of type generic-merc-tag
 (deftype generic-merc-tag (dma-packet)
-  ((next-ptr uint32 :offset  12)
-   (size     uint32 :offset   8)
+  ((next-ptr uint32  :offset  12)
+   (size     uint32  :offset   8)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -46,8 +46,8 @@
 
 ;; definition of type generic-merc-ctrl
 (deftype generic-merc-ctrl (structure)
-  ((tag    generic-merc-tag :inline :offset-assert 0)
-   (lights vu-lights        :inline :offset-assert 16)
+  ((tag    generic-merc-tag :inline :offset-assert   0)
+   (lights vu-lights        :inline :offset-assert  16)
    (header merc-ctrl-header :inline :offset-assert 128)
    (effect merc-effect      :inline :offset-assert 208)
    )
@@ -88,13 +88,13 @@
 
 ;; definition of type generic-merc-input
 (deftype generic-merc-input (structure)
-  ((geo-tag     generic-merc-tag           :inline             :offset-assert 0)
-   (geo-block   uint8                      1296                :offset-assert 16)
-   (byte-header merc-byte-header           :inline :offset  16)
-   (matrix      merc-matrix                9 :inline           :offset-assert 1312)
-   (control     generic-merc-ctrl-with-sfx :inline             :offset-assert 2464)
-   (end-tag     generic-merc-tag           :inline             :offset-assert 2880)
-   (shader      adgif-shader               :inline             :offset-assert 2896)
+  ((geo-tag     generic-merc-tag           :inline   :offset-assert   0)
+   (geo-block   uint8                      1296      :offset-assert  16)
+   (byte-header merc-byte-header           :inline   :offset         16)
+   (matrix      merc-matrix                9 :inline :offset-assert 1312)
+   (control     generic-merc-ctrl-with-sfx :inline   :offset-assert 2464)
+   (end-tag     generic-merc-tag           :inline   :offset-assert 2880)
+   (shader      adgif-shader               :inline   :offset-assert 2896)
    )
   :method-count-assert 9
   :size-assert         #xba0
@@ -120,12 +120,12 @@
 
 ;; definition of type generic-merc-output
 (deftype generic-merc-output (structure)
-  ((info             gsf-info   :inline         :offset-assert 0)
-   (header           gsf-header :inline         :offset-assert 16)
-   (index-kick-table uint16     80              :offset-assert 32)
-   (index-table      uint8      160 :offset  32)
-   (inverse-table    uint8      256             :offset-assert 192)
-   (vertex-table     gsf-vertex 72 :inline      :offset-assert 448)
+  ((info             gsf-info   :inline    :offset-assert   0)
+   (header           gsf-header :inline    :offset-assert  16)
+   (index-kick-table uint16     80         :offset-assert  32)
+   (index-table      uint8      160        :offset         32)
+   (inverse-table    uint8      256        :offset-assert 192)
+   (vertex-table     gsf-vertex 72 :inline :offset-assert 448)
    )
   :method-count-assert 9
   :size-assert         #xac0
@@ -146,7 +146,7 @@
 
 ;; definition of type generic-merc-dcache
 (deftype generic-merc-dcache (structure)
-  ((output-a    generic-merc-output :inline :offset-assert 0)
+  ((output-a    generic-merc-output :inline :offset-assert   0)
    (output-b    generic-merc-output :inline :offset-assert 2752)
    (inv-table-1 uint8               544     :offset-assert 5504)
    (inv-table-7 uint8               544     :offset-assert 6048)
@@ -172,8 +172,8 @@
 
 ;; definition of type gm-shadow
 (deftype gm-shadow (structure)
-  ((perspective                matrix              :inline :offset-assert 0)
-   (isometric                  matrix              :inline :offset-assert 64)
+  ((perspective                matrix              :inline :offset-assert   0)
+   (isometric                  matrix              :inline :offset-assert  64)
    (inv-camera-rot             matrix              :inline :offset-assert 128)
    (envmap-shader              adgif-shader        :inline :offset-assert 192)
    (current-chain              uint32                      :offset-assert 272)
@@ -258,7 +258,7 @@
 
 ;; definition of type generic-merc-work
 (deftype generic-merc-work (structure)
-  ((input-a generic-merc-input         :inline :offset-assert 0)
+  ((input-a generic-merc-input         :inline :offset-assert   0)
    (input-b generic-merc-input         :inline :offset-assert 2976)
    (ctrl    generic-merc-ctrl-with-sfx :inline :offset-assert 5952)
    (shadow  gm-shadow                  :inline :offset-assert 6368)
diff --git a/test/decompiler/reference/engine/gfx/merc/merc-h_REF.gc b/test/decompiler/reference/engine/gfx/merc/merc-h_REF.gc
index ccfa1282f7..af79abaa5f 100644
--- a/test/decompiler/reference/engine/gfx/merc/merc-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/merc/merc-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type ripple-merc-query
 (deftype ripple-merc-query (inline-array-class)
-  ((start-vertex int32          :offset-assert 16)
-   (vertex-skip  int32          :offset-assert 20)
-   (vertex-count int32          :offset-assert 24)
-   (current-loc  int32          :offset-assert 28)
-   (data2        uint8 :dynamic :offset-assert 32)
+  ((start-vertex int32          :offset-assert  16)
+   (vertex-skip  int32          :offset-assert  20)
+   (vertex-count int32          :offset-assert  24)
+   (current-loc  int32          :offset-assert  28)
+   (data2        uint8 :dynamic :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -32,20 +32,20 @@
 
 ;; definition of type merc-byte-header
 (deftype merc-byte-header (structure)
-  ((srcdest-off        uint8    :offset-assert 0)
-   (rgba-off           uint8    :offset-assert 1)
-   (lump-off           uint8    :offset-assert 2)
-   (fp-off             uint8    :offset-assert 3)
-   (mat1-cnt           uint8    :offset-assert 4)
-   (mat2-cnt           uint8    :offset-assert 5)
-   (mat3-cnt           uint8    :offset-assert 6)
-   (samecopy-cnt       uint8    :offset-assert 7)
-   (crosscopy-cnt      uint8    :offset-assert 8)
-   (strip-len          uint8    :offset-assert 9)
-   (mm-quadword-fp-off uint8    :offset-assert 10)
-   (mm-quadword-size   uint8    :offset-assert 11)
-   (perc-off           uint8    :offset-assert 12)
-   (mat-slot           uint8 10 :offset-assert 13)
+  ((srcdest-off        uint8    :offset-assert   0)
+   (rgba-off           uint8    :offset-assert   1)
+   (lump-off           uint8    :offset-assert   2)
+   (fp-off             uint8    :offset-assert   3)
+   (mat1-cnt           uint8    :offset-assert   4)
+   (mat2-cnt           uint8    :offset-assert   5)
+   (mat3-cnt           uint8    :offset-assert   6)
+   (samecopy-cnt       uint8    :offset-assert   7)
+   (crosscopy-cnt      uint8    :offset-assert   8)
+   (strip-len          uint8    :offset-assert   9)
+   (mm-quadword-fp-off uint8    :offset-assert  10)
+   (mm-quadword-size   uint8    :offset-assert  11)
+   (perc-off           uint8    :offset-assert  12)
+   (mat-slot           uint8 10 :offset-assert  13)
    )
   :method-count-assert 9
   :size-assert         #x17
@@ -74,8 +74,8 @@
 
 ;; definition of type merc-fragment
 (deftype merc-fragment (structure)
-  ((header merc-byte-header :inline :offset-assert 0)
-   (rest   uint8            1       :offset-assert 23)
+  ((header merc-byte-header :inline :offset-assert   0)
+   (rest   uint8            1       :offset-assert  23)
    )
   :method-count-assert 10
   :size-assert         #x18
@@ -95,18 +95,18 @@
 
 ;; definition of type merc-vtx
 (deftype merc-vtx (structure)
-  ((mat-0 uint8  :offset-assert 0)
-   (mat-1 uint8  :offset-assert 1)
-   (nrm-x uint8  :offset-assert 2)
-   (pos-x uint8  :offset-assert 3)
-   (dst-0 uint8  :offset-assert 4)
-   (dst-1 uint8  :offset-assert 5)
-   (nrm-y uint8  :offset-assert 6)
-   (pos-y uint8  :offset-assert 7)
-   (tex-s uint8  :offset-assert 8)
-   (tex-t uint8  :offset-assert 9)
-   (nrm-z uint8  :offset-assert 10)
-   (pos-z uint8  :offset-assert 11)
+  ((mat-0 uint8  :offset-assert   0)
+   (mat-1 uint8  :offset-assert   1)
+   (nrm-x uint8  :offset-assert   2)
+   (pos-x uint8  :offset-assert   3)
+   (dst-0 uint8  :offset-assert   4)
+   (dst-1 uint8  :offset-assert   5)
+   (nrm-y uint8  :offset-assert   6)
+   (pos-y uint8  :offset-assert   7)
+   (tex-s uint8  :offset-assert   8)
+   (tex-t uint8  :offset-assert   9)
+   (nrm-z uint8  :offset-assert  10)
+   (pos-z uint8  :offset-assert  11)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -133,13 +133,13 @@
 
 ;; definition of type merc-fp-header
 (deftype merc-fp-header (structure)
-  ((x-add            float  :offset-assert 0)
-   (y-add            float  :offset-assert 4)
-   (z-add            float  :offset-assert 8)
-   (shader-cnt       uint8  :offset-assert 12)
-   (kick-info-offset uint8  :offset-assert 13)
-   (kick-info-step   uint8  :offset-assert 14)
-   (hword-cnt        uint8  :offset-assert 15)
+  ((x-add            float  :offset-assert   0)
+   (y-add            float  :offset-assert   4)
+   (z-add            float  :offset-assert   8)
+   (shader-cnt       uint8  :offset-assert  12)
+   (kick-info-offset uint8  :offset-assert  13)
+   (kick-info-step   uint8  :offset-assert  14)
+   (hword-cnt        uint8  :offset-assert  15)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -173,8 +173,8 @@
 
 ;; definition of type merc-mat-dest
 (deftype merc-mat-dest (structure)
-  ((matrix-number uint8  :offset-assert 0)
-   (matrix-dest   uint8  :offset-assert 1)
+  ((matrix-number uint8  :offset-assert   0)
+   (matrix-dest   uint8  :offset-assert   1)
    )
   :method-count-assert 9
   :size-assert         #x2
@@ -191,11 +191,11 @@
 
 ;; definition of type merc-fragment-control
 (deftype merc-fragment-control (structure)
-  ((unsigned-four-count uint8          :offset-assert 0)
-   (lump-four-count     uint8          :offset-assert 1)
-   (fp-qwc              uint8          :offset-assert 2)
-   (mat-xfer-count      uint8          :offset-assert 3)
-   (mat-dest-data       uint8 :dynamic :offset-assert 4)
+  ((unsigned-four-count uint8          :offset-assert   0)
+   (lump-four-count     uint8          :offset-assert   1)
+   (fp-qwc              uint8          :offset-assert   2)
+   (mat-xfer-count      uint8          :offset-assert   3)
+   (mat-dest-data       uint8 :dynamic :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -215,7 +215,7 @@
 
 ;; definition of type merc-blend-data
 (deftype merc-blend-data (structure)
-  ((int8-data int8 :dynamic :offset-assert 0)
+  ((int8-data int8 :dynamic :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x0
@@ -231,9 +231,9 @@
 
 ;; definition of type merc-blend-ctrl
 (deftype merc-blend-ctrl (structure)
-  ((blend-vtx-count     uint8          :offset-assert 0)
-   (nonzero-index-count uint8          :offset-assert 1)
-   (bt-index            uint8 :dynamic :offset-assert 2)
+  ((blend-vtx-count     uint8          :offset-assert   0)
+   (nonzero-index-count uint8          :offset-assert   1)
+   (bt-index            uint8 :dynamic :offset-assert   2)
    )
   :method-count-assert 9
   :size-assert         #x2
@@ -251,10 +251,10 @@
 
 ;; definition of type mei-envmap-tint
 (deftype mei-envmap-tint (structure)
-  ((fade0 float   :offset-assert 0)
-   (fade1 float   :offset-assert 4)
-   (tint  uint32  :offset-assert 8)
-   (dummy int32   :offset-assert 12)
+  ((fade0 float   :offset-assert   0)
+   (fade1 float   :offset-assert   4)
+   (tint  uint32  :offset-assert   8)
+   (dummy int32   :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -273,13 +273,13 @@
 
 ;; definition of type mei-texture-scroll
 (deftype mei-texture-scroll (structure)
-  ((max-dist     float   :offset-assert 0)
-   (st-int-scale uint8   :offset-assert 4)
-   (time-factor  uint8   :offset-assert 5)
-   (scroll-dir   uint8   :offset-assert 6)
-   (cached-time  uint8   :offset-assert 7)
-   (time-delta   uint8   :offset-assert 8)
-   (dummy        uint8 7 :offset-assert 9)
+  ((max-dist     float   :offset-assert   0)
+   (st-int-scale uint8   :offset-assert   4)
+   (time-factor  uint8   :offset-assert   5)
+   (scroll-dir   uint8   :offset-assert   6)
+   (cached-time  uint8   :offset-assert   7)
+   (time-delta   uint8   :offset-assert   8)
+   (dummy        uint8 7 :offset-assert   9)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -301,10 +301,10 @@
 
 ;; definition of type mei-ripple
 (deftype mei-ripple (structure)
-  ((x-base    float  :offset-assert 0)
-   (z-base    float  :offset-assert 4)
-   (grid-size float  :offset-assert 8)
-   (angle     float  :offset-assert 12)
+  ((x-base    float  :offset-assert   0)
+   (z-base    float  :offset-assert   4)
+   (grid-size float  :offset-assert   8)
+   (angle     float  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -323,11 +323,11 @@
 
 ;; definition of type merc-extra-info
 (deftype merc-extra-info (structure)
-  ((envmap-tint-offset    uint8    :offset-assert 0)
-   (shader-offset         uint8    :offset-assert 1)
-   (texture-scroll-offset uint8    :offset-assert 2)
-   (ripple-offset         uint8    :offset-assert 3)
-   (dummy                 uint8 12 :offset-assert 4)
+  ((envmap-tint-offset    uint8    :offset-assert   0)
+   (shader-offset         uint8    :offset-assert   1)
+   (texture-scroll-offset uint8    :offset-assert   2)
+   (ripple-offset         uint8    :offset-assert   3)
+   (dummy                 uint8 12 :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -347,19 +347,19 @@
 
 ;; definition of type merc-effect
 (deftype merc-effect (structure)
-  ((frag-geo         merc-fragment          :offset-assert 0)
-   (frag-ctrl        merc-fragment-control  :offset-assert 4)
-   (blend-data       merc-blend-data        :offset-assert 8)
-   (blend-ctrl       merc-blend-ctrl        :offset-assert 12)
-   (dummy0           uint8                  :offset-assert 16)
-   (effect-bits      uint8                  :offset-assert 17)
-   (frag-count       uint16                 :offset-assert 18)
-   (blend-frag-count uint16                 :offset-assert 20)
-   (tri-count        uint16                 :offset-assert 22)
-   (dvert-count      uint16                 :offset-assert 24)
-   (dummy1           uint8                  :offset-assert 26)
-   (envmap-usage     uint8                  :offset-assert 27)
-   (extra-info       merc-extra-info        :offset-assert 28)
+  ((frag-geo         merc-fragment          :offset-assert   0)
+   (frag-ctrl        merc-fragment-control  :offset-assert   4)
+   (blend-data       merc-blend-data        :offset-assert   8)
+   (blend-ctrl       merc-blend-ctrl        :offset-assert  12)
+   (dummy0           uint8                  :offset-assert  16)
+   (effect-bits      uint8                  :offset-assert  17)
+   (frag-count       uint16                 :offset-assert  18)
+   (blend-frag-count uint16                 :offset-assert  20)
+   (tri-count        uint16                 :offset-assert  22)
+   (dvert-count      uint16                 :offset-assert  24)
+   (dummy1           uint8                  :offset-assert  26)
+   (envmap-usage     uint8                  :offset-assert  27)
+   (extra-info       merc-extra-info        :offset-assert  28)
    )
   :method-count-assert 10
   :size-assert         #x20
@@ -394,13 +394,13 @@
 
 ;; definition of type merc-eye-ctrl
 (deftype merc-eye-ctrl (structure)
-  ((eye-slot      int8                               :offset-assert 0)
-   (shader-offset int8                               :offset-assert 1)
-   (shader-count  int8                               :offset-assert 2)
-   (iris-shader   adgif-shader :inline               :offset-assert 16)
-   (pupil-shader  adgif-shader :inline               :offset-assert 96)
-   (lid-shader    adgif-shader :inline               :offset-assert 176)
-   (shader        adgif-shader 3 :inline :offset  16)
+  ((eye-slot      int8                   :offset-assert   0)
+   (shader-offset int8                   :offset-assert   1)
+   (shader-count  int8                   :offset-assert   2)
+   (iris-shader   adgif-shader :inline   :offset-assert  16)
+   (pupil-shader  adgif-shader :inline   :offset-assert  96)
+   (lid-shader    adgif-shader :inline   :offset-assert 176)
+   (shader        adgif-shader 3 :inline :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x100
@@ -422,13 +422,13 @@
 
 ;; definition of type merc-eye-anim-frame
 (deftype merc-eye-anim-frame (structure)
-  ((pupil-trans-x int8               :offset-assert 0)
-   (pupil-trans-y int8               :offset-assert 1)
-   (blink         int8               :offset-assert 2)
-   (iris-scale    int8   :offset   4)
-   (pupil-scale   int8               :offset-assert 5)
-   (lid-scale     int8               :offset-assert 6)
-   (dword         uint64 :offset   0)
+  ((pupil-trans-x int8    :offset-assert   0)
+   (pupil-trans-y int8    :offset-assert   1)
+   (blink         int8    :offset-assert   2)
+   (iris-scale    int8    :offset          4)
+   (pupil-scale   int8    :offset-assert   5)
+   (lid-scale     int8    :offset-assert   6)
+   (dword         uint64  :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -450,8 +450,8 @@
 
 ;; definition of type merc-eye-anim-block
 (deftype merc-eye-anim-block (structure)
-  ((max-frame int16                      :offset-assert 0)
-   (data      uint8 :dynamic :offset   8)
+  ((max-frame int16          :offset-assert   0)
+   (data      uint8 :dynamic :offset          8)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -468,46 +468,46 @@
 
 ;; definition of type merc-ctrl-header
 (deftype merc-ctrl-header (structure)
-  ((xyz-scale              float                        :offset-assert 0)
-   (st-magic               uint32                       :offset-assert 4)
-   (st-out-a               uint32                       :offset-assert 8)
-   (st-out-b               uint32                       :offset-assert 12)
-   (st-vif-add             uint32                       :offset-assert 16)
-   (st-int-off             uint16                       :offset-assert 20)
-   (st-int-scale           uint16                       :offset-assert 22)
-   (effect-count           uint32                       :offset-assert 24)
-   (blend-target-count     uint32                       :offset-assert 28)
-   (fragment-count         uint16                       :offset-assert 32)
-   (tri-count              uint16                       :offset-assert 34)
-   (matrix-count           uint8                        :offset-assert 36)
-   (shader-count           uint8                        :offset-assert 37)
-   (transform-vertex-count uint16                       :offset-assert 38)
-   (dvert-count            uint16                       :offset-assert 40)
-   (one-mat-count          uint16                       :offset-assert 42)
-   (two-mat-count          uint16                       :offset-assert 44)
-   (two-mat-reuse-count    uint16                       :offset-assert 46)
-   (three-mat-count        uint16                       :offset-assert 48)
-   (three-mat-reuse-count  uint16                       :offset-assert 50)
-   (shader-upload-count    uint8                        :offset-assert 52)
-   (matrix-upload-count    uint8                        :offset-assert 53)
-   (same-copy-count        uint16                       :offset-assert 54)
-   (cross-copy-count       uint16                       :offset-assert 56)
-   (num-verts              uint16                       :offset-assert 58)
-   (longest-edge           float                        :offset-assert 60)
-   (eye-ctrl               merc-eye-ctrl                :offset-assert 64)
-   (masks                  uint32        3              :offset-assert 68)
-   (dummy-bytes            uint8         48 :offset  32)
-   (envmap-tint            uint32        :offset  32)
-   (query                  basic         :offset  36)
-   (needs-clip             uint8         :offset  40)
-   (use-isometric          uint8         :offset  41)
-   (use-attached-shader    uint8         :offset  42)
-   (display-triangles      uint8         :offset  43)
-   (death-vertex-skip      uint16        :offset  44)
-   (death-start-vertex     uint16        :offset  46)
-   (death-effect           uint32        :offset  48)
-   (use-translucent        uint8         :offset  52)
-   (display-this-fragment  uint8         :offset  53)
+  ((xyz-scale              float            :offset-assert   0)
+   (st-magic               uint32           :offset-assert   4)
+   (st-out-a               uint32           :offset-assert   8)
+   (st-out-b               uint32           :offset-assert  12)
+   (st-vif-add             uint32           :offset-assert  16)
+   (st-int-off             uint16           :offset-assert  20)
+   (st-int-scale           uint16           :offset-assert  22)
+   (effect-count           uint32           :offset-assert  24)
+   (blend-target-count     uint32           :offset-assert  28)
+   (fragment-count         uint16           :offset-assert  32)
+   (tri-count              uint16           :offset-assert  34)
+   (matrix-count           uint8            :offset-assert  36)
+   (shader-count           uint8            :offset-assert  37)
+   (transform-vertex-count uint16           :offset-assert  38)
+   (dvert-count            uint16           :offset-assert  40)
+   (one-mat-count          uint16           :offset-assert  42)
+   (two-mat-count          uint16           :offset-assert  44)
+   (two-mat-reuse-count    uint16           :offset-assert  46)
+   (three-mat-count        uint16           :offset-assert  48)
+   (three-mat-reuse-count  uint16           :offset-assert  50)
+   (shader-upload-count    uint8            :offset-assert  52)
+   (matrix-upload-count    uint8            :offset-assert  53)
+   (same-copy-count        uint16           :offset-assert  54)
+   (cross-copy-count       uint16           :offset-assert  56)
+   (num-verts              uint16           :offset-assert  58)
+   (longest-edge           float            :offset-assert  60)
+   (eye-ctrl               merc-eye-ctrl    :offset-assert  64)
+   (masks                  uint32        3  :offset-assert  68)
+   (dummy-bytes            uint8         48 :offset         32)
+   (envmap-tint            uint32           :offset         32)
+   (query                  basic            :offset         36)
+   (needs-clip             uint8            :offset         40)
+   (use-isometric          uint8            :offset         41)
+   (use-attached-shader    uint8            :offset         42)
+   (display-triangles      uint8            :offset         43)
+   (death-vertex-skip      uint16           :offset         44)
+   (death-start-vertex     uint16           :offset         46)
+   (death-effect           uint32           :offset         48)
+   (use-translucent        uint8            :offset         52)
+   (display-this-fragment  uint8            :offset         53)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -562,8 +562,8 @@
 
 ;; definition of type merc-ctrl
 (deftype merc-ctrl (art-element)
-  ((num-joints int32            :offset  20)
-   (header     merc-ctrl-header :inline          :offset-assert 32)
+  ((num-joints int32                             :offset         20)
+   (header     merc-ctrl-header :inline          :offset-assert  32)
    (effect     merc-effect      :inline :dynamic :offset-assert 112)
    )
   :method-count-assert 13
@@ -585,10 +585,10 @@
 
 ;; definition of type merc-vu1-low-mem
 (deftype merc-vu1-low-mem (structure)
-  ((tri-strip-gif qword   :inline :offset-assert 0)
-   (ad-gif        qword   :inline :offset-assert 16)
-   (hvdf-offset   vector  :inline :offset-assert 32)
-   (perspective   uint128 4       :offset-assert 48)
+  ((tri-strip-gif qword   :inline :offset-assert   0)
+   (ad-gif        qword   :inline :offset-assert  16)
+   (hvdf-offset   vector  :inline :offset-assert  32)
+   (perspective   uint128 4       :offset-assert  48)
    (fog           vector  :inline :offset-assert 112)
    )
   :method-count-assert 9
@@ -609,14 +609,14 @@
 
 ;; definition of type ripple-wave
 (deftype ripple-wave (structure)
-  ((scale float  :offset-assert 0)
-   (offs  float  :offset-assert 4)
-   (xdiv  int16  :offset-assert 8)
-   (zdiv  int16  :offset-assert 10)
-   (speed float  :offset-assert 12)
-   (xmul  float  :offset-assert 16)
-   (zmul  float  :offset-assert 20)
-   (delta float  :offset-assert 24)
+  ((scale float  :offset-assert   0)
+   (offs  float  :offset-assert   4)
+   (xdiv  int16  :offset-assert   8)
+   (zdiv  int16  :offset-assert  10)
+   (speed float  :offset-assert  12)
+   (xmul  float  :offset-assert  16)
+   (zmul  float  :offset-assert  20)
+   (delta float  :offset-assert  24)
    )
   :pack-me
   :method-count-assert 9
@@ -640,11 +640,11 @@
 
 ;; definition of type ripple-wave-set
 (deftype ripple-wave-set (basic)
-  ((count        int32                 :offset-assert 4)
-   (converted    basic                 :offset-assert 8)
-   (frame-save   uint32                :offset-assert 12)
-   (normal-scale float                 :offset-assert 16)
-   (wave         ripple-wave 4 :inline :offset-assert 20)
+  ((count        int32                 :offset-assert   4)
+   (converted    basic                 :offset-assert   8)
+   (frame-save   uint32                :offset-assert  12)
+   (normal-scale float                 :offset-assert  16)
+   (wave         ripple-wave 4 :inline :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x84
@@ -664,15 +664,15 @@
 
 ;; definition of type ripple-control
 (deftype ripple-control (basic)
-  ((global-scale            float            :offset-assert 4)
-   (last-frame-scale        float            :offset-assert 8)
-   (close-fade-dist         float            :offset-assert 12)
-   (far-fade-dist           float            :offset-assert 16)
-   (faded-scale             float            :offset-assert 20)
-   (individual-normal-scale float            :offset-assert 24)
-   (waveform                ripple-wave-set  :offset-assert 28)
-   (send-query              basic            :offset-assert 32)
-   (query                   basic            :offset-assert 36)
+  ((global-scale            float            :offset-assert   4)
+   (last-frame-scale        float            :offset-assert   8)
+   (close-fade-dist         float            :offset-assert  12)
+   (far-fade-dist           float            :offset-assert  16)
+   (faded-scale             float            :offset-assert  20)
+   (individual-normal-scale float            :offset-assert  24)
+   (waveform                ripple-wave-set  :offset-assert  28)
+   (send-query              basic            :offset-assert  32)
+   (query                   basic            :offset-assert  36)
    )
   :method-count-assert 9
   :size-assert         #x28
diff --git a/test/decompiler/reference/engine/gfx/mood-h_REF.gc b/test/decompiler/reference/engine/gfx/mood-h_REF.gc
index fe74e4c101..30bc29f0de 100644
--- a/test/decompiler/reference/engine/gfx/mood-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/mood-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type mood-fog
 (deftype mood-fog (structure)
-  ((fog-color   vector :inline     :offset-assert 0)
-   (fog-dists   vector :inline     :offset-assert 16)
-   (fog-start   float  :offset  16)
-   (fog-end     float  :offset  20)
-   (fog-max     float  :offset  24)
-   (fog-min     float  :offset  28)
-   (erase-color vector :inline     :offset-assert 32)
+  ((fog-color   vector :inline :offset-assert   0)
+   (fog-dists   vector :inline :offset-assert  16)
+   (fog-start   float          :offset         16)
+   (fog-end     float          :offset         20)
+   (fog-max     float          :offset         24)
+   (fog-min     float          :offset         28)
+   (erase-color vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -31,7 +31,7 @@
 
 ;; definition of type mood-fog-table
 (deftype mood-fog-table (structure)
-  ((data mood-fog 8 :inline :offset-assert 0)
+  ((data mood-fog 8 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x180
@@ -47,11 +47,11 @@
 
 ;; definition of type mood-lights
 (deftype mood-lights (structure)
-  ((direction vector :inline :offset-assert 0)
-   (lgt-color vector :inline :offset-assert 16)
-   (prt-color vector :inline :offset-assert 32)
-   (amb-color vector :inline :offset-assert 48)
-   (shadow    vector :inline :offset-assert 64)
+  ((direction vector :inline :offset-assert   0)
+   (lgt-color vector :inline :offset-assert  16)
+   (prt-color vector :inline :offset-assert  32)
+   (amb-color vector :inline :offset-assert  48)
+   (shadow    vector :inline :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -71,7 +71,7 @@
 
 ;; definition of type mood-lights-table
 (deftype mood-lights-table (structure)
-  ((data mood-lights 8 :inline :offset-assert 0)
+  ((data mood-lights 8 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x280
@@ -87,8 +87,8 @@
 
 ;; definition of type mood-sun
 (deftype mood-sun (structure)
-  ((sun-color vector :inline :offset-assert 0)
-   (env-color vector :inline :offset-assert 16)
+  ((sun-color vector :inline :offset-assert   0)
+   (env-color vector :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -105,7 +105,7 @@
 
 ;; definition of type mood-sun-table
 (deftype mood-sun-table (structure)
-  ((data mood-sun 8 :inline :offset-assert 0)
+  ((data mood-sun 8 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x100
@@ -121,14 +121,14 @@
 
 ;; definition of type mood-context
 (deftype mood-context (basic)
-  ((mood-fog-table       mood-fog-table              :offset-assert 4)
-   (mood-lights-table    mood-lights-table           :offset-assert 8)
-   (mood-sun-table       mood-sun-table              :offset-assert 12)
-   (fog-interp           sky-color-day               :offset-assert 16)
-   (palette-interp       sky-color-day               :offset-assert 20)
-   (sky-texture-interp   sky-color-day               :offset-assert 24)
-   (current-fog          mood-fog          :inline   :offset-assert 32)
-   (current-sun          mood-sun          :inline   :offset-assert 80)
+  ((mood-fog-table       mood-fog-table              :offset-assert   4)
+   (mood-lights-table    mood-lights-table           :offset-assert   8)
+   (mood-sun-table       mood-sun-table              :offset-assert  12)
+   (fog-interp           sky-color-day               :offset-assert  16)
+   (palette-interp       sky-color-day               :offset-assert  20)
+   (sky-texture-interp   sky-color-day               :offset-assert  24)
+   (current-fog          mood-fog          :inline   :offset-assert  32)
+   (current-sun          mood-sun          :inline   :offset-assert  80)
    (current-prt-color    vector            :inline   :offset-assert 112)
    (current-shadow       vector            :inline   :offset-assert 128)
    (current-shadow-color vector            :inline   :offset-assert 144)
diff --git a/test/decompiler/reference/engine/gfx/ocean/ocean-h_REF.gc b/test/decompiler/reference/engine/gfx/ocean/ocean-h_REF.gc
index 8a63afcab3..58ab9754c8 100644
--- a/test/decompiler/reference/engine/gfx/ocean/ocean-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/ocean/ocean-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type ocean-corner
 (deftype ocean-corner (structure)
-  ((bsphere      sphere :inline :offset-assert 0)
-   (start-corner vector :inline :offset-assert 16)
-   (y-scales     vector :inline :offset-assert 32)
-   (alphas       vector :inline :offset-assert 48)
-   (colors       uint32 4       :offset-assert 64)
+  ((bsphere      sphere :inline :offset-assert   0)
+   (start-corner vector :inline :offset-assert  16)
+   (y-scales     vector :inline :offset-assert  32)
+   (alphas       vector :inline :offset-assert  48)
+   (colors       uint32 4       :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -27,14 +27,14 @@
 
 ;; definition of type ocean-wave-info
 (deftype ocean-wave-info (structure)
-  ((frequency  float  :offset-assert 0)
-   (amplitude  float  :offset-assert 4)
-   (wave-speed float  :offset-assert 8)
-   (angle      float  :offset-assert 12)
-   (kx         float  :offset-assert 16)
-   (ky         float  :offset-assert 20)
-   (w          float  :offset-assert 24)
-   (flags      int32  :offset-assert 28)
+  ((frequency  float  :offset-assert   0)
+   (amplitude  float  :offset-assert   4)
+   (wave-speed float  :offset-assert   8)
+   (angle      float  :offset-assert  12)
+   (kx         float  :offset-assert  16)
+   (ky         float  :offset-assert  20)
+   (w          float  :offset-assert  24)
+   (flags      int32  :offset-assert  28)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -57,9 +57,9 @@
 
 ;; definition of type ocean-vertex
 (deftype ocean-vertex (structure)
-  ((pos vector :inline :offset-assert 0)
-   (stq vector :inline :offset-assert 16)
-   (col vector :inline :offset-assert 32)
+  ((pos vector :inline :offset-assert   0)
+   (stq vector :inline :offset-assert  16)
+   (col vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -77,7 +77,7 @@
 
 ;; definition of type ocean-spheres
 (deftype ocean-spheres (structure)
-  ((spheres sphere 36 :inline :offset-assert 0)
+  ((spheres sphere 36 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x240
@@ -93,7 +93,7 @@
 
 ;; definition of type ocean-colors
 (deftype ocean-colors (structure)
-  ((colors rgba 2548 :offset-assert 0)
+  ((colors rgba 2548 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x27d0
@@ -109,8 +109,8 @@
 
 ;; definition of type ocean-mid-mask
 (deftype ocean-mid-mask (structure)
-  ((mask  uint8  8           :offset-assert 0)
-   (dword uint64 :offset   0)
+  ((mask  uint8  8 :offset-assert   0)
+   (dword uint64   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -127,7 +127,7 @@
 
 ;; definition of type ocean-mid-indices
 (deftype ocean-mid-indices (basic)
-  ((data uint16 36 :offset-assert 4)
+  ((data uint16 36 :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x4c
@@ -143,7 +143,7 @@
 
 ;; definition of type ocean-mid-masks
 (deftype ocean-mid-masks (basic)
-  ((data uint32  :offset-assert 4)
+  ((data uint32  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -160,8 +160,8 @@
 
 ;; definition of type ocean-trans-mask
 (deftype ocean-trans-mask (structure)
-  ((mask uint16 4           :offset-assert 0)
-   (word uint64 :offset   0)
+  ((mask uint16 4 :offset-assert   0)
+   (word uint64   :offset          0)
    )
   :pack-me
   :method-count-assert 9
@@ -179,8 +179,8 @@
 
 ;; definition of type ocean-trans-index
 (deftype ocean-trans-index (structure)
-  ((parent int16  :offset-assert 0)
-   (child  int16  :offset-assert 2)
+  ((parent int16  :offset-assert   0)
+   (child  int16  :offset-assert   2)
    )
   :pack-me
   :method-count-assert 9
@@ -198,7 +198,7 @@
 
 ;; definition of type ocean-trans-indices
 (deftype ocean-trans-indices (basic)
-  ((data uint32 2304 :offset-assert 4)
+  ((data uint32 2304 :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x2404
@@ -214,7 +214,7 @@
 
 ;; definition of type ocean-near-index
 (deftype ocean-near-index (structure)
-  ((data uint16 16 :offset-assert 0)
+  ((data uint16 16 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -230,7 +230,7 @@
 
 ;; definition of type ocean-near-indices
 (deftype ocean-near-indices (basic)
-  ((data uint32  :offset-assert 4)
+  ((data uint32  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -246,10 +246,10 @@
 
 ;; definition of type ocean-near-colors
 (deftype ocean-near-colors (structure)
-  ((color0 vector :inline :offset-assert 0)
-   (color1 vector :inline :offset-assert 16)
-   (color2 vector :inline :offset-assert 32)
-   (color3 vector :inline :offset-assert 48)
+  ((color0 vector :inline :offset-assert   0)
+   (color1 vector :inline :offset-assert  16)
+   (color2 vector :inline :offset-assert  32)
+   (color3 vector :inline :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -268,14 +268,14 @@
 
 ;; definition of type ocean-map
 (deftype ocean-map (basic)
-  ((start-corner        vector        :inline :offset-assert 16)
-   (far-color           vector        :inline :offset-assert 32)
-   (ocean-spheres       ocean-spheres         :offset-assert 48)
-   (ocean-colors        ocean-colors          :offset-assert 52)
-   (ocean-mid-indices   basic                 :offset-assert 56)
-   (ocean-trans-indices basic                 :offset-assert 60)
-   (ocean-near-indices  basic                 :offset-assert 64)
-   (ocean-mid-masks     basic                 :offset-assert 68)
+  ((start-corner        vector        :inline :offset-assert  16)
+   (far-color           vector        :inline :offset-assert  32)
+   (ocean-spheres       ocean-spheres         :offset-assert  48)
+   (ocean-colors        ocean-colors          :offset-assert  52)
+   (ocean-mid-indices   basic                 :offset-assert  56)
+   (ocean-trans-indices basic                 :offset-assert  60)
+   (ocean-near-indices  basic                 :offset-assert  64)
+   (ocean-mid-masks     basic                 :offset-assert  68)
    )
   :method-count-assert 9
   :size-assert         #x48
@@ -302,7 +302,7 @@
 
 ;; definition of type ocean-trans-strip
 (deftype ocean-trans-strip (structure)
-  ((verts uint128 10 :offset-assert 0)
+  ((verts uint128 10 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #xa0
@@ -318,7 +318,7 @@
 
 ;; definition of type ocean-trans-strip-array
 (deftype ocean-trans-strip-array (structure)
-  ((data ocean-trans-strip 4 :inline :offset-assert 0)
+  ((data ocean-trans-strip 4 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x280
@@ -334,7 +334,7 @@
 
 ;; definition of type ocean-wave-data
 (deftype ocean-wave-data (structure)
-  ((data uint8 1024 :offset-assert 0)
+  ((data uint8 1024 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x400
@@ -350,7 +350,7 @@
 
 ;; definition of type ocean-wave-frames
 (deftype ocean-wave-frames (structure)
-  ((frame ocean-wave-data 64 :inline :offset-assert 0)
+  ((frame ocean-wave-data 64 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x10000
@@ -366,11 +366,11 @@
 
 ;; definition of type ocean-work
 (deftype ocean-work (basic)
-  ((deltas             vector           :inline    :offset-assert 16)
-   (map-min            vector           :inline    :offset-assert 32)
-   (map-max            vector           :inline    :offset-assert 48)
-   (interp             vector           :inline    :offset-assert 64)
-   (corner-array       ocean-corner     25 :inline :offset-assert 80)
+  ((deltas             vector           :inline    :offset-assert  16)
+   (map-min            vector           :inline    :offset-assert  32)
+   (map-max            vector           :inline    :offset-assert  48)
+   (interp             vector           :inline    :offset-assert  64)
+   (corner-array       ocean-corner     25 :inline :offset-assert  80)
    (corner-count       int32                       :offset-assert 2080)
    (temp-vecs          vector           4 :inline  :offset-assert 2096)
    (mid-mask-ptrs      pointer          36         :offset-assert 2160)
@@ -451,10 +451,10 @@
 
 ;; definition of type ocean-vu0-work
 (deftype ocean-vu0-work (structure)
-  ((scales      vector    :inline :offset-assert 0)
-   (mask-hi     vector4w  :inline :offset-assert 16)
-   (mask-lo     vector4w  :inline :offset-assert 32)
-   (lights      vu-lights :inline :offset-assert 48)
+  ((scales      vector    :inline :offset-assert   0)
+   (mask-hi     vector4w  :inline :offset-assert  16)
+   (mask-lo     vector4w  :inline :offset-assert  32)
+   (lights      vu-lights :inline :offset-assert  48)
    (wait-to-vu0 uint32            :offset-assert 160)
    )
   :method-count-assert 9
@@ -475,13 +475,13 @@
 
 ;; definition of type ocean-texture-constants
 (deftype ocean-texture-constants (structure)
-  ((giftag    qword    :inline :offset-assert 0)
-   (buffers   vector4w :inline :offset-assert 16)
-   (dests     vector4w :inline :offset-assert 32)
-   (start     vector   :inline :offset-assert 48)
-   (offsets   vector   :inline :offset-assert 64)
-   (constants vector   :inline :offset-assert 80)
-   (cam-nrm   vector   :inline :offset-assert 96)
+  ((giftag    qword    :inline :offset-assert   0)
+   (buffers   vector4w :inline :offset-assert  16)
+   (dests     vector4w :inline :offset-assert  32)
+   (start     vector   :inline :offset-assert  48)
+   (offsets   vector   :inline :offset-assert  64)
+   (constants vector   :inline :offset-assert  80)
+   (cam-nrm   vector   :inline :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -503,9 +503,9 @@
 
 ;; definition of type ocean-texture-work
 (deftype ocean-texture-work (structure)
-  ((sprite-tmpl  dma-gif-packet :inline :offset-assert 0)
-   (sprite-tmpl2 dma-gif-packet :inline :offset-assert 32)
-   (adgif-tmpl   dma-gif-packet :inline :offset-assert 64)
+  ((sprite-tmpl  dma-gif-packet :inline :offset-assert   0)
+   (sprite-tmpl2 dma-gif-packet :inline :offset-assert  32)
+   (adgif-tmpl   dma-gif-packet :inline :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -523,9 +523,9 @@
 
 ;; definition of type ocean-mid-vertex
 (deftype ocean-mid-vertex (structure)
-  ((stq vector :inline :offset-assert 0)
-   (col vector :inline :offset-assert 16)
-   (pos vector :inline :offset-assert 32)
+  ((stq vector :inline :offset-assert   0)
+   (col vector :inline :offset-assert  16)
+   (pos vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -543,13 +543,13 @@
 
 ;; definition of type ocean-mid-constants
 (deftype ocean-mid-constants (structure)
-  ((hmge-scale     vector       :inline :offset-assert 0)
-   (inv-hmge-scale vector       :inline :offset-assert 16)
-   (hvdf-offset    vector       :inline :offset-assert 32)
-   (fog            vector       :inline :offset-assert 48)
-   (constants      vector       :inline :offset-assert 64)
-   (constants2     vector       :inline :offset-assert 80)
-   (drw-fan        qword        :inline :offset-assert 96)
+  ((hmge-scale     vector       :inline :offset-assert   0)
+   (inv-hmge-scale vector       :inline :offset-assert  16)
+   (hvdf-offset    vector       :inline :offset-assert  32)
+   (fog            vector       :inline :offset-assert  48)
+   (constants      vector       :inline :offset-assert  64)
+   (constants2     vector       :inline :offset-assert  80)
+   (drw-fan        qword        :inline :offset-assert  96)
    (env-fan        qword        :inline :offset-assert 112)
    (drw-adgif      qword        :inline :offset-assert 128)
    (drw-texture    adgif-shader :inline :offset-assert 144)
@@ -599,8 +599,8 @@
 
 ;; definition of type ocean-mid-upload
 (deftype ocean-mid-upload (structure)
-  ((rot    matrix  :inline :offset-assert 0)
-   (matrix matrix  :inline :offset-assert 64)
+  ((rot    matrix  :inline :offset-assert   0)
+   (matrix matrix  :inline :offset-assert  64)
    (colors uint128 108     :offset-assert 128)
    (masks  uint128 2       :offset-assert 1856)
    )
@@ -621,8 +621,8 @@
 
 ;; definition of type ocean-mid-upload2
 (deftype ocean-mid-upload2 (structure)
-  ((rot    matrix   :inline :offset-assert 0)
-   (matrix matrix   :inline :offset-assert 64)
+  ((rot    matrix   :inline :offset-assert   0)
+   (matrix matrix   :inline :offset-assert  64)
    (count  vector4w :inline :offset-assert 128)
    (tex0   vector   :inline :offset-assert 144)
    (tex1   vector   :inline :offset-assert 160)
@@ -659,13 +659,13 @@
 
 ;; definition of type ocean-mid-work
 (deftype ocean-mid-work (structure)
-  ((env0    vector  :inline :offset-assert 0)
-   (env1    vector  :inline :offset-assert 16)
-   (env2    vector  :inline :offset-assert 32)
-   (hmg0    vector  :inline :offset-assert 48)
-   (hmg1    vector  :inline :offset-assert 64)
-   (hmg2    vector  :inline :offset-assert 80)
-   (indices uint128 16      :offset-assert 96)
+  ((env0    vector  :inline :offset-assert   0)
+   (env1    vector  :inline :offset-assert  16)
+   (env2    vector  :inline :offset-assert  32)
+   (hmg0    vector  :inline :offset-assert  48)
+   (hmg1    vector  :inline :offset-assert  64)
+   (hmg2    vector  :inline :offset-assert  80)
+   (indices uint128 16      :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x160
@@ -687,13 +687,13 @@
 
 ;; definition of type ocean-near-constants
 (deftype ocean-near-constants (structure)
-  ((hmge-scale     vector       :inline :offset-assert 0)
-   (inv-hmge-scale vector       :inline :offset-assert 16)
-   (hvdf-offset    vector       :inline :offset-assert 32)
-   (fog            vector       :inline :offset-assert 48)
-   (constants      vector       :inline :offset-assert 64)
-   (constants2     vector       :inline :offset-assert 80)
-   (constants3     vector       :inline :offset-assert 96)
+  ((hmge-scale     vector       :inline :offset-assert   0)
+   (inv-hmge-scale vector       :inline :offset-assert  16)
+   (hvdf-offset    vector       :inline :offset-assert  32)
+   (fog            vector       :inline :offset-assert  48)
+   (constants      vector       :inline :offset-assert  64)
+   (constants2     vector       :inline :offset-assert  80)
+   (constants3     vector       :inline :offset-assert  96)
    (constants4     vector       :inline :offset-assert 112)
    (drw-fan        qword        :inline :offset-assert 128)
    (drw2-fan       qword        :inline :offset-assert 144)
@@ -751,8 +751,8 @@
 
 ;; definition of type ocean-near-upload
 (deftype ocean-near-upload (structure)
-  ((rot          matrix            :inline :offset-assert 0)
-   (matrix       matrix            :inline :offset-assert 64)
+  ((rot          matrix            :inline :offset-assert   0)
+   (matrix       matrix            :inline :offset-assert  64)
    (masks        uint128           2       :offset-assert 128)
    (start-height vector4w          :inline :offset-assert 160)
    (start-st     vector            :inline :offset-assert 176)
@@ -781,9 +781,9 @@
 
 ;; definition of type ocean-near-vertex
 (deftype ocean-near-vertex (structure)
-  ((stq vector :inline :offset-assert 0)
-   (clr vector :inline :offset-assert 16)
-   (pos vector :inline :offset-assert 32)
+  ((stq vector :inline :offset-assert   0)
+   (clr vector :inline :offset-assert  16)
+   (pos vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -801,8 +801,8 @@
 
 ;; definition of type ocean-near-work
 (deftype ocean-near-work (structure)
-  ((verts-ptr vector  :inline :offset-assert 0)
-   (indices   uint128 16      :offset-assert 16)
+  ((verts-ptr vector  :inline :offset-assert   0)
+   (indices   uint128 16      :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x110
diff --git a/test/decompiler/reference/engine/gfx/ripple_REF.gc b/test/decompiler/reference/engine/gfx/ripple_REF.gc
index 13a414584d..61302f8f4e 100644
--- a/test/decompiler/reference/engine/gfx/ripple_REF.gc
+++ b/test/decompiler/reference/engine/gfx/ripple_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type ripple-request
 (deftype ripple-request (structure)
-  ((waveform ripple-wave  :offset-assert 0)
-   (effect   merc-effect  :offset-assert 4)
+  ((waveform ripple-wave  :offset-assert   0)
+   (effect   merc-effect  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -22,8 +22,8 @@
 
 ;; definition of type ripple-globals
 (deftype ripple-globals (structure)
-  ((count    int32                     :offset-assert 0)
-   (requests ripple-request 16 :inline :offset-assert 4)
+  ((count    int32                     :offset-assert   0)
+   (requests ripple-request 16 :inline :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x84
diff --git a/test/decompiler/reference/engine/gfx/shadow/shadow-h_REF.gc b/test/decompiler/reference/engine/gfx/shadow/shadow-h_REF.gc
index d94688657d..16bc179ce3 100644
--- a/test/decompiler/reference/engine/gfx/shadow/shadow-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/shadow/shadow-h_REF.gc
@@ -3,14 +3,14 @@
 
 ;; definition of type fake-shadow
 (deftype fake-shadow (structure)
-  ((px    float  :offset-assert 0)
-   (py    float  :offset-assert 4)
-   (pz    float  :offset-assert 8)
-   (scale float  :offset-assert 12)
-   (qx    float  :offset-assert 16)
-   (qy    float  :offset-assert 20)
-   (qz    float  :offset-assert 24)
-   (flags int32  :offset-assert 28)
+  ((px    float  :offset-assert   0)
+   (py    float  :offset-assert   4)
+   (pz    float  :offset-assert   8)
+   (scale float  :offset-assert  12)
+   (qx    float  :offset-assert  16)
+   (qy    float  :offset-assert  20)
+   (qz    float  :offset-assert  24)
+   (flags int32  :offset-assert  28)
    )
   :pack-me
   :method-count-assert 9
@@ -34,8 +34,8 @@
 
 ;; definition of type fake-shadow-buffer
 (deftype fake-shadow-buffer (basic)
-  ((num-shadows int32                  :offset-assert 4)
-   (data        fake-shadow 32 :inline :offset-assert 8)
+  ((num-shadows int32                  :offset-assert   4)
+   (data        fake-shadow 32 :inline :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x408
diff --git a/test/decompiler/reference/engine/gfx/shrub/shrubbery-h_REF.gc b/test/decompiler/reference/engine/gfx/shrub/shrubbery-h_REF.gc
index 3e7905129a..a486370870 100644
--- a/test/decompiler/reference/engine/gfx/shrub/shrubbery-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/shrub/shrubbery-h_REF.gc
@@ -3,7 +3,7 @@
 
 ;; definition of type billboard
 (deftype billboard (drawable)
-  ((flat adgif-shader :inline :offset-assert 32)
+  ((flat adgif-shader :inline :offset-assert  32)
    )
   :method-count-assert 18
   :size-assert         #x70
@@ -21,18 +21,18 @@
 
 ;; definition of type shrub-view-data
 (deftype shrub-view-data (structure)
-  ((data           uint128 3                   :offset-assert 0)
-   (texture-giftag qword   :inline :offset   0)
-   (consts         vector  :inline :offset  16)
-   (fog-clamp      vector  :inline :offset  32)
-   (tex-start-ptr  int32   :offset  16)
-   (gifbufsum      float   :offset  16)
-   (mtx-buf-ptr    int32   :offset  20)
-   (exp23          float   :offset  20)
-   (fog-0          float   :offset  24)
-   (fog-1          float   :offset  28)
-   (fog-min        float   :offset  32)
-   (fog-max        float   :offset  36)
+  ((data           uint128 3       :offset-assert   0)
+   (texture-giftag qword   :inline :offset          0)
+   (consts         vector  :inline :offset         16)
+   (fog-clamp      vector  :inline :offset         32)
+   (tex-start-ptr  int32           :offset         16)
+   (gifbufsum      float           :offset         16)
+   (mtx-buf-ptr    int32           :offset         20)
+   (exp23          float           :offset         20)
+   (fog-0          float           :offset         24)
+   (fog-1          float           :offset         28)
+   (fog-min        float           :offset         32)
+   (fog-max        float           :offset         36)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -59,16 +59,16 @@
 
 ;; definition of type shrubbery
 (deftype shrubbery (drawable)
-  ((textures (inline-array adgif-shader) :offset   4)
-   (header   qword                       :offset   8)
-   (obj-qwc  uint8                       :offset  12)
-   (vtx-qwc  uint8                       :offset  13)
-   (col-qwc  uint8                       :offset  14)
-   (stq-qwc  uint8                       :offset  15)
-   (obj      uint32                      :offset  16)
-   (vtx      uint32                      :offset  20)
-   (col      uint32                      :offset  24)
-   (stq      uint32                      :offset  28)
+  ((textures (inline-array adgif-shader)  :offset   4)
+   (header   qword                        :offset   8)
+   (obj-qwc  uint8                        :offset  12)
+   (vtx-qwc  uint8                        :offset  13)
+   (col-qwc  uint8                        :offset  14)
+   (stq-qwc  uint8                        :offset  15)
+   (obj      uint32                       :offset  16)
+   (vtx      uint32                       :offset  20)
+   (col      uint32                       :offset  24)
+   (stq      uint32                       :offset  28)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -95,9 +95,9 @@
 
 ;; definition of type instance-shrubbery
 (deftype instance-shrubbery (instance)
-  ((flat-normal vector :inline     :offset-assert 64)
-   (flat-hwidth float  :offset  76)
-   (color       uint32 :offset   8)
+  ((flat-normal vector :inline :offset-assert  64)
+   (flat-hwidth float          :offset         76)
+   (color       uint32         :offset          8)
    )
   :method-count-assert 18
   :size-assert         #x50
@@ -120,7 +120,7 @@
 
 ;; definition of type drawable-inline-array-instance-shrub
 (deftype drawable-inline-array-instance-shrub (drawable-inline-array)
-  ((data instance-shrubbery 1 :inline :offset-assert 32)
+  ((data instance-shrubbery 1 :inline :offset-assert  32)
    (pad  uint32                       :offset-assert 112)
    )
   :method-count-assert 18
@@ -138,16 +138,16 @@
 
 ;; definition of type generic-shrub-fragment
 (deftype generic-shrub-fragment (drawable)
-  ((textures (inline-array adgif-shader) :offset   4)
-   (vtx-cnt  uint32                      :offset   8)
-   (cnt-qwc  uint8                       :offset  12)
-   (vtx-qwc  uint8                       :offset  13)
-   (col-qwc  uint8                       :offset  14)
-   (stq-qwc  uint8                       :offset  15)
-   (cnt      uint32                      :offset  16)
-   (vtx      uint32                      :offset  20)
-   (col      uint32                      :offset  24)
-   (stq      uint32                      :offset  28)
+  ((textures (inline-array adgif-shader)  :offset   4)
+   (vtx-cnt  uint32                       :offset   8)
+   (cnt-qwc  uint8                        :offset  12)
+   (vtx-qwc  uint8                        :offset  13)
+   (col-qwc  uint8                        :offset  14)
+   (stq-qwc  uint8                        :offset  15)
+   (cnt      uint32                       :offset  16)
+   (vtx      uint32                       :offset  20)
+   (col      uint32                       :offset  24)
+   (stq      uint32                       :offset  28)
    )
   :method-count-assert 18
   :size-assert         #x20
@@ -174,8 +174,8 @@
 
 ;; definition of type prototype-shrubbery
 (deftype prototype-shrubbery (drawable-inline-array)
-  ((data generic-shrub-fragment 1 :inline :offset-assert 32)
-   (pad  uint32                           :offset-assert 64)
+  ((data generic-shrub-fragment 1 :inline :offset-assert  32)
+   (pad  uint32                           :offset-assert  64)
    )
   :method-count-assert 18
   :size-assert         #x44
@@ -200,8 +200,8 @@
 
 ;; definition of type shrubbery-matrix
 (deftype shrubbery-matrix (structure)
-  ((mat   matrix :inline :offset-assert 0)
-   (color qword  :inline :offset-assert 64)
+  ((mat   matrix :inline :offset-assert   0)
+   (color qword  :inline :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -265,13 +265,13 @@
 
 ;; definition of type shrub-near-packet
 (deftype shrub-near-packet (structure)
-  ((matrix-tmpl dma-packet :inline :offset-assert 0)
-   (header-tmpl dma-packet :inline :offset-assert 16)
-   (stq-tmpl    dma-packet :inline :offset-assert 32)
-   (color-tmpl  dma-packet :inline :offset-assert 48)
-   (vertex-tmpl dma-packet :inline :offset-assert 64)
-   (mscal-tmpl  dma-packet :inline :offset-assert 80)
-   (init-tmpl   dma-packet :inline :offset-assert 96)
+  ((matrix-tmpl dma-packet :inline :offset-assert   0)
+   (header-tmpl dma-packet :inline :offset-assert  16)
+   (stq-tmpl    dma-packet :inline :offset-assert  32)
+   (color-tmpl  dma-packet :inline :offset-assert  48)
+   (vertex-tmpl dma-packet :inline :offset-assert  64)
+   (mscal-tmpl  dma-packet :inline :offset-assert  80)
+   (init-tmpl   dma-packet :inline :offset-assert  96)
    (init-data   uint32     8       :offset-assert 112)
    )
   :method-count-assert 9
@@ -295,66 +295,66 @@
 
 ;; definition of type instance-shrub-work
 (deftype instance-shrub-work (structure)
-  ((dummy                     uint128           3              :offset-assert 0)
-   (chaina                    uint128           8              :offset-assert 48)
-   (chainb                    uint128           8              :offset-assert 176)
-   (colors                    rgba              1024           :offset-assert 304)
-   (matrix-tmpl               uint128           20             :offset-assert 4400)
-   (count-tmpl                uint128           20             :offset-assert 4720)
-   (mscalf-tmpl               dma-packet        :inline        :offset-assert 5040)
-   (mscalf-ret-tmpl           dma-packet        :inline        :offset-assert 5056)
-   (adgif-tmpl                dma-gif-packet    :inline        :offset-assert 5072)
-   (billboard-tmpl            dma-gif-packet    :inline        :offset-assert 5104)
-   (billboard-const           vector            :inline        :offset-assert 5136)
-   (shrub-near-packets        shrub-near-packet 6 :inline      :offset-assert 5152)
-   (dma-ref                   dma-packet        :inline        :offset-assert 6016)
-   (dma-end                   dma-packet        :inline        :offset-assert 6032)
-   (wind-const                vector            :inline        :offset-assert 6048)
-   (constants                 vector            :inline        :offset-assert 6064)
-   (color-constant            vector4w          :inline        :offset-assert 6080)
-   (hmge-d                    vector            :inline        :offset-assert 6096)
-   (hvdf-offset               vector            :inline        :offset-assert 6112)
-   (wind-force                vector            :inline        :offset-assert 6128)
-   (color                     vector            :inline        :offset-assert 6144)
-   (bb-color                  vector            :inline        :offset-assert 6160)
-   (min-dist                  vector            :inline        :offset-assert 6176)
-   (temp-vec                  vector            :inline        :offset-assert 6192)
-   (guard-plane               plane             4 :inline      :offset-assert 6208)
-   (plane                     plane             4 :inline      :offset-assert 6272)
-   (last                      uint32            4              :offset-assert 6336)
-   (next                      uint32            4              :offset-assert 6352)
-   (count                     uint16            4              :offset-assert 6368)
-   (mod-count                 uint16            4              :offset-assert 6376)
-   (wind-vectors              uint32                           :offset-assert 6384)
-   (instance-ptr              uint32                           :offset-assert 6388)
-   (chain-ptr                 uint32                           :offset-assert 6392)
-   (chain-ptr-next            uint32                           :offset-assert 6396)
-   (stack-ptr                 uint32                           :offset-assert 6400)
-   (bucket-ptr                uint32                           :offset-assert 6404)
-   (src-ptr                   uint32                           :offset-assert 6408)
-   (to-spr                    uint32                           :offset-assert 6412)
-   (from-spr                  uint32                           :offset-assert 6416)
-   (shrub-count               uint32                           :offset-assert 6420)
-   (node                      uint32            6 :offset 6428)
-   (length                    uint32            6              :offset-assert 6452)
-   (prototypes                uint32                           :offset-assert 6476)
-   (start-bank                uint8             20 :offset 6484)
-   (buffer-index              uint32                           :offset-assert 6504)
-   (current-spr               uint32                           :offset-assert 6508)
-   (current-mem               uint32                           :offset-assert 6512)
-   (current-shrub-near-packet uint32                           :offset-assert 6516)
-   (dma-buffer                basic             :offset 6524)
-   (near-last                 uint32                           :offset-assert 6528)
-   (near-next                 uint32                           :offset-assert 6532)
-   (near-count                uint32                           :offset-assert 6536)
-   (last-shrubs               uint32                           :offset-assert 6540)
-   (chains                    uint32                           :offset-assert 6544)
-   (flags                     uint32                           :offset-assert 6548)
-   (paused                    basic                            :offset-assert 6552)
-   (node-count                uint32                           :offset-assert 6556)
-   (inst-count                uint32                           :offset-assert 6560)
-   (wait-from-spr             uint32                           :offset-assert 6564)
-   (wait-to-spr               uint32                           :offset-assert 6568)
+  ((dummy                     uint128           3         :offset-assert   0)
+   (chaina                    uint128           8         :offset-assert  48)
+   (chainb                    uint128           8         :offset-assert 176)
+   (colors                    rgba              1024      :offset-assert 304)
+   (matrix-tmpl               uint128           20        :offset-assert 4400)
+   (count-tmpl                uint128           20        :offset-assert 4720)
+   (mscalf-tmpl               dma-packet        :inline   :offset-assert 5040)
+   (mscalf-ret-tmpl           dma-packet        :inline   :offset-assert 5056)
+   (adgif-tmpl                dma-gif-packet    :inline   :offset-assert 5072)
+   (billboard-tmpl            dma-gif-packet    :inline   :offset-assert 5104)
+   (billboard-const           vector            :inline   :offset-assert 5136)
+   (shrub-near-packets        shrub-near-packet 6 :inline :offset-assert 5152)
+   (dma-ref                   dma-packet        :inline   :offset-assert 6016)
+   (dma-end                   dma-packet        :inline   :offset-assert 6032)
+   (wind-const                vector            :inline   :offset-assert 6048)
+   (constants                 vector            :inline   :offset-assert 6064)
+   (color-constant            vector4w          :inline   :offset-assert 6080)
+   (hmge-d                    vector            :inline   :offset-assert 6096)
+   (hvdf-offset               vector            :inline   :offset-assert 6112)
+   (wind-force                vector            :inline   :offset-assert 6128)
+   (color                     vector            :inline   :offset-assert 6144)
+   (bb-color                  vector            :inline   :offset-assert 6160)
+   (min-dist                  vector            :inline   :offset-assert 6176)
+   (temp-vec                  vector            :inline   :offset-assert 6192)
+   (guard-plane               plane             4 :inline :offset-assert 6208)
+   (plane                     plane             4 :inline :offset-assert 6272)
+   (last                      uint32            4         :offset-assert 6336)
+   (next                      uint32            4         :offset-assert 6352)
+   (count                     uint16            4         :offset-assert 6368)
+   (mod-count                 uint16            4         :offset-assert 6376)
+   (wind-vectors              uint32                      :offset-assert 6384)
+   (instance-ptr              uint32                      :offset-assert 6388)
+   (chain-ptr                 uint32                      :offset-assert 6392)
+   (chain-ptr-next            uint32                      :offset-assert 6396)
+   (stack-ptr                 uint32                      :offset-assert 6400)
+   (bucket-ptr                uint32                      :offset-assert 6404)
+   (src-ptr                   uint32                      :offset-assert 6408)
+   (to-spr                    uint32                      :offset-assert 6412)
+   (from-spr                  uint32                      :offset-assert 6416)
+   (shrub-count               uint32                      :offset-assert 6420)
+   (node                      uint32            6         :offset        6428)
+   (length                    uint32            6         :offset-assert 6452)
+   (prototypes                uint32                      :offset-assert 6476)
+   (start-bank                uint8             20        :offset        6484)
+   (buffer-index              uint32                      :offset-assert 6504)
+   (current-spr               uint32                      :offset-assert 6508)
+   (current-mem               uint32                      :offset-assert 6512)
+   (current-shrub-near-packet uint32                      :offset-assert 6516)
+   (dma-buffer                basic                       :offset        6524)
+   (near-last                 uint32                      :offset-assert 6528)
+   (near-next                 uint32                      :offset-assert 6532)
+   (near-count                uint32                      :offset-assert 6536)
+   (last-shrubs               uint32                      :offset-assert 6540)
+   (chains                    uint32                      :offset-assert 6544)
+   (flags                     uint32                      :offset-assert 6548)
+   (paused                    basic                       :offset-assert 6552)
+   (node-count                uint32                      :offset-assert 6556)
+   (inst-count                uint32                      :offset-assert 6560)
+   (wait-from-spr             uint32                      :offset-assert 6564)
+   (wait-to-spr               uint32                      :offset-assert 6568)
    )
   :method-count-assert 9
   :size-assert         #x19ac
@@ -444,7 +444,7 @@
 
 ;; definition of type instance-shrub-dma
 (deftype instance-shrub-dma (structure)
-  ((instancea uint128 325 :offset-assert 0)
+  ((instancea uint128 325 :offset-assert   0)
    (instanceb uint128 325 :offset-assert 5200)
    (outa      uint128 128 :offset-assert 10400)
    (outb      uint128 128 :offset-assert 12448)
diff --git a/test/decompiler/reference/engine/gfx/sky/sky-h_REF.gc b/test/decompiler/reference/engine/gfx/sky/sky-h_REF.gc
index dfba764fb2..6d5be6c41d 100644
--- a/test/decompiler/reference/engine/gfx/sky/sky-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/sky/sky-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type sky-color-hour
 (deftype sky-color-hour (structure)
-  ((snapshot1   int32  :offset-assert 0)
-   (snapshot2   int32  :offset-assert 4)
-   (morph-start float  :offset-assert 8)
-   (morph-end   float  :offset-assert 12)
+  ((snapshot1   int32  :offset-assert   0)
+   (snapshot2   int32  :offset-assert   4)
+   (morph-start float  :offset-assert   8)
+   (morph-end   float  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -25,7 +25,7 @@
 
 ;; definition of type sky-color-day
 (deftype sky-color-day (structure)
-  ((hour sky-color-hour 24 :inline :offset-assert 0)
+  ((hour sky-color-hour 24 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x180
@@ -41,7 +41,7 @@
 
 ;; definition of type sky-circle-data
 (deftype sky-circle-data (structure)
-  ((data vector 17 :inline :offset-assert 0)
+  ((data vector 17 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x110
@@ -57,17 +57,17 @@
 
 ;; definition of type sky-sun-data
 (deftype sky-sun-data (structure)
-  ((data           uint128 4                   :offset-assert 0)
-   (pos            vector  :inline :offset   0)
-   (r-sun          float   :offset  16)
-   (r-halo         float   :offset  20)
-   (r-aurora       float   :offset  24)
-   (c-sun-start    uint32  :offset  32)
-   (c-sun-end      uint32  :offset  48)
-   (c-halo-start   uint32  :offset  36)
-   (c-halo-end     uint32  :offset  52)
-   (c-aurora-start uint32  :offset  40)
-   (c-aurora-end   uint32  :offset  56)
+  ((data           uint128 4       :offset-assert   0)
+   (pos            vector  :inline :offset          0)
+   (r-sun          float           :offset         16)
+   (r-halo         float           :offset         20)
+   (r-aurora       float           :offset         24)
+   (c-sun-start    uint32          :offset         32)
+   (c-sun-end      uint32          :offset         48)
+   (c-halo-start   uint32          :offset         36)
+   (c-halo-end     uint32          :offset         52)
+   (c-aurora-start uint32          :offset         40)
+   (c-aurora-end   uint32          :offset         56)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -93,9 +93,9 @@
 
 ;; definition of type sky-moon-data
 (deftype sky-moon-data (structure)
-  ((data  uint128 2                   :offset-assert 0)
-   (pos   vector  :inline :offset   0)
-   (scale vector  :inline :offset  16)
+  ((data  uint128 2       :offset-assert   0)
+   (pos   vector  :inline :offset          0)
+   (scale vector  :inline :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -113,12 +113,12 @@
 
 ;; definition of type sky-orbit
 (deftype sky-orbit (structure)
-  ((high-noon float  :offset-assert 0)
-   (tilt      float  :offset-assert 4)
-   (rise      float  :offset-assert 8)
-   (dist      float  :offset-assert 12)
-   (min-halo  float  :offset-assert 16)
-   (max-halo  float  :offset-assert 20)
+  ((high-noon float  :offset-assert   0)
+   (tilt      float  :offset-assert   4)
+   (rise      float  :offset-assert   8)
+   (dist      float  :offset-assert  12)
+   (min-halo  float  :offset-assert  16)
+   (max-halo  float  :offset-assert  20)
    )
   :allow-misaligned  :method-count-assert 9
   :size-assert         #x18
@@ -139,10 +139,10 @@
 
 ;; definition of type sky-upload-data
 (deftype sky-upload-data (basic)
-  ((circle sky-circle-data :inline        :offset-assert 16)
-   (sun    sky-sun-data    2 :inline      :offset-assert 288)
-   (moon   sky-moon-data   :inline        :offset-assert 416)
-   (data   uint128         27 :offset  16)
+  ((circle sky-circle-data :inline   :offset-assert  16)
+   (sun    sky-sun-data    2 :inline :offset-assert 288)
+   (moon   sky-moon-data   :inline   :offset-assert 416)
+   (data   uint128         27        :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x1c0
@@ -161,7 +161,7 @@
 
 ;; definition of type sky-parms
 (deftype sky-parms (basic)
-  ((orbit             sky-orbit       3 :inline :offset-assert 4)
+  ((orbit             sky-orbit       3 :inline :offset-assert   4)
    (upload-data       sky-upload-data :inline   :offset-assert 112)
    (sun-lights        light-group     :inline   :offset-assert 560)
    (moon-lights       light-group     :inline   :offset-assert 752)
@@ -226,11 +226,11 @@
 
 ;; definition of type sky-tng-data
 (deftype sky-tng-data (basic)
-  ((giftag-base  qword  :inline :offset-assert 16)
-   (giftag-roof  qword  :inline :offset-assert 32)
-   (giftag-ocean qword  :inline :offset-assert 48)
-   (fog          vector :inline :offset-assert 64)
-   (sky          uint32 8       :offset-assert 80)
+  ((giftag-base  qword  :inline :offset-assert  16)
+   (giftag-roof  qword  :inline :offset-assert  32)
+   (giftag-ocean qword  :inline :offset-assert  48)
+   (fog          vector :inline :offset-assert  64)
+   (sky          uint32 8       :offset-assert  80)
    (time         float          :offset-assert 112)
    (off-s-0      uint16         :offset-assert 116)
    (off-t-0      uint16         :offset-assert 118)
@@ -260,10 +260,10 @@
 
 ;; definition of type sky-work
 (deftype sky-work (structure)
-  ((adgif-tmpl dma-gif-packet :inline :offset-assert 0)
-   (draw-tmpl  dma-gif-packet :inline :offset-assert 32)
-   (blend-tmpl dma-gif-packet :inline :offset-assert 64)
-   (sky-data   uint128        5       :offset-assert 96)
+  ((adgif-tmpl dma-gif-packet :inline :offset-assert   0)
+   (draw-tmpl  dma-gif-packet :inline :offset-assert  32)
+   (blend-tmpl dma-gif-packet :inline :offset-assert  64)
+   (sky-data   uint128        5       :offset-assert  96)
    (cloud-data uint128        5       :offset-assert 176)
    )
   :method-count-assert 9
@@ -284,9 +284,9 @@
 
 ;; definition of type sky-vertex
 (deftype sky-vertex (structure)
-  ((pos vector :inline :offset-assert 0)
-   (stq vector :inline :offset-assert 16)
-   (col vector :inline :offset-assert 32)
+  ((pos vector :inline :offset-assert   0)
+   (stq vector :inline :offset-assert  16)
+   (col vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
diff --git a/test/decompiler/reference/engine/gfx/sparticle/sparticle-h_REF.gc b/test/decompiler/reference/engine/gfx/sparticle/sparticle-h_REF.gc
index e0ce563371..a241e7eae9 100644
--- a/test/decompiler/reference/engine/gfx/sparticle/sparticle-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/sparticle/sparticle-h_REF.gc
@@ -17,37 +17,37 @@
 
 ;; definition of type sparticle-cpuinfo
 (deftype sparticle-cpuinfo (structure)
-  ((sprite        sprite-vec-data-2d                         :offset-assert 0)
-   (adgif         adgif-shader                               :offset-assert 4)
-   (radius        float                                      :offset-assert 8)
-   (omega         float                                      :offset-assert 12)
-   (vel-sxvel     vector                 :inline             :offset-assert 16)
-   (rot-syvel     vector                 :inline             :offset-assert 32)
-   (fade          rgbaf                  :inline             :offset-assert 48)
-   (acc           vector                 :inline             :offset-assert 64)
-   (rotvel3d      quaternion             :inline             :offset-assert 80)
-   (vel           vector3s               :inline :offset  16)
-   (accel         vector3s               :inline :offset  64)
-   (scalevelx     float                  :offset  28)
-   (scalevely     float                  :offset  44)
-   (friction      float                                      :offset-assert 96)
-   (timer         int32                                      :offset-assert 100)
-   (flags         uint32                                     :offset-assert 104)
-   (user-int32    int32                                      :offset-assert 108)
-   (user-uint32   uint32                 :offset 108)
-   (user-float    float                  :offset 108)
-   (user-pntr     uint32                 :offset 108)
-   (user-sprite   sprite-vec-data-2d     :offset 108)
-   (func          basic                                      :offset-assert 112)
-   (next-time     uint32                                     :offset-assert 116)
-   (next-launcher basic                                      :offset-assert 120)
-   (cache-alpha   float                                      :offset-assert 124)
-   (valid         basic                                      :offset-assert 128)
-   (key           basic                                      :offset-assert 132)
-   (binding       sparticle-launch-state                     :offset-assert 136)
-   (data          uint32                 1 :offset  12)
-   (dataf         float                  1 :offset  12)
-   (datac         uint8                  1 :offset  12)
+  ((sprite        sprite-vec-data-2d             :offset-assert   0)
+   (adgif         adgif-shader                   :offset-assert   4)
+   (radius        float                          :offset-assert   8)
+   (omega         float                          :offset-assert  12)
+   (vel-sxvel     vector                 :inline :offset-assert  16)
+   (rot-syvel     vector                 :inline :offset-assert  32)
+   (fade          rgbaf                  :inline :offset-assert  48)
+   (acc           vector                 :inline :offset-assert  64)
+   (rotvel3d      quaternion             :inline :offset-assert  80)
+   (vel           vector3s               :inline :offset         16)
+   (accel         vector3s               :inline :offset         64)
+   (scalevelx     float                          :offset         28)
+   (scalevely     float                          :offset         44)
+   (friction      float                          :offset-assert  96)
+   (timer         int32                          :offset-assert 100)
+   (flags         uint32                         :offset-assert 104)
+   (user-int32    int32                          :offset-assert 108)
+   (user-uint32   uint32                         :offset        108)
+   (user-float    float                          :offset        108)
+   (user-pntr     uint32                         :offset        108)
+   (user-sprite   sprite-vec-data-2d             :offset        108)
+   (func          basic                          :offset-assert 112)
+   (next-time     uint32                         :offset-assert 116)
+   (next-launcher basic                          :offset-assert 120)
+   (cache-alpha   float                          :offset-assert 124)
+   (valid         basic                          :offset-assert 128)
+   (key           basic                          :offset-assert 132)
+   (binding       sparticle-launch-state         :offset-assert 136)
+   (data          uint32                 1       :offset         12)
+   (dataf         float                  1       :offset         12)
+   (datac         uint8                  1       :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x8c
@@ -97,11 +97,11 @@
 
 ;; definition of type sparticle-launchinfo
 (deftype sparticle-launchinfo (structure)
-  ((launchrot  vector :inline       :offset-assert 0)
-   (conerot    vector :inline       :offset-assert 16)
-   (coneradius float                :offset-assert 32)
-   (rotate-y   float                :offset-assert 36)
-   (data       uint8  1 :offset   0)
+  ((launchrot  vector :inline :offset-assert   0)
+   (conerot    vector :inline :offset-assert  16)
+   (coneradius float          :offset-assert  32)
+   (rotate-y   float          :offset-assert  36)
+   (data       uint8  1       :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x28
@@ -121,15 +121,15 @@
 
 ;; definition of type sparticle-system
 (deftype sparticle-system (basic)
-  ((blocks          uint32 2 :offset-assert 4)
-   (length          uint32 2 :offset-assert 12)
-   (num-alloc       uint32 2 :offset-assert 20)
-   (is-3d           basic    :offset-assert 28)
-   (flags           uint32   :offset-assert 32)
-   (alloc-table     uint32   :offset-assert 36)
-   (cpuinfo-table   uint32   :offset-assert 40)
-   (vecdata-table   uint32   :offset-assert 44)
-   (adgifdata-table uint32   :offset-assert 48)
+  ((blocks          uint32 2 :offset-assert   4)
+   (length          uint32 2 :offset-assert  12)
+   (num-alloc       uint32 2 :offset-assert  20)
+   (is-3d           basic    :offset-assert  28)
+   (flags           uint32   :offset-assert  32)
+   (alloc-table     uint32   :offset-assert  36)
+   (cpuinfo-table   uint32   :offset-assert  40)
+   (vecdata-table   uint32   :offset-assert  44)
+   (adgifdata-table uint32   :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x34
diff --git a/test/decompiler/reference/engine/gfx/sparticle/sparticle-launcher-h_REF.gc b/test/decompiler/reference/engine/gfx/sparticle/sparticle-launcher-h_REF.gc
index 426eafcbad..fcb4fae8ea 100644
--- a/test/decompiler/reference/engine/gfx/sparticle/sparticle-launcher-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/sparticle/sparticle-launcher-h_REF.gc
@@ -3,19 +3,19 @@
 
 ;; definition of type sp-field-init-spec
 (deftype sp-field-init-spec (structure)
-  ((field          uint16             :offset-assert 0)
-   (flags          uint16             :offset-assert 2)
-   (initial-valuef float              :offset-assert 4)
-   (random-rangef  float              :offset-assert 8)
-   (random-multf   float              :offset-assert 12)
-   (initial-value  int32  :offset   4)
-   (random-range   int32  :offset   8)
-   (random-mult    int32  :offset  12)
-   (func           basic  :offset   4)
-   (tex            uint32 :offset   4)
-   (pntr           uint32 :offset   4)
-   (sym            basic  :offset   4)
-   (sound          basic  :offset   4)
+  ((field          uint16  :offset-assert   0)
+   (flags          uint16  :offset-assert   2)
+   (initial-valuef float   :offset-assert   4)
+   (random-rangef  float   :offset-assert   8)
+   (random-multf   float   :offset-assert  12)
+   (initial-value  int32   :offset          4)
+   (random-range   int32   :offset          8)
+   (random-mult    int32   :offset         12)
+   (func           basic   :offset          4)
+   (tex            uint32  :offset          4)
+   (pntr           uint32  :offset          4)
+   (sym            basic   :offset          4)
+   (sound          basic   :offset          4)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -43,9 +43,9 @@
 
 ;; definition of type sparticle-launcher
 (deftype sparticle-launcher (basic)
-  ((birthaccum float   :offset-assert 4)
-   (soundaccum float   :offset-assert 8)
-   (init-specs uint32  :offset-assert 12)
+  ((birthaccum float   :offset-assert   4)
+   (soundaccum float   :offset-assert   8)
+   (init-specs uint32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -63,15 +63,15 @@
 
 ;; definition of type sparticle-group-item
 (deftype sparticle-group-item (structure)
-  ((launcher   uint32  :offset-assert 0)
-   (fade-after float   :offset-assert 4)
-   (falloff-to float   :offset-assert 8)
-   (flags      uint16  :offset-assert 12)
-   (period     uint16  :offset-assert 14)
-   (length     uint16  :offset-assert 16)
-   (offset     uint16  :offset-assert 18)
-   (hour-mask  uint32  :offset-assert 20)
-   (binding    uint32  :offset-assert 24)
+  ((launcher   uint32  :offset-assert   0)
+   (fade-after float   :offset-assert   4)
+   (falloff-to float   :offset-assert   8)
+   (flags      uint16  :offset-assert  12)
+   (period     uint16  :offset-assert  14)
+   (length     uint16  :offset-assert  16)
+   (offset     uint16  :offset-assert  18)
+   (hour-mask  uint32  :offset-assert  20)
+   (binding    uint32  :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -95,20 +95,20 @@
 
 ;; definition of type sparticle-launch-state
 (deftype sparticle-launch-state (structure)
-  ((group-item sparticle-group-item             :offset-assert 0)
-   (flags      uint16                           :offset-assert 4)
-   (randomize  uint16                           :offset-assert 6)
-   (origin     vector                           :offset-assert 8)
-   (sprite3d   sprite-vec-data-3d               :offset-assert 12)
-   (sprite     basic                            :offset-assert 16)
-   (offset     uint32                           :offset-assert 20)
-   (accum      float                            :offset-assert 24)
-   (spawn-time uint32                           :offset-assert 28)
-   (swarm      basic                :offset  20)
-   (seed       uint32               :offset  24)
-   (time       uint32               :offset  28)
-   (spec       basic                :offset  16)
-   (id         uint32               :offset  12)
+  ((group-item sparticle-group-item  :offset-assert   0)
+   (flags      uint16                :offset-assert   4)
+   (randomize  uint16                :offset-assert   6)
+   (origin     vector                :offset-assert   8)
+   (sprite3d   sprite-vec-data-3d    :offset-assert  12)
+   (sprite     basic                 :offset-assert  16)
+   (offset     uint32                :offset-assert  20)
+   (accum      float                 :offset-assert  24)
+   (spawn-time uint32                :offset-assert  28)
+   (swarm      basic                 :offset         20)
+   (seed       uint32                :offset         24)
+   (time       uint32                :offset         28)
+   (spec       basic                 :offset         16)
+   (id         uint32                :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -141,13 +141,13 @@
 
 ;; definition of type sparticle-launch-group
 (deftype sparticle-launch-group (basic)
-  ((length          int16          :offset-assert 4)
-   (duration        uint16         :offset-assert 6)
-   (linger-duration uint16         :offset-assert 8)
-   (flags           uint16         :offset-assert 10)
-   (name            basic          :offset-assert 12)
-   (launcher        uint32         :offset-assert 16)
-   (bounds          sphere :inline :offset-assert 32)
+  ((length          int16          :offset-assert   4)
+   (duration        uint16         :offset-assert   6)
+   (linger-duration uint16         :offset-assert   8)
+   (flags           uint16         :offset-assert  10)
+   (name            basic          :offset-assert  12)
+   (launcher        uint32         :offset-assert  16)
+   (bounds          sphere :inline :offset-assert  32)
    )
   :method-count-assert 10
   :size-assert         #x30
@@ -172,15 +172,15 @@
 
 ;; definition of type sparticle-launch-control
 (deftype sparticle-launch-control (inline-array-class)
-  ((group            basic           :offset-assert 16)
-   (proc             basic           :offset-assert 20)
-   (local-clock      int32           :offset-assert 24)
-   (fade             float           :offset-assert 28)
-   (matrix           int32           :offset-assert 32)
-   (last-spawn-frame int32           :offset-assert 36)
-   (last-spawn-time  int32           :offset-assert 40)
-   (center           vector :inline  :offset-assert 48)
-   (data             uint8  :dynamic :offset-assert 64)
+  ((group            basic           :offset-assert  16)
+   (proc             basic           :offset-assert  20)
+   (local-clock      int32           :offset-assert  24)
+   (fade             float           :offset-assert  28)
+   (matrix           int32           :offset-assert  32)
+   (last-spawn-frame int32           :offset-assert  36)
+   (last-spawn-time  int32           :offset-assert  40)
+   (center           vector :inline  :offset-assert  48)
+   (data             uint8  :dynamic :offset-assert  64)
    )
   :method-count-assert 14
   :size-assert         #x40
diff --git a/test/decompiler/reference/engine/gfx/sprite/sprite-h_REF.gc b/test/decompiler/reference/engine/gfx/sprite/sprite-h_REF.gc
index 12bb391818..f9ab53359c 100644
--- a/test/decompiler/reference/engine/gfx/sprite/sprite-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/sprite/sprite-h_REF.gc
@@ -3,26 +3,26 @@
 
 ;; definition of type sprite-vec-data-2d
 (deftype sprite-vec-data-2d (structure)
-  ((x-y-z-sx    vector   :inline             :offset-assert 0)
-   (flag-rot-sy vector   :inline             :offset-assert 16)
-   (r-g-b-a     vector   :inline             :offset-assert 32)
-   (x           float    :offset   0)
-   (y           float    :offset   4)
-   (z           float    :offset   8)
-   (sx          float    :offset  12)
-   (sy          float    :offset  28)
-   (rot         float    :offset  24)
-   (flag        int32    :offset  16)
-   (matrix      int32    :offset  20)
-   (warp-turns  int32    :offset  16)
-   (r           float    :offset  32)
-   (g           float    :offset  36)
-   (b           float    :offset  40)
-   (a           float    :offset  44)
-   (trans       vector3s :inline :offset   0)
-   (color       rgbaf    :inline :offset  32)
-   (data        uint128  1 :offset   0)
-   (data64      uint64   6 :offset   0)
+  ((x-y-z-sx    vector   :inline :offset-assert   0)
+   (flag-rot-sy vector   :inline :offset-assert  16)
+   (r-g-b-a     vector   :inline :offset-assert  32)
+   (x           float            :offset          0)
+   (y           float            :offset          4)
+   (z           float            :offset          8)
+   (sx          float            :offset         12)
+   (sy          float            :offset         28)
+   (rot         float            :offset         24)
+   (flag        int32            :offset         16)
+   (matrix      int32            :offset         20)
+   (warp-turns  int32            :offset         16)
+   (r           float            :offset         32)
+   (g           float            :offset         36)
+   (b           float            :offset         40)
+   (a           float            :offset         44)
+   (trans       vector3s :inline :offset          0)
+   (color       rgbaf    :inline :offset         32)
+   (data        uint128  1       :offset          0)
+   (data64      uint64   6       :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -57,12 +57,12 @@
 
 ;; definition of type sprite-array-2d
 (deftype sprite-array-2d (basic)
-  ((num-sprites uint32  2 :offset-assert 4)
-   (num-valid   uint32  2 :offset-assert 12)
-   (vec-data    uint32    :offset-assert 20)
-   (adgif-data  uint32    :offset-assert 24)
-   (pad         uint128 4 :offset-assert 32)
-   (data        uint128 1 :offset-assert 96)
+  ((num-sprites uint32  2 :offset-assert   4)
+   (num-valid   uint32  2 :offset-assert  12)
+   (vec-data    uint32    :offset-assert  20)
+   (adgif-data  uint32    :offset-assert  24)
+   (pad         uint128 4 :offset-assert  32)
+   (data        uint128 1 :offset-assert  96)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -83,25 +83,25 @@
 
 ;; definition of type sprite-vec-data-3d
 (deftype sprite-vec-data-3d (structure)
-  ((x-y-z-sx    vector   :inline             :offset-assert 0)
-   (qx-qy-qz-sy vector   :inline             :offset-assert 16)
-   (r-g-b-a     vector   :inline             :offset-assert 32)
-   (x           float    :offset   0)
-   (y           float    :offset   4)
-   (z           float    :offset   8)
-   (sx          float    :offset  12)
-   (sy          float    :offset  28)
-   (qx          float    :offset  16)
-   (qy          float    :offset  20)
-   (qz          float    :offset  24)
-   (r           float    :offset  32)
-   (g           float    :offset  36)
-   (b           float    :offset  40)
-   (a           float    :offset  44)
-   (trans       vector3s :inline :offset   0)
-   (rot         vector3s :inline :offset  16)
-   (color       rgbaf    :inline :offset  32)
-   (data        uint128  1 :offset   0)
+  ((x-y-z-sx    vector   :inline :offset-assert   0)
+   (qx-qy-qz-sy vector   :inline :offset-assert  16)
+   (r-g-b-a     vector   :inline :offset-assert  32)
+   (x           float            :offset          0)
+   (y           float            :offset          4)
+   (z           float            :offset          8)
+   (sx          float            :offset         12)
+   (sy          float            :offset         28)
+   (qx          float            :offset         16)
+   (qy          float            :offset         20)
+   (qz          float            :offset         24)
+   (r           float            :offset         32)
+   (g           float            :offset         36)
+   (b           float            :offset         40)
+   (a           float            :offset         44)
+   (trans       vector3s :inline :offset          0)
+   (rot         vector3s :inline :offset         16)
+   (color       rgbaf    :inline :offset         32)
+   (data        uint128  1       :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -135,11 +135,11 @@
 
 ;; definition of type sprite-array-3d
 (deftype sprite-array-3d (basic)
-  ((num-sprites uint32  2 :offset-assert 4)
-   (num-valid   uint32  2 :offset-assert 12)
-   (vec-data    uint32    :offset-assert 20)
-   (adgif-data  uint32    :offset-assert 24)
-   (data        uint128 1 :offset-assert 32)
+  ((num-sprites uint32  2 :offset-assert   4)
+   (num-valid   uint32  2 :offset-assert  12)
+   (vec-data    uint32    :offset-assert  20)
+   (adgif-data  uint32    :offset-assert  24)
+   (data        uint128 1 :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
diff --git a/test/decompiler/reference/engine/gfx/texture-h_REF.gc b/test/decompiler/reference/engine/gfx/texture-h_REF.gc
index f938375936..a1d33f55f0 100644
--- a/test/decompiler/reference/engine/gfx/texture-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/texture-h_REF.gc
@@ -27,8 +27,8 @@
 
 ;; definition of type texture-pool-segment
 (deftype texture-pool-segment (structure)
-  ((dest uint32  :offset-assert 0)
-   (size uint32  :offset-assert 4)
+  ((dest uint32  :offset-assert   0)
+   (size uint32  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -46,16 +46,16 @@
 
 ;; definition of type texture-pool
 (deftype texture-pool (basic)
-  ((top              int32                                                                             :offset-assert 4)
-   (cur              int32                                                                             :offset-assert 8)
-   (allocate-func    (function texture-pool texture-page kheap int texture-page)                       :offset-assert 12)
-   (font-palette     int32                                                                             :offset-assert 16)
-   (segment-near     texture-pool-segment                                        :inline               :offset-assert 20)
-   (segment-common   texture-pool-segment                                        :inline               :offset-assert 28)
-   (segment          texture-pool-segment                                        4 :inline :offset  20)
-   (common-page      texture-page                                                32                    :offset-assert 52)
-   (common-page-mask int32                                                                             :offset-assert 180)
-   (ids              uint32                                                      126                   :offset-assert 184)
+  ((top              int32                                                                 :offset-assert   4)
+   (cur              int32                                                                 :offset-assert   8)
+   (allocate-func    (function texture-pool texture-page kheap int texture-page)           :offset-assert  12)
+   (font-palette     int32                                                                 :offset-assert  16)
+   (segment-near     texture-pool-segment                                        :inline   :offset-assert  20)
+   (segment-common   texture-pool-segment                                        :inline   :offset-assert  28)
+   (segment          texture-pool-segment                                        4 :inline :offset         20)
+   (common-page      texture-page                                                32        :offset-assert  52)
+   (common-page-mask int32                                                                 :offset-assert 180)
+   (ids              uint32                                                      126       :offset-assert 184)
    )
   :method-count-assert 23
   :size-assert         #x2b0
@@ -105,20 +105,20 @@
 
 ;; definition of type texture
 (deftype texture (basic)
-  ((w            int16    :offset-assert 4)
-   (h            int16    :offset-assert 6)
-   (num-mips     uint8    :offset-assert 8)
-   (tex1-control uint8    :offset-assert 9)
-   (psm          gs-psm   :offset-assert 10)
-   (mip-shift    uint8    :offset-assert 11)
-   (clutpsm      uint16   :offset-assert 12)
-   (dest         uint16 7 :offset-assert 14)
-   (clutdest     uint16   :offset-assert 28)
-   (width        uint8  7 :offset-assert 30)
-   (name         basic    :offset-assert 40)
-   (size         uint32   :offset-assert 44)
-   (uv-dist      float    :offset-assert 48)
-   (masks        uint32 3 :offset-assert 52)
+  ((w            int16    :offset-assert   4)
+   (h            int16    :offset-assert   6)
+   (num-mips     uint8    :offset-assert   8)
+   (tex1-control uint8    :offset-assert   9)
+   (psm          gs-psm   :offset-assert  10)
+   (mip-shift    uint8    :offset-assert  11)
+   (clutpsm      uint16   :offset-assert  12)
+   (dest         uint16 7 :offset-assert  14)
+   (clutdest     uint16   :offset-assert  28)
+   (width        uint8  7 :offset-assert  30)
+   (name         basic    :offset-assert  40)
+   (size         uint32   :offset-assert  44)
+   (uv-dist      float    :offset-assert  48)
+   (masks        uint32 3 :offset-assert  52)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -147,9 +147,9 @@
 
 ;; definition of type texture-page-segment
 (deftype texture-page-segment (structure)
-  ((block-data pointer  :offset-assert 0)
-   (size       uint32   :offset-assert 4)
-   (dest       uint32   :offset-assert 8)
+  ((block-data pointer  :offset-assert   0)
+   (size       uint32   :offset-assert   4)
+   (dest       uint32   :offset-assert   8)
    )
   :pack-me
   :method-count-assert 9
@@ -176,14 +176,14 @@
 
 ;; definition of type texture-page
 (deftype texture-page (basic)
-  ((info      basic                          :offset-assert 4)
-   (name      basic                          :offset-assert 8)
-   (id        uint32                         :offset-assert 12)
-   (length    int32                          :offset-assert 16)
-   (mip0-size uint32                         :offset-assert 20)
-   (size      uint32                         :offset-assert 24)
-   (segment   texture-page-segment 3 :inline :offset-assert 28)
-   (pad       uint32               16        :offset-assert 64)
+  ((info      basic                          :offset-assert   4)
+   (name      basic                          :offset-assert   8)
+   (id        uint32                         :offset-assert  12)
+   (length    int32                          :offset-assert  16)
+   (mip0-size uint32                         :offset-assert  20)
+   (size      uint32                         :offset-assert  24)
+   (segment   texture-page-segment 3 :inline :offset-assert  28)
+   (pad       uint32               16        :offset-assert  64)
    (data      texture              :dynamic  :offset-assert 128)
    )
   :method-count-assert 15
@@ -225,7 +225,7 @@
 
 ;; definition of type texture-link
 (deftype texture-link (structure)
-  ((next shader-ptr 1 :offset-assert 0)
+  ((next shader-ptr 1 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -241,10 +241,10 @@
 
 ;; definition of type texture-page-dir-entry
 (deftype texture-page-dir-entry (structure)
-  ((length int16         :offset-assert 0)
-   (status uint16        :offset-assert 2)
-   (page   texture-page  :offset-assert 4)
-   (link   texture-link  :offset-assert 8)
+  ((length int16         :offset-assert   0)
+   (status uint16        :offset-assert   2)
+   (page   texture-page  :offset-assert   4)
+   (link   texture-link  :offset-assert   8)
    )
   :pack-me
   :method-count-assert 9
@@ -264,8 +264,8 @@
 
 ;; definition of type texture-page-dir
 (deftype texture-page-dir (basic)
-  ((length  int32                            :offset-assert 4)
-   (entries texture-page-dir-entry 1 :inline :offset-assert 8)
+  ((length  int32                            :offset-assert   4)
+   (entries texture-page-dir-entry 1 :inline :offset-assert   8)
    )
   :method-count-assert 10
   :size-assert         #x14
@@ -277,12 +277,12 @@
 
 ;; definition of type texture-relocate-later
 (deftype texture-relocate-later (basic)
-  ((memcpy basic                   :offset-assert 4)
-   (dest   uint32                  :offset-assert 8)
-   (source uint32                  :offset-assert 12)
-   (move   uint32                  :offset-assert 16)
-   (entry  texture-page-dir-entry  :offset-assert 20)
-   (page   texture-page            :offset-assert 24)
+  ((memcpy basic                   :offset-assert   4)
+   (dest   uint32                  :offset-assert   8)
+   (source uint32                  :offset-assert  12)
+   (move   uint32                  :offset-assert  16)
+   (entry  texture-page-dir-entry  :offset-assert  20)
+   (page   texture-page            :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -313,16 +313,16 @@
 ;; definition of type adgif-shader
 (deftype adgif-shader (structure)
   ((quad       qword      5 :inline :offset   0)
-   (prims      uint64     10 :offset   0)
-   (tex0       uint64     :offset   0)
-   (tex1       uint64     :offset  16)
-   (miptbp1    uint64     :offset  32)
-   (clamp      uint64     :offset  48)
-   (clamp-reg  uint64     :offset  56)
-   (alpha      uint64     :offset  64)
-   (link-test  uint32     :offset   8)
-   (texture-id uint32     :offset  24)
-   (next       shader-ptr :offset  40)
+   (prims      uint64     10        :offset   0)
+   (tex0       uint64               :offset   0)
+   (tex1       uint64               :offset  16)
+   (miptbp1    uint64               :offset  32)
+   (clamp      uint64               :offset  48)
+   (clamp-reg  uint64               :offset  56)
+   (alpha      uint64               :offset  64)
+   (link-test  uint32               :offset   8)
+   (texture-id uint32               :offset  24)
+   (next       shader-ptr           :offset  40)
    )
   :method-count-assert 9
   :size-assert         #x50
diff --git a/test/decompiler/reference/engine/gfx/tfrag/subdivide-h_REF.gc b/test/decompiler/reference/engine/gfx/tfrag/subdivide-h_REF.gc
index 0ff6bc2607..3d20ded7c5 100644
--- a/test/decompiler/reference/engine/gfx/tfrag/subdivide-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/tfrag/subdivide-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type subdivide-settings
 (deftype subdivide-settings (basic)
-  ((dist   float 5 :offset-assert 4)
-   (meters float 5 :offset-assert 24)
-   (close  float 4 :offset-assert 44)
-   (far    float 4 :offset-assert 60)
+  ((dist   float 5 :offset-assert   4)
+   (meters float 5 :offset-assert  24)
+   (close  float 4 :offset-assert  44)
+   (far    float 4 :offset-assert  60)
    )
   :method-count-assert 9
   :size-assert         #x4c
@@ -46,10 +46,10 @@
 
 ;; definition of type subdivide-dists
 (deftype subdivide-dists (structure)
-  ((data   uint32  32 :offset   0)
+  ((data   uint32  32        :offset   0)
    (vector vector  8 :inline :offset   0)
-   (k0s    uint128 4 :offset   0)
-   (k1s    uint128 4 :offset  64)
+   (k0s    uint128 4         :offset   0)
+   (k1s    uint128 4         :offset  64)
    )
   :method-count-assert 9
   :size-assert         #x80
@@ -68,11 +68,11 @@
 
 ;; definition of type gs-packed-rgba
 (deftype gs-packed-rgba (structure)
-  ((data  int32 4           :offset-assert 0)
-   (red   int32 :offset   0)
-   (green int32 :offset   4)
-   (blue  int32 :offset   8)
-   (alpha int32 :offset  12)
+  ((data  int32 4 :offset-assert   0)
+   (red   int32   :offset          0)
+   (green int32   :offset          4)
+   (blue  int32   :offset          8)
+   (alpha int32   :offset         12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -92,12 +92,12 @@
 
 ;; definition of type gs-packed-xyzw
 (deftype gs-packed-xyzw (structure)
-  ((data int32   4           :offset-assert 0)
-   (x    int32   :offset   0)
-   (y    int32   :offset   4)
-   (z    int32   :offset   8)
-   (w    int32   :offset  12)
-   (quad uint128 :offset   0)
+  ((data int32   4 :offset-assert   0)
+   (x    int32     :offset          0)
+   (y    int32     :offset          4)
+   (z    int32     :offset          8)
+   (w    int32     :offset         12)
+   (quad uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -119,11 +119,11 @@
 
 ;; definition of type gs-packed-stq
 (deftype gs-packed-stq (structure)
-  ((data  float   4           :offset-assert 0)
-   (tex-s float   :offset   0)
-   (tex-t float   :offset   4)
-   (tex-q float   :offset   8)
-   (quad  uint128 :offset   0)
+  ((data  float   4 :offset-assert   0)
+   (tex-s float     :offset          0)
+   (tex-t float     :offset          4)
+   (tex-q float     :offset          8)
+   (quad  uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -144,9 +144,9 @@
 
 ;; definition of type gs-packed-gt
 (deftype gs-packed-gt (structure)
-  ((stq  gs-packed-stq  :inline :offset-assert 0)
-   (rgba gs-packed-rgba :inline :offset-assert 16)
-   (xyzw gs-packed-xyzw :inline :offset-assert 32)
+  ((stq  gs-packed-stq  :inline :offset-assert   0)
+   (rgba gs-packed-rgba :inline :offset-assert  16)
+   (xyzw gs-packed-xyzw :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -164,7 +164,7 @@
 
 ;; definition of type gs-packed-gt4
 (deftype gs-packed-gt4 (structure)
-  ((data gs-packed-gt 4 :inline :offset-assert 0)
+  ((data gs-packed-gt 4 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #xc0
@@ -180,8 +180,8 @@
 
 ;; definition of type terrain-bsp
 (deftype terrain-bsp (structure)
-  ((lev-index int32  :offset-assert 0)
-   (mood      basic  :offset-assert 4)
+  ((lev-index int32  :offset-assert   0)
+   (mood      basic  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -198,13 +198,13 @@
 
 ;; definition of type terrain-stats
 (deftype terrain-stats (structure)
-  ((pris             tr-stat :inline :offset-assert 0)
-   (tie-generic      tr-stat :inline :offset-assert 16)
-   (tie              tr-stat :inline :offset-assert 32)
-   (tie-near         tr-stat :inline :offset-assert 48)
-   (shrub-near       tr-stat :inline :offset-assert 64)
-   (shrub            tr-stat :inline :offset-assert 80)
-   (tfrag-near       tr-stat :inline :offset-assert 96)
+  ((pris             tr-stat :inline :offset-assert   0)
+   (tie-generic      tr-stat :inline :offset-assert  16)
+   (tie              tr-stat :inline :offset-assert  32)
+   (tie-near         tr-stat :inline :offset-assert  48)
+   (shrub-near       tr-stat :inline :offset-assert  64)
+   (shrub            tr-stat :inline :offset-assert  80)
+   (tfrag-near       tr-stat :inline :offset-assert  96)
    (tfrag            tr-stat :inline :offset-assert 112)
    (billboard        tr-stat :inline :offset-assert 128)
    (trans-tfrag      tr-stat :inline :offset-assert 144)
@@ -248,13 +248,13 @@
 
 ;; definition of type dma-area
 (deftype dma-area (structure)
-  ((draw-node-dma      draw-node-dma      :inline :offset   0)
-   (tfrag-dma          tfrag-dma          :inline :offset   0)
-   (instance-shrub-dma instance-shrub-dma :inline :offset   0)
-   (instance-tie-dma   instance-tie-dma   :inline :offset   0)
-   (prototype-tie-dma  prototype-tie-dma  :inline :offset   0)
-   (time-of-day-dma    time-of-day-dma    :inline :offset   0)
-   (decomp-work        decomp-work        :inline :offset   0)
+  ((draw-node-dma      draw-node-dma      :inline   :offset   0)
+   (tfrag-dma          tfrag-dma          :inline   :offset   0)
+   (instance-shrub-dma instance-shrub-dma :inline   :offset   0)
+   (instance-tie-dma   instance-tie-dma   :inline   :offset   0)
+   (prototype-tie-dma  prototype-tie-dma  :inline   :offset   0)
+   (time-of-day-dma    time-of-day-dma    :inline   :offset   0)
+   (decomp-work        decomp-work        :inline   :offset   0)
    (ocean-vertex       ocean-vertex       4 :inline :offset   0)
    )
   :method-count-assert 9
@@ -298,7 +298,7 @@
 
 ;; definition of type background-area
 (deftype background-area (structure)
-  ((dma-area dma-area :inline :offset-assert 0)
+  ((dma-area dma-area :inline :offset-assert   0)
    (vis-list uint8    2048    :offset-assert 14496)
    )
   :method-count-assert 9
@@ -316,10 +316,10 @@
 
 ;; definition of type foreground-area
 (deftype foreground-area (structure)
-  ((joint-work   joint-work   :inline             :offset-assert 0)
-   (generic-work generic-work :inline :offset   0)
-   (bone-mem     bone-memory  :inline :offset   0)
-   (shadow-work  shadow-work  :inline :offset   0)
+  ((joint-work   joint-work   :inline :offset-assert   0)
+   (generic-work generic-work :inline :offset          0)
+   (bone-mem     bone-memory  :inline :offset          0)
+   (shadow-work  shadow-work  :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x3fd0
@@ -338,7 +338,7 @@
 
 ;; definition of type ambient-area
 (deftype ambient-area (structure)
-  ((ambient-list ambient-list :inline :offset-assert 0)
+  ((ambient-list ambient-list :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x2004
@@ -354,9 +354,9 @@
 
 ;; definition of type work-area
 (deftype work-area (structure)
-  ((background background-area :inline             :offset-assert 0)
-   (foreground foreground-area :inline :offset   0)
-   (ambient    ambient-area    :inline :offset   0)
+  ((background background-area :inline :offset-assert   0)
+   (foreground foreground-area :inline :offset          0)
+   (ambient    ambient-area    :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x40a0
@@ -374,8 +374,8 @@
 
 ;; definition of type terrain-context
 (deftype terrain-context (structure)
-  ((bsp  terrain-bsp :inline :offset-assert 0)
-   (work work-area   :inline :offset-assert 16)
+  ((bsp  terrain-bsp :inline :offset-assert   0)
+   (work work-area   :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x40b0
diff --git a/test/decompiler/reference/engine/gfx/tfrag/tfrag-h_REF.gc b/test/decompiler/reference/engine/gfx/tfrag/tfrag-h_REF.gc
index eca5148c88..5e6962984d 100644
--- a/test/decompiler/reference/engine/gfx/tfrag/tfrag-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/tfrag/tfrag-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type tfragment-stats
 (deftype tfragment-stats (structure)
-  ((num-tris   uint16 4 :offset-assert 0)
-   (num-dverts uint16 4 :offset-assert 8)
+  ((num-tris   uint16 4 :offset-assert   0)
+   (num-dverts uint16 4 :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -21,8 +21,8 @@
 
 ;; definition of type tfragment-debug-data
 (deftype tfragment-debug-data (structure)
-  ((stats       tfragment-stats :inline :offset-assert 0)
-   (debug-lines basic                   :offset-assert 16)
+  ((stats       tfragment-stats :inline :offset-assert   0)
+   (debug-lines basic                   :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -39,7 +39,7 @@
 
 ;; definition of type generic-tfragment
 (deftype generic-tfragment (structure)
-  ((dummy int32  :offset-assert 0)
+  ((dummy int32  :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -55,26 +55,26 @@
 
 ;; definition of type tfragment
 (deftype tfragment (drawable)
-  ((color-index       uint16               :offset   6)
-   (debug-data        tfragment-debug-data :offset   8)
-   (color-indices     uint32               :offset  12)
-   (colors            uint32               :offset  12)
-   (dma-chain         uint32               3           :offset-assert 32)
-   (dma-common        uint32               :offset  32)
-   (dma-level-0       uint32               :offset  32)
-   (dma-base          uint32               :offset  36)
-   (dma-level-1       uint32               :offset  40)
-   (dma-qwc           uint32               4           :offset-assert 44)
-   (shader            uint32               :offset  48)
-   (num-shaders       uint8                :offset  52)
-   (num-base-colors   uint8                :offset  53)
-   (num-level0-colors uint8                :offset  54)
-   (num-level1-colors uint8                :offset  55)
-   (color-offset      uint8                :offset  56)
-   (color-count       uint8                :offset  57)
-   (pad0              uint8                :offset  58)
-   (pad1              uint8                :offset  59)
-   (generic           generic-tfragment                :offset-assert 60)
+  ((color-index       uint16                 :offset          6)
+   (debug-data        tfragment-debug-data   :offset          8)
+   (color-indices     uint32                 :offset         12)
+   (colors            uint32                 :offset         12)
+   (dma-chain         uint32               3 :offset-assert  32)
+   (dma-common        uint32                 :offset         32)
+   (dma-level-0       uint32                 :offset         32)
+   (dma-base          uint32                 :offset         36)
+   (dma-level-1       uint32                 :offset         40)
+   (dma-qwc           uint32               4 :offset-assert  44)
+   (shader            uint32                 :offset         48)
+   (num-shaders       uint8                  :offset         52)
+   (num-base-colors   uint8                  :offset         53)
+   (num-level0-colors uint8                  :offset         54)
+   (num-level1-colors uint8                  :offset         55)
+   (color-offset      uint8                  :offset         56)
+   (color-count       uint8                  :offset         57)
+   (pad0              uint8                  :offset         58)
+   (pad1              uint8                  :offset         59)
+   (generic           generic-tfragment      :offset-assert  60)
    )
   :method-count-assert 18
   :size-assert         #x40
@@ -115,8 +115,8 @@
 
 ;; definition of type drawable-inline-array-tfrag
 (deftype drawable-inline-array-tfrag (drawable-inline-array)
-  ((data tfragment 1 :inline :offset-assert 32)
-   (pad  uint32              :offset-assert 96)
+  ((data tfragment 1 :inline :offset-assert  32)
+   (pad  uint32              :offset-assert  96)
    )
   :method-count-assert 18
   :size-assert         #x64
@@ -183,10 +183,10 @@
 
 ;; definition of type tfrag-dists
 (deftype tfrag-dists (structure)
-  ((data   uint32  16                    :offset-assert 0)
-   (vector vector  4 :inline :offset   0)
-   (k0s    uint128 2 :offset   0)
-   (k1s    uint128 2 :offset  32)
+  ((data   uint32  16        :offset-assert   0)
+   (vector vector  4 :inline :offset          0)
+   (k0s    uint128 2         :offset          0)
+   (k1s    uint128 2         :offset         32)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -205,21 +205,21 @@
 
 ;; definition of type tfrag-data
 (deftype tfrag-data (structure)
-  ((data        uint32      56 :offset   0)
+  ((data        uint32      56         :offset   0)
    (vector      vector      14 :inline :offset   0)
-   (fog         vector      :inline :offset   0)
-   (val         vector      :inline :offset  16)
-   (strgif      qword       :inline :offset  32)
-   (fangif      qword       :inline :offset  48)
-   (adgif       qword       :inline :offset  64)
-   (hvdf-offset vector      :inline :offset  80)
-   (hmge-scale  vector      :inline :offset  96)
-   (invh-scale  vector      :inline :offset 112)
-   (ambient     vector      :inline :offset 128)
-   (guard       vector      :inline :offset 144)
-   (dists       tfrag-dists :inline :offset 160)
-   (k0s         uint128     2 :offset 160)
-   (k1s         uint128     2 :offset 192)
+   (fog         vector      :inline    :offset   0)
+   (val         vector      :inline    :offset  16)
+   (strgif      qword       :inline    :offset  32)
+   (fangif      qword       :inline    :offset  48)
+   (adgif       qword       :inline    :offset  64)
+   (hvdf-offset vector      :inline    :offset  80)
+   (hmge-scale  vector      :inline    :offset  96)
+   (invh-scale  vector      :inline    :offset 112)
+   (ambient     vector      :inline    :offset 128)
+   (guard       vector      :inline    :offset 144)
+   (dists       tfrag-dists :inline    :offset 160)
+   (k0s         uint128     2          :offset 160)
+   (k1s         uint128     2          :offset 192)
    )
   :method-count-assert 9
   :size-assert         #xe0
@@ -249,26 +249,26 @@
 
 ;; definition of type tfrag-control
 (deftype tfrag-control (structure)
-  ((num-base-points           uint32  :offset-assert 0)
-   (num-shared-base-points    uint32  :offset-assert 4)
-   (num-level0-points         uint32  :offset-assert 8)
-   (num-shared-level0-points  uint32  :offset-assert 12)
-   (num-level1-points         uint32  :offset-assert 16)
-   (num-shared-level1-points  uint32  :offset-assert 20)
-   (ptr-vtxdata               uint32  :offset-assert 24)
-   (ptr-base-points           uint32  :offset-assert 28)
-   (ptr-shared-base-points    uint32  :offset-assert 32)
-   (ptr-level0-points         uint32  :offset-assert 36)
-   (ptr-shared-level0-points  uint32  :offset-assert 40)
-   (ptr-level1-points         uint32  :offset-assert 44)
-   (ptr-shared-level1-points  uint32  :offset-assert 48)
-   (ptr-draw-points           uint32  :offset-assert 52)
-   (ptr-interpolated-0        uint32  :offset-assert 56)
-   (ptr-shared-interpolated-0 uint32  :offset-assert 60)
-   (ptr-interpolated1         uint32  :offset-assert 64)
-   (ptr-shared-interpolated1  uint32  :offset-assert 68)
-   (ptr-strip-data            uint32  :offset-assert 72)
-   (ptr-texture-data          uint32  :offset-assert 76)
+  ((num-base-points           uint32  :offset-assert   0)
+   (num-shared-base-points    uint32  :offset-assert   4)
+   (num-level0-points         uint32  :offset-assert   8)
+   (num-shared-level0-points  uint32  :offset-assert  12)
+   (num-level1-points         uint32  :offset-assert  16)
+   (num-shared-level1-points  uint32  :offset-assert  20)
+   (ptr-vtxdata               uint32  :offset-assert  24)
+   (ptr-base-points           uint32  :offset-assert  28)
+   (ptr-shared-base-points    uint32  :offset-assert  32)
+   (ptr-level0-points         uint32  :offset-assert  36)
+   (ptr-shared-level0-points  uint32  :offset-assert  40)
+   (ptr-level1-points         uint32  :offset-assert  44)
+   (ptr-shared-level1-points  uint32  :offset-assert  48)
+   (ptr-draw-points           uint32  :offset-assert  52)
+   (ptr-interpolated-0        uint32  :offset-assert  56)
+   (ptr-shared-interpolated-0 uint32  :offset-assert  60)
+   (ptr-interpolated1         uint32  :offset-assert  64)
+   (ptr-shared-interpolated1  uint32  :offset-assert  68)
+   (ptr-strip-data            uint32  :offset-assert  72)
+   (ptr-texture-data          uint32  :offset-assert  76)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -327,22 +327,22 @@
 
 ;; definition of type tfrag-stats
 (deftype tfrag-stats (structure)
-  ((from         int32  :offset-assert 0)
-   (to           int32  :offset-assert 4)
-   (cnt          int32  :offset-assert 8)
-   (tris         int32  :offset-assert 12)
-   (tfaces       int32  :offset-assert 16)
-   (tfrags       int32  :offset-assert 20)
-   (dtris        int32  :offset-assert 24)
-   (base-verts   int32  :offset-assert 28)
-   (level0-verts int32  :offset-assert 32)
-   (level1-verts int32  :offset-assert 36)
-   (dma-cnt      int32  :offset-assert 40)
-   (dma-dta      int32  :offset-assert 44)
-   (dma-tex      int32  :offset-assert 48)
-   (strips       int32  :offset-assert 52)
-   (drawpoints   int32  :offset-assert 56)
-   (vif          int32  :offset-assert 60)
+  ((from         int32  :offset-assert   0)
+   (to           int32  :offset-assert   4)
+   (cnt          int32  :offset-assert   8)
+   (tris         int32  :offset-assert  12)
+   (tfaces       int32  :offset-assert  16)
+   (tfrags       int32  :offset-assert  20)
+   (dtris        int32  :offset-assert  24)
+   (base-verts   int32  :offset-assert  28)
+   (level0-verts int32  :offset-assert  32)
+   (level1-verts int32  :offset-assert  36)
+   (dma-cnt      int32  :offset-assert  40)
+   (dma-dta      int32  :offset-assert  44)
+   (dma-tex      int32  :offset-assert  48)
+   (strips       int32  :offset-assert  52)
+   (drawpoints   int32  :offset-assert  56)
+   (vif          int32  :offset-assert  60)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -373,7 +373,7 @@
 
 ;; definition of type tfrag-packet
 (deftype tfrag-packet (structure)
-  ((tag uint128 2 :offset-assert 0)
+  ((tag uint128 2 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -389,13 +389,13 @@
 
 ;; definition of type tfrag-work
 (deftype tfrag-work (structure)
-  ((base-tmpl             dma-packet :inline :offset-assert 0)
-   (level-0-tmpl          dma-packet :inline :offset-assert 16)
-   (common-tmpl           dma-packet :inline :offset-assert 32)
-   (level-1-tmpl          dma-packet :inline :offset-assert 48)
-   (color-tmpl            dma-packet :inline :offset-assert 64)
-   (frag-dists            vector     :inline :offset-assert 80)
-   (max-dist              vector     :inline :offset-assert 96)
+  ((base-tmpl             dma-packet :inline :offset-assert   0)
+   (level-0-tmpl          dma-packet :inline :offset-assert  16)
+   (common-tmpl           dma-packet :inline :offset-assert  32)
+   (level-1-tmpl          dma-packet :inline :offset-assert  48)
+   (color-tmpl            dma-packet :inline :offset-assert  64)
+   (frag-dists            vector     :inline :offset-assert  80)
+   (max-dist              vector     :inline :offset-assert  96)
    (min-dist              vector     :inline :offset-assert 112)
    (color-ptr             vector4w   :inline :offset-assert 128)
    (tr-stat-tfrag         tr-stat            :offset-assert 144)
@@ -453,7 +453,7 @@
 
 ;; definition of type tfrag-dma
 (deftype tfrag-dma (structure)
-  ((banka  tfragment 16 :inline :offset-assert 0)
+  ((banka  tfragment 16 :inline :offset-assert   0)
    (bankb  tfragment 16 :inline :offset-assert 1024)
    (outa   uint128   128        :offset-assert 2048)
    (outb   uint128   128        :offset-assert 4096)
diff --git a/test/decompiler/reference/engine/gfx/tie/generic-tie-h_REF.gc b/test/decompiler/reference/engine/gfx/tie/generic-tie-h_REF.gc
index 438ff13aef..849dbb6bbd 100644
--- a/test/decompiler/reference/engine/gfx/tie/generic-tie-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/tie/generic-tie-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type generic-tie-instance
 (deftype generic-tie-instance (structure)
-  ((matrix-tag  dma-packet :inline   :offset-assert 0)
-   (matrix-data vector     6 :inline :offset-assert 16)
+  ((matrix-tag  dma-packet :inline   :offset-assert   0)
+   (matrix-data vector     6 :inline :offset-assert  16)
    (index-tag   dma-packet :inline   :offset-assert 112)
    (indices     uint8      224       :offset-assert 128)
    (end-tag     dma-packet :inline   :offset-assert 352)
@@ -27,8 +27,8 @@
 
 ;; definition of type generic-tie-input
 (deftype generic-tie-input (structure)
-  ((palette-tag dma-packet :inline     :offset-assert 0)
-   (palette     rgba       128         :offset-assert 16)
+  ((palette-tag dma-packet :inline     :offset-assert   0)
+   (palette     rgba       128         :offset-assert  16)
    (model-tag   dma-packet :inline     :offset-assert 528)
    (model       vector     146 :inline :offset-assert 544)
    (matrix-tag  dma-packet :inline     :offset-assert 2880)
@@ -59,18 +59,18 @@
 
 ;; definition of type generic-tie-run-control
 (deftype generic-tie-run-control (structure)
-  ((skip-bp2    uint8  :offset-assert 0)
-   (skip-ips    uint8  :offset-assert 1)
-   (gifbuf-skip uint8  :offset-assert 2)
-   (strips      uint8  :offset-assert 3)
-   (target-bp1  uint8  :offset-assert 4)
-   (target-bp2  uint8  :offset-assert 5)
-   (target-ip1  uint8  :offset-assert 6)
-   (target-ip2  uint8  :offset-assert 7)
-   (target-bps  uint8  :offset-assert 8)
-   (target-ips  uint8  :offset-assert 9)
-   (is-generic  uint8  :offset-assert 10)
-   (reserved    uint8  :offset-assert 11)
+  ((skip-bp2    uint8  :offset-assert   0)
+   (skip-ips    uint8  :offset-assert   1)
+   (gifbuf-skip uint8  :offset-assert   2)
+   (strips      uint8  :offset-assert   3)
+   (target-bp1  uint8  :offset-assert   4)
+   (target-bp2  uint8  :offset-assert   5)
+   (target-ip1  uint8  :offset-assert   6)
+   (target-ip2  uint8  :offset-assert   7)
+   (target-bps  uint8  :offset-assert   8)
+   (target-ips  uint8  :offset-assert   9)
+   (is-generic  uint8  :offset-assert  10)
+   (reserved    uint8  :offset-assert  11)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -97,18 +97,18 @@
 
 ;; definition of type generic-tie-base-point
 (deftype generic-tie-base-point (structure)
-  ((x    int16                 :offset-assert 0)
-   (y    int16                 :offset-assert 2)
-   (z    int16                 :offset-assert 4)
-   (d0   int16                 :offset-assert 6)
-   (vtx  uint64  :offset   0)
-   (u    int16                 :offset-assert 8)
-   (v    int16                 :offset-assert 10)
-   (tex  uint32  :offset   8)
-   (w    int16                 :offset-assert 12)
-   (d1   int16                 :offset-assert 14)
-   (data uint16  8 :offset   0)
-   (quad uint128 :offset   0)
+  ((x    int16     :offset-assert   0)
+   (y    int16     :offset-assert   2)
+   (z    int16     :offset-assert   4)
+   (d0   int16     :offset-assert   6)
+   (vtx  uint64    :offset          0)
+   (u    int16     :offset-assert   8)
+   (v    int16     :offset-assert  10)
+   (tex  uint32    :offset          8)
+   (w    int16     :offset-assert  12)
+   (d1   int16     :offset-assert  14)
+   (data uint16  8 :offset          0)
+   (quad uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -136,7 +136,7 @@
 
 ;; definition of type generic-tie-bps
 (deftype generic-tie-bps (structure)
-  ((bp generic-tie-base-point 4 :inline :offset-assert 0)
+  ((bp generic-tie-base-point 4 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -152,22 +152,22 @@
 
 ;; definition of type generic-tie-interp-point
 (deftype generic-tie-interp-point (structure)
-  ((x      int16                 :offset-assert 0)
-   (y      int16                 :offset-assert 2)
-   (z      int16                 :offset-assert 4)
-   (d0     int16                 :offset-assert 6)
-   (vtx0   uint64 :offset   0)
-   (dx     int16                 :offset-assert 8)
-   (dy     int16                 :offset-assert 10)
-   (dz     int16                 :offset-assert 12)
-   (unused int16                 :offset-assert 14)
-   (vtx1   uint64 :offset   8)
-   (u      int16                 :offset-assert 16)
-   (v      int16                 :offset-assert 18)
-   (tex    uint32 :offset  16)
-   (w      int16                 :offset-assert 20)
-   (d1     int16                 :offset-assert 22)
-   (data   uint16 12 :offset   0)
+  ((x      int16     :offset-assert   0)
+   (y      int16     :offset-assert   2)
+   (z      int16     :offset-assert   4)
+   (d0     int16     :offset-assert   6)
+   (vtx0   uint64    :offset          0)
+   (dx     int16     :offset-assert   8)
+   (dy     int16     :offset-assert  10)
+   (dz     int16     :offset-assert  12)
+   (unused int16     :offset-assert  14)
+   (vtx1   uint64    :offset          8)
+   (u      int16     :offset-assert  16)
+   (v      int16     :offset-assert  18)
+   (tex    uint32    :offset         16)
+   (w      int16     :offset-assert  20)
+   (d1     int16     :offset-assert  22)
+   (data   uint16 12 :offset          0)
    )
   :pack-me
   :method-count-assert 9
@@ -201,7 +201,7 @@
 
 ;; definition of type generic-tie-ips
 (deftype generic-tie-ips (structure)
-  ((ip generic-tie-interp-point 2 :inline :offset-assert 0)
+  ((ip generic-tie-interp-point 2 :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -217,16 +217,16 @@
 
 ;; definition of type generic-tie-header
 (deftype generic-tie-header (structure)
-  ((effect              uint8              :offset-assert 0)
-   (interp-table-size   uint8              :offset-assert 1)
-   (num-bps             uint8              :offset-assert 2)
-   (num-ips             uint8              :offset-assert 3)
-   (tint-color          uint32             :offset-assert 4)
-   (index-table-offset  uint16             :offset-assert 8)
-   (kick-table-offset   uint16             :offset-assert 10)
-   (normal-table-offset uint16             :offset-assert 12)
-   (interp-table-offset uint16             :offset-assert 14)
-   (gsf-header          gsf-header :inline :offset-assert 16)
+  ((effect              uint8              :offset-assert   0)
+   (interp-table-size   uint8              :offset-assert   1)
+   (num-bps             uint8              :offset-assert   2)
+   (num-ips             uint8              :offset-assert   3)
+   (tint-color          uint32             :offset-assert   4)
+   (index-table-offset  uint16             :offset-assert   8)
+   (kick-table-offset   uint16             :offset-assert  10)
+   (normal-table-offset uint16             :offset-assert  12)
+   (interp-table-offset uint16             :offset-assert  14)
+   (gsf-header          gsf-header :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -251,9 +251,9 @@
 
 ;; definition of type generic-tie-matrix
 (deftype generic-tie-matrix (structure)
-  ((matrix matrix :inline :offset-assert 0)
-   (morph  vector :inline :offset-assert 64)
-   (fog    qword  :inline :offset-assert 80)
+  ((matrix matrix :inline :offset-assert   0)
+   (morph  vector :inline :offset-assert  64)
+   (fog    qword  :inline :offset-assert  80)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -271,10 +271,10 @@
 
 ;; definition of type generic-tie-normal
 (deftype generic-tie-normal (structure)
-  ((x     int8  :offset-assert 0)
-   (y     int8  :offset-assert 1)
-   (z     int8  :offset-assert 2)
-   (dummy int8  :offset-assert 3)
+  ((x     int8  :offset-assert   0)
+   (y     int8  :offset-assert   1)
+   (z     int8  :offset-assert   2)
+   (dummy int8  :offset-assert   3)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -293,21 +293,21 @@
 
 ;; definition of type generic-tie-control
 (deftype generic-tie-control (structure)
-  ((ptr-palette   uint32                   :offset-assert 0)
-   (ptr-shaders   uint32                   :offset-assert 4)
-   (ptr-runctrl   generic-tie-run-control  :offset-assert 8)
-   (ptr-verts     uint32                   :offset-assert 12)
-   (ptr-generic   generic-tie-header       :offset-assert 16)
-   (ptr-dps       uint32                   :offset-assert 20)
-   (ptr-kicks     uint32                   :offset-assert 24)
-   (ptr-normals   uint32                   :offset-assert 28)
-   (ptr-interp    uint32                   :offset-assert 32)
-   (ptr-mtxs      generic-tie-matrix       :offset-assert 36)
-   (ptr-cinds     uint32                   :offset-assert 40)
-   (next-instance uint32                   :offset-assert 44)
-   (next-model    uint32                   :offset-assert 48)
-   (next-is-model uint32                   :offset-assert 52)
-   (tie-type      uint32                   :offset-assert 56)
+  ((ptr-palette   uint32                   :offset-assert   0)
+   (ptr-shaders   uint32                   :offset-assert   4)
+   (ptr-runctrl   generic-tie-run-control  :offset-assert   8)
+   (ptr-verts     uint32                   :offset-assert  12)
+   (ptr-generic   generic-tie-header       :offset-assert  16)
+   (ptr-dps       uint32                   :offset-assert  20)
+   (ptr-kicks     uint32                   :offset-assert  24)
+   (ptr-normals   uint32                   :offset-assert  28)
+   (ptr-interp    uint32                   :offset-assert  32)
+   (ptr-mtxs      generic-tie-matrix       :offset-assert  36)
+   (ptr-cinds     uint32                   :offset-assert  40)
+   (next-instance uint32                   :offset-assert  44)
+   (next-model    uint32                   :offset-assert  48)
+   (next-is-model uint32                   :offset-assert  52)
+   (tie-type      uint32                   :offset-assert  56)
    )
   :method-count-assert 9
   :size-assert         #x3c
@@ -345,15 +345,15 @@
 
 ;; definition of type generic-tie-stats
 (deftype generic-tie-stats (structure)
-  ((num-bps       uint32  :offset-assert 0)
-   (num-ips       uint32  :offset-assert 4)
-   (num-dps       uint32  :offset-assert 8)
-   (num-shaders   uint32  :offset-assert 12)
-   (num-models    uint32  :offset-assert 16)
-   (num-instances uint32  :offset-assert 20)
-   (num-waits     uint32  :offset-assert 24)
-   (num-qwc       uint32  :offset-assert 28)
-   (max-qwc       uint32  :offset-assert 32)
+  ((num-bps       uint32  :offset-assert   0)
+   (num-ips       uint32  :offset-assert   4)
+   (num-dps       uint32  :offset-assert   8)
+   (num-shaders   uint32  :offset-assert  12)
+   (num-models    uint32  :offset-assert  16)
+   (num-instances uint32  :offset-assert  20)
+   (num-waits     uint32  :offset-assert  24)
+   (num-qwc       uint32  :offset-assert  28)
+   (max-qwc       uint32  :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x24
@@ -377,10 +377,10 @@
 
 ;; definition of type generic-tie-calls
 (deftype generic-tie-calls (structure)
-  ((generic-prepare-dma-double basic  :offset-assert 0)
-   (generic-envmap-dproc       basic  :offset-assert 4)
-   (generic-interp-dproc       basic  :offset-assert 8)
-   (generic-no-light-dproc     basic  :offset-assert 12)
+  ((generic-prepare-dma-double basic  :offset-assert   0)
+   (generic-envmap-dproc       basic  :offset-assert   4)
+   (generic-interp-dproc       basic  :offset-assert   8)
+   (generic-no-light-dproc     basic  :offset-assert  12)
    )
   :pack-me
   :method-count-assert 9
@@ -404,15 +404,15 @@
 
 ;; definition of type generic-tie-shadow
 (deftype generic-tie-shadow (structure)
-  ((out-buf      gsf-buffer                :offset-assert 0)
-   (cur-buf      uint32                    :offset-assert 4)
-   (tie-type     int32                     :offset-assert 8)
-   (ptr-inst     uint32                    :offset-assert 12)
-   (ptr-buf      uint32                    :offset-assert 16)
-   (inst-xor     int32                     :offset-assert 20)
-   (end-of-chain uint32                    :offset-assert 24)
-   (write-limit  uint32                    :offset-assert 28)
-   (calls        generic-tie-calls :inline :offset-assert 32)
+  ((out-buf      gsf-buffer                :offset-assert   0)
+   (cur-buf      uint32                    :offset-assert   4)
+   (tie-type     int32                     :offset-assert   8)
+   (ptr-inst     uint32                    :offset-assert  12)
+   (ptr-buf      uint32                    :offset-assert  16)
+   (inst-xor     int32                     :offset-assert  20)
+   (end-of-chain uint32                    :offset-assert  24)
+   (write-limit  uint32                    :offset-assert  28)
+   (calls        generic-tie-calls :inline :offset-assert  32)
    )
   :pack-me
   :method-count-assert 9
@@ -437,9 +437,9 @@
 
 ;; definition of type generic-tie-work
 (deftype generic-tie-work (structure)
-  ((control     generic-tie-control  :inline :offset-assert 0)
-   (interp-job  generic-interp-job   :inline :offset-assert 60)
-   (shadow      generic-tie-shadow   :inline :offset-assert 76)
+  ((control     generic-tie-control  :inline :offset-assert   0)
+   (interp-job  generic-interp-job   :inline :offset-assert  60)
+   (shadow      generic-tie-shadow   :inline :offset-assert  76)
    (input-a     generic-tie-input    :inline :offset-assert 128)
    (input-b     generic-tie-input    :inline :offset-assert 3376)
    (inst-buf    generic-tie-instance :inline :offset-assert 6624)
diff --git a/test/decompiler/reference/engine/gfx/tie/prototype-h_REF.gc b/test/decompiler/reference/engine/gfx/tie/prototype-h_REF.gc
index 078d698f49..e3bf406ab1 100644
--- a/test/decompiler/reference/engine/gfx/tie/prototype-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/tie/prototype-h_REF.gc
@@ -3,25 +3,25 @@
 
 ;; definition of type prototype-bucket
 (deftype prototype-bucket (basic)
-  ((name          basic                :offset-assert 4)
-   (flags         uint32               :offset-assert 8)
-   (in-level      uint16               :offset-assert 12)
-   (utextures     uint16               :offset-assert 14)
-   (geometry      drawable 4           :offset-assert 16)
-   (dists         vector   :inline     :offset-assert 32)
-   (rdists        vector   :inline     :offset-assert 48)
-   (next          uint32   4           :offset-assert 64)
-   (count         uint16   4           :offset-assert 80)
-   (near-plane    float    :offset  32)
-   (near-stiff    float    :offset  36)
-   (mid-plane     float    :offset  40)
-   (far-plane     float    :offset  44)
-   (rlength-near  float    :offset  48)
-   (rlength-stiff float    :offset  52)
-   (rlength-mid   float    :offset  56)
-   (stiffness     float    :offset  60)
-   (next-clear    uint128  :offset  64)
-   (count-clear   uint64   :offset  80)
+  ((name          basic            :offset-assert   4)
+   (flags         uint32           :offset-assert   8)
+   (in-level      uint16           :offset-assert  12)
+   (utextures     uint16           :offset-assert  14)
+   (geometry      drawable 4       :offset-assert  16)
+   (dists         vector   :inline :offset-assert  32)
+   (rdists        vector   :inline :offset-assert  48)
+   (next          uint32   4       :offset-assert  64)
+   (count         uint16   4       :offset-assert  80)
+   (near-plane    float            :offset         32)
+   (near-stiff    float            :offset         36)
+   (mid-plane     float            :offset         40)
+   (far-plane     float            :offset         44)
+   (rlength-near  float            :offset         48)
+   (rlength-stiff float            :offset         52)
+   (rlength-mid   float            :offset         56)
+   (stiffness     float            :offset         60)
+   (next-clear    uint128          :offset         64)
+   (count-clear   uint64           :offset         80)
    )
   :method-count-assert 9
   :size-assert         #x58
@@ -56,9 +56,9 @@
 
 ;; definition of type prototype-bucket-shrub
 (deftype prototype-bucket-shrub (prototype-bucket)
-  ((mod-count  uint16  4           :offset-assert 88)
-   (last       uint32  4           :offset-assert 96)
-   (last-clear uint128 :offset  96)
+  ((mod-count  uint16  4 :offset-assert  88)
+   (last       uint32  4 :offset-assert  96)
+   (last-clear uint128   :offset         96)
    )
   :method-count-assert 9
   :size-assert         #x70
@@ -96,9 +96,9 @@
 
 ;; definition of type prototype-inline-array-shrub
 (deftype prototype-inline-array-shrub (drawable)
-  ((length int16                  :offset   6)
-   (data   prototype-bucket-shrub 1 :inline :offset  32)
-   (_pad   uint32                                       :offset-assert 144)
+  ((length int16                            :offset          6)
+   (data   prototype-bucket-shrub 1 :inline :offset         32)
+   (_pad   uint32                           :offset-assert 144)
    )
   :method-count-assert 18
   :size-assert         #x94
@@ -120,8 +120,8 @@
 
 ;; definition of type prototype-array-shrub-info
 (deftype prototype-array-shrub-info (basic)
-  ((prototype-inline-array-shrub basic   :offset-assert 4)
-   (wind-vectors                 uint32  :offset-assert 8)
+  ((prototype-inline-array-shrub basic   :offset-assert   4)
+   (wind-vectors                 uint32  :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -142,20 +142,20 @@
 
 ;; definition of type prototype-bucket-tie
 (deftype prototype-bucket-tie (prototype-bucket)
-  ((generic-count       uint16       4           :offset-assert 88)
-   (generic-next        uint32       4           :offset-assert 96)
-   (frag-count          uint8        4           :offset-assert 112)
-   (index-start         uint8        4           :offset-assert 116)
-   (base-qw             uint16       4           :offset-assert 120)
-   (envmap-rfade        float                    :offset-assert 128)
-   (envmap-fade-far     float                    :offset-assert 132)
-   (envmap-shader       adgif-shader             :offset-assert 136)
-   (collide-frag        basic                    :offset-assert 140)
-   (tie-colors          basic                    :offset-assert 144)
-   (data                uint32       :dynamic    :offset-assert 148)
-   (color-index-qwc     uint32       :dynamic    :offset-assert 148)
-   (generic-next-clear  uint128      :offset  96)
-   (generic-count-clear uint128      :offset  80)
+  ((generic-count       uint16       4        :offset-assert  88)
+   (generic-next        uint32       4        :offset-assert  96)
+   (frag-count          uint8        4        :offset-assert 112)
+   (index-start         uint8        4        :offset-assert 116)
+   (base-qw             uint16       4        :offset-assert 120)
+   (envmap-rfade        float                 :offset-assert 128)
+   (envmap-fade-far     float                 :offset-assert 132)
+   (envmap-shader       adgif-shader          :offset-assert 136)
+   (collide-frag        basic                 :offset-assert 140)
+   (tie-colors          basic                 :offset-assert 144)
+   (data                uint32       :dynamic :offset-assert 148)
+   (color-index-qwc     uint32       :dynamic :offset-assert 148)
+   (generic-next-clear  uint128               :offset         96)
+   (generic-count-clear uint128               :offset         80)
    )
   :method-count-assert 9
   :size-assert         #x94
@@ -226,8 +226,8 @@
 
 ;; definition of type proxy-prototype-array-tie
 (deftype proxy-prototype-array-tie (basic)
-  ((prototype-array-tie basic   :offset-assert 4)
-   (wind-vectors        uint32  :offset-assert 8)
+  ((prototype-array-tie basic   :offset-assert   4)
+   (wind-vectors        uint32  :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -244,9 +244,9 @@
 
 ;; definition of type instance
 (deftype instance (drawable)
-  ((bucket-index uint16   :offset   6)
-   (origin       matrix4h :inline     :offset-assert 32)
-   (wind-index   uint16   :offset  62)
+  ((bucket-index uint16           :offset          6)
+   (origin       matrix4h :inline :offset-assert  32)
+   (wind-index   uint16           :offset         62)
    )
   :method-count-assert 18
   :size-assert         #x40
diff --git a/test/decompiler/reference/engine/gfx/tie/tie-h_REF.gc b/test/decompiler/reference/engine/gfx/tie/tie-h_REF.gc
index 471618b89b..1c0db49012 100644
--- a/test/decompiler/reference/engine/gfx/tie/tie-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/tie/tie-h_REF.gc
@@ -3,21 +3,21 @@
 
 ;; definition of type tie-fragment
 (deftype tie-fragment (drawable)
-  ((gif-ref       uint32 :offset   4)
-   (point-ref     uint32 :offset   8)
-   (color-index   uint16 :offset  12)
-   (base-colors   uint8  :offset  14)
-   (tex-count     uint16             :offset-assert 32)
-   (gif-count     uint16             :offset-assert 34)
-   (vertex-count  uint16             :offset-assert 36)
-   (color-count   uint16             :offset-assert 38)
-   (num-tris      uint16             :offset-assert 40)
-   (num-dverts    uint16             :offset-assert 42)
-   (dp-ref        uint32             :offset-assert 44)
-   (dp-qwc        uint32             :offset-assert 48)
-   (generic-ref   uint32             :offset-assert 52)
-   (generic-count uint32             :offset-assert 56)
-   (debug-lines   basic              :offset-assert 60)
+  ((gif-ref       uint32  :offset          4)
+   (point-ref     uint32  :offset          8)
+   (color-index   uint16  :offset         12)
+   (base-colors   uint8   :offset         14)
+   (tex-count     uint16  :offset-assert  32)
+   (gif-count     uint16  :offset-assert  34)
+   (vertex-count  uint16  :offset-assert  36)
+   (color-count   uint16  :offset-assert  38)
+   (num-tris      uint16  :offset-assert  40)
+   (num-dverts    uint16  :offset-assert  42)
+   (dp-ref        uint32  :offset-assert  44)
+   (dp-qwc        uint32  :offset-assert  48)
+   (generic-ref   uint32  :offset-assert  52)
+   (generic-count uint32  :offset-assert  56)
+   (debug-lines   basic   :offset-assert  60)
    )
   :method-count-assert 18
   :size-assert         #x40
@@ -49,10 +49,10 @@
 
 ;; definition of type instance-tie
 (deftype instance-tie (instance)
-  ((color-indices uint32 :offset   8)
-   (bucket-ptr    basic  :offset  12)
-   (max-scale     uint16 :offset  38)
-   (flags         uint16 :offset  46)
+  ((color-indices uint32  :offset   8)
+   (bucket-ptr    basic   :offset  12)
+   (max-scale     uint16  :offset  38)
+   (flags         uint16  :offset  46)
    )
   :method-count-assert 18
   :size-assert         #x40
@@ -76,8 +76,8 @@
 
 ;; definition of type drawable-inline-array-instance-tie
 (deftype drawable-inline-array-instance-tie (drawable-inline-array)
-  ((data instance-tie 1 :inline :offset-assert 32)
-   (pad  uint32                 :offset-assert 96)
+  ((data instance-tie 1 :inline :offset-assert  32)
+   (pad  uint32                 :offset-assert  96)
    )
   :method-count-assert 18
   :size-assert         #x64
@@ -86,7 +86,7 @@
 
 ;; definition of type drawable-tree-instance-tie
 (deftype drawable-tree-instance-tie (drawable-tree)
-  ((prototypes basic :offset   8)
+  ((prototypes basic  :offset   8)
    )
   :method-count-assert 18
   :size-assert         #x24
@@ -106,8 +106,8 @@
 
 ;; definition of type prototype-tie
 (deftype prototype-tie (drawable-inline-array)
-  ((data instance-tie 1 :inline :offset-assert 32)
-   (pad  uint32                 :offset-assert 96)
+  ((data instance-tie 1 :inline :offset-assert  32)
+   (pad  uint32                 :offset-assert  96)
    )
   :method-count-assert 18
   :size-assert         #x64
@@ -116,9 +116,9 @@
 
 ;; definition of type tie-matrix
 (deftype tie-matrix (structure)
-  ((mat   matrix :inline :offset-assert 0)
-   (morph qword  :inline :offset-assert 64)
-   (fog   qword  :inline :offset-assert 80)
+  ((mat   matrix :inline :offset-assert   0)
+   (morph qword  :inline :offset-assert  64)
+   (fog   qword  :inline :offset-assert  80)
    )
   :method-count-assert 9
   :size-assert         #x60
@@ -136,13 +136,13 @@
 
 ;; definition of type instance-tie-work
 (deftype instance-tie-work (structure)
-  ((wind-const                  vector     :inline   :offset-assert 0)
-   (hmge-d                      vector     :inline   :offset-assert 16)
-   (hvdf-offset                 vector     :inline   :offset-assert 32)
-   (wind-force                  vector     :inline   :offset-assert 48)
-   (constant                    vector     :inline   :offset-assert 64)
-   (far-morph                   vector     :inline   :offset-assert 80)
-   (dist-test                   vector     :inline   :offset-assert 96)
+  ((wind-const                  vector     :inline   :offset-assert   0)
+   (hmge-d                      vector     :inline   :offset-assert  16)
+   (hvdf-offset                 vector     :inline   :offset-assert  32)
+   (wind-force                  vector     :inline   :offset-assert  48)
+   (constant                    vector     :inline   :offset-assert  64)
+   (far-morph                   vector     :inline   :offset-assert  80)
+   (dist-test                   vector     :inline   :offset-assert  96)
    (min-dist                    vector     :inline   :offset-assert 112)
    (guard-plane                 plane      4 :inline :offset-assert 128)
    (upload-color-0              dma-packet :inline   :offset-assert 192)
@@ -246,7 +246,7 @@
 
 ;; definition of type instance-tie-dma
 (deftype instance-tie-dma (structure)
-  ((banka instance-tie      32 :inline :offset-assert 0)
+  ((banka instance-tie      32 :inline :offset-assert   0)
    (bankb instance-tie      32 :inline :offset-assert 2048)
    (outa  uint128           256        :offset-assert 4096)
    (outb  uint128           256        :offset-assert 8192)
@@ -270,13 +270,13 @@
 
 ;; definition of type prototype-tie-work
 (deftype prototype-tie-work (structure)
-  ((upload-palette-0      dma-packet :inline :offset-assert 0)
-   (upload-palette-1      dma-packet :inline :offset-assert 16)
-   (upload-model-0        dma-packet :inline :offset-assert 32)
-   (upload-model-1        dma-packet :inline :offset-assert 48)
-   (upload-model-2        dma-packet :inline :offset-assert 64)
-   (upload-model-3        dma-packet :inline :offset-assert 80)
-   (upload-model-near-0   dma-packet :inline :offset-assert 96)
+  ((upload-palette-0      dma-packet :inline :offset-assert   0)
+   (upload-palette-1      dma-packet :inline :offset-assert  16)
+   (upload-model-0        dma-packet :inline :offset-assert  32)
+   (upload-model-1        dma-packet :inline :offset-assert  48)
+   (upload-model-2        dma-packet :inline :offset-assert  64)
+   (upload-model-3        dma-packet :inline :offset-assert  80)
+   (upload-model-near-0   dma-packet :inline :offset-assert  96)
    (upload-model-near-1   dma-packet :inline :offset-assert 112)
    (upload-model-near-2   dma-packet :inline :offset-assert 128)
    (upload-model-near-3   dma-packet :inline :offset-assert 144)
@@ -386,16 +386,16 @@
 
 ;; definition of type prototype-tie-dma
 (deftype prototype-tie-dma (structure)
-  ((colora          rgba    256           :offset-assert 0)
-   (colorb          rgba    256           :offset-assert 1024)
-   (outa            uint128 256           :offset-assert 2048)
-   (outb            uint128 256           :offset-assert 6144)
-   (length          uint32                :offset-assert 10240)
-   (dma-buffer      basic                 :offset-assert 10244)
-   (this-frag-count uint32                :offset-assert 10248)
-   (next            uint32  4 :offset 10256)
-   (geometry        uint32  4             :offset-assert 10272)
-   (frag-count      uint8   4             :offset-assert 10288)
+  ((colora          rgba    256 :offset-assert   0)
+   (colorb          rgba    256 :offset-assert 1024)
+   (outa            uint128 256 :offset-assert 2048)
+   (outb            uint128 256 :offset-assert 6144)
+   (length          uint32      :offset-assert 10240)
+   (dma-buffer      basic       :offset-assert 10244)
+   (this-frag-count uint32      :offset-assert 10248)
+   (next            uint32  4   :offset        10256)
+   (geometry        uint32  4   :offset-assert 10272)
+   (frag-count      uint8   4   :offset-assert 10288)
    )
   :method-count-assert 9
   :size-assert         #x2834
diff --git a/test/decompiler/reference/engine/gfx/time-of-day-h_REF.gc b/test/decompiler/reference/engine/gfx/time-of-day-h_REF.gc
index 5e57cae363..32eb5669d0 100644
--- a/test/decompiler/reference/engine/gfx/time-of-day-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/time-of-day-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type palette-fade-control
 (deftype palette-fade-control (structure)
-  ((trans      vector :inline :offset-assert 0)
-   (fade       float          :offset-assert 16)
-   (actor-dist float          :offset-assert 20)
+  ((trans      vector :inline :offset-assert   0)
+   (fade       float          :offset-assert  16)
+   (actor-dist float          :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x18
@@ -23,7 +23,7 @@
 
 ;; definition of type palette-fade-controls
 (deftype palette-fade-controls (basic)
-  ((control palette-fade-control 8 :inline :offset-assert 16)
+  ((control palette-fade-control 8 :inline :offset-assert  16)
    )
   :method-count-assert 11
   :size-assert         #x110
@@ -101,10 +101,10 @@
 
 ;; definition of type time-of-day-palette
 (deftype time-of-day-palette (basic)
-  ((width  int32   :offset-assert 4)
-   (height int32   :offset-assert 8)
-   (pad    int32   :offset-assert 12)
-   (data   int32 1 :offset-assert 16)
+  ((width  int32   :offset-assert   4)
+   (height int32   :offset-assert   8)
+   (pad    int32   :offset-assert  12)
+   (data   int32 1 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -123,12 +123,12 @@
 
 ;; definition of type time-of-day-context
 (deftype time-of-day-context (basic)
-  ((active-count         uint32                :offset-assert 4)
-   (interp               float                 :offset-assert 8)
-   (current-interp       float                 :offset-assert 12)
-   (moods                uint64      2         :offset-assert 16)
-   (current-fog          mood-fog    :inline   :offset-assert 32)
-   (current-sun          mood-sun    :inline   :offset-assert 80)
+  ((active-count         uint32                :offset-assert   4)
+   (interp               float                 :offset-assert   8)
+   (current-interp       float                 :offset-assert  12)
+   (moods                uint64      2         :offset-assert  16)
+   (current-fog          mood-fog    :inline   :offset-assert  32)
+   (current-sun          mood-sun    :inline   :offset-assert  80)
    (current-prt-color    vector      :inline   :offset-assert 112)
    (current-shadow       vector      :inline   :offset-assert 128)
    (current-shadow-color vector      :inline   :offset-assert 144)
@@ -191,7 +191,7 @@
 
 ;; definition of type time-of-day-dma
 (deftype time-of-day-dma (structure)
-  ((outa  uint32 256 :offset-assert 0)
+  ((outa  uint32 256 :offset-assert   0)
    (outb  uint32 256 :offset-assert 1024)
    (banka uint32 256 :offset-assert 2048)
    (bankb uint32 256 :offset-assert 3072)
diff --git a/test/decompiler/reference/engine/gfx/vis/bsp-h_REF.gc b/test/decompiler/reference/engine/gfx/vis/bsp-h_REF.gc
index 791bff20a5..c73ba6be99 100644
--- a/test/decompiler/reference/engine/gfx/vis/bsp-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/vis/bsp-h_REF.gc
@@ -3,11 +3,11 @@
 
 ;; definition of type bsp-node
 (deftype bsp-node (structure)
-  ((front       int32          :offset-assert 0)
-   (back        int32          :offset-assert 4)
-   (front-flags uint32         :offset-assert 8)
-   (back-flags  uint32         :offset-assert 12)
-   (plane       vector :inline :offset-assert 16)
+  ((front       int32          :offset-assert   0)
+   (back        int32          :offset-assert   4)
+   (front-flags uint32         :offset-assert   8)
+   (back-flags  uint32         :offset-assert  12)
+   (plane       vector :inline :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -27,34 +27,34 @@
 
 ;; definition of type bsp-header
 (deftype bsp-header (drawable)
-  ((info                file-info                     :offset   4)
-   (all-visible-list    (pointer uint16)                          :offset-assert 32)
-   (visible-list-length int32                                     :offset-assert 36)
-   (drawable-trees      drawable-tree-array                       :offset-assert 40)
-   (pat                 pointer                                   :offset-assert 44)
-   (pat-length          int32                                     :offset-assert 48)
-   (unk-data-0          pointer                                   :offset-assert 52)
-   (unk-data-0-len      int32                                     :offset-assert 56)
-   (unk-data-1          pointer                                   :offset-assert 60)
-   (unk-data-1-len      int32                                     :offset-assert 64)
-   (unk-zero-0          uint32                                    :offset-assert 68)
-   (name                symbol                                    :offset-assert 72)
-   (nickname            symbol                                    :offset-assert 76)
-   (vis-info            level-vis-info                8           :offset-assert 80)
-   (actors              drawable-inline-array-actor               :offset-assert 112)
-   (cameras             (array entity-camera)                     :offset-assert 116)
-   (nodes               (inline-array bsp-node)                   :offset-assert 120)
-   (level               level                                     :offset-assert 124)
-   (unk-data-2          uint32                        5           :offset-assert 128)
-   (boxes               box8s-array                               :offset-assert 148)
-   (unk-data-3          uint32                                    :offset-assert 152)
-   (ambients            drawable-inline-array-ambient             :offset-assert 156)
-   (unk-data-4          uint32                                    :offset-assert 160)
-   (unk-data-5          uint32                                    :offset-assert 164)
-   (adgifs              adgif-shader-array                        :offset-assert 168)
-   (unk-data-6          pointer                                   :offset-assert 172)
-   (unk-data-7          pointer                                   :offset-assert 176)
-   (unk-data-8          uint32                        55          :offset-assert 180)
+  ((info                file-info                        :offset          4)
+   (all-visible-list    (pointer uint16)                 :offset-assert  32)
+   (visible-list-length int32                            :offset-assert  36)
+   (drawable-trees      drawable-tree-array              :offset-assert  40)
+   (pat                 pointer                          :offset-assert  44)
+   (pat-length          int32                            :offset-assert  48)
+   (unk-data-0          pointer                          :offset-assert  52)
+   (unk-data-0-len      int32                            :offset-assert  56)
+   (unk-data-1          pointer                          :offset-assert  60)
+   (unk-data-1-len      int32                            :offset-assert  64)
+   (unk-zero-0          uint32                           :offset-assert  68)
+   (name                symbol                           :offset-assert  72)
+   (nickname            symbol                           :offset-assert  76)
+   (vis-info            level-vis-info                8  :offset-assert  80)
+   (actors              drawable-inline-array-actor      :offset-assert 112)
+   (cameras             (array entity-camera)            :offset-assert 116)
+   (nodes               (inline-array bsp-node)          :offset-assert 120)
+   (level               level                            :offset-assert 124)
+   (unk-data-2          uint32                        5  :offset-assert 128)
+   (boxes               box8s-array                      :offset-assert 148)
+   (unk-data-3          uint32                           :offset-assert 152)
+   (ambients            drawable-inline-array-ambient    :offset-assert 156)
+   (unk-data-4          uint32                           :offset-assert 160)
+   (unk-data-5          uint32                           :offset-assert 164)
+   (adgifs              adgif-shader-array               :offset-assert 168)
+   (unk-data-6          pointer                          :offset-assert 172)
+   (unk-data-7          pointer                          :offset-assert 176)
+   (unk-data-8          uint32                        55 :offset-assert 180)
    )
   :method-count-assert 20
   :size-assert         #x190
@@ -67,7 +67,7 @@
 
 ;; definition of type game-level
 (deftype game-level (basic)
-  ((master-bsp basic  :offset-assert 4)
+  ((master-bsp basic  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -83,13 +83,13 @@
 
 ;; definition of type view-frustum
 (deftype view-frustum (structure)
-  ((hither-top-left     vector :inline :offset-assert 0)
-   (hither-top-right    vector :inline :offset-assert 16)
-   (hither-bottom-left  vector :inline :offset-assert 32)
-   (hither-bottom-right vector :inline :offset-assert 48)
-   (yon-top-left        vector :inline :offset-assert 64)
-   (yon-top-right       vector :inline :offset-assert 80)
-   (yon-bottom-left     vector :inline :offset-assert 96)
+  ((hither-top-left     vector :inline :offset-assert   0)
+   (hither-top-right    vector :inline :offset-assert  16)
+   (hither-bottom-left  vector :inline :offset-assert  32)
+   (hither-bottom-right vector :inline :offset-assert  48)
+   (yon-top-left        vector :inline :offset-assert  64)
+   (yon-top-right       vector :inline :offset-assert  80)
+   (yon-bottom-left     vector :inline :offset-assert  96)
    (yon-bottom-right    vector :inline :offset-assert 112)
    )
   :method-count-assert 9
@@ -181,9 +181,9 @@
 
 ;; definition of type cl-stat
 (deftype cl-stat (structure)
-  ((fragments uint32  :offset-assert 0)
-   (tris      uint32  :offset-assert 4)
-   (output    uint32  :offset-assert 8)
+  ((fragments uint32  :offset-assert   0)
+   (tris      uint32  :offset-assert   4)
+   (output    uint32  :offset-assert   8)
    )
   :pack-me
   :method-count-assert 9
@@ -202,13 +202,13 @@
 
 ;; definition of type collide-stats
 (deftype collide-stats (structure)
-  ((other             cl-stat   :inline :offset-assert 0)
-   (total             cl-stat   :inline :offset-assert 12)
-   (nodes             uint32            :offset-assert 24)
-   (calls             uint32            :offset-assert 28)
-   (total-target      stopwatch :inline :offset-assert 32)
-   (target-cache-fill stopwatch :inline :offset-assert 64)
-   (target-ray-poly   stopwatch :inline :offset-assert 96)
+  ((other             cl-stat   :inline :offset-assert   0)
+   (total             cl-stat   :inline :offset-assert  12)
+   (nodes             uint32            :offset-assert  24)
+   (calls             uint32            :offset-assert  28)
+   (total-target      stopwatch :inline :offset-assert  32)
+   (target-cache-fill stopwatch :inline :offset-assert  64)
+   (target-ray-poly   stopwatch :inline :offset-assert  96)
    (pad               uint32            :offset-assert 124)
    )
   :method-count-assert 9
diff --git a/test/decompiler/reference/engine/gfx/water/water-h_REF.gc b/test/decompiler/reference/engine/gfx/water/water-h_REF.gc
index ef50bc4a70..af9aef2fd8 100644
--- a/test/decompiler/reference/engine/gfx/water/water-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/water/water-h_REF.gc
@@ -3,40 +3,40 @@
 
 ;; definition of type water-control
 (deftype water-control (basic)
-  ((flags             uint32                    :offset-assert 4)
-   (process           basic                     :offset-assert 8)
-   (joint-index       int32                     :offset-assert 12)
-   (top-y-offset      float                     :offset-assert 16)
-   (ripple-size       float                     :offset-assert 20)
-   (enter-water-time  uint64                    :offset-assert 24)
-   (wade-time         uint64                    :offset-assert 32)
-   (on-water-time     uint64                    :offset-assert 40)
-   (enter-swim-time   uint64                    :offset-assert 48)
-   (swim-time         uint64                    :offset-assert 56)
-   (base-height       float                     :offset-assert 64)
-   (wade-height       float                     :offset-assert 68)
-   (swim-height       float                     :offset-assert 72)
-   (surface-height    float                     :offset-assert 76)
-   (bottom-height     float                     :offset-assert 80)
-   (height            float                     :offset-assert 84)
-   (height-offset     float         4           :offset-assert 88)
-   (real-ocean-offset float         :offset  88)
-   (ocean-offset      float         :offset  92)
-   (bob-offset        float         :offset  96)
-   (align-offset      float         :offset 100)
-   (swim-depth        float                     :offset-assert 104)
-   (bob               smush-control :inline     :offset-assert 112)
-   (volume            uint64                    :offset-assert 144)
-   (bottom            vector        2 :inline   :offset-assert 160)
-   (top               vector        2 :inline   :offset-assert 192)
-   (enter-water-pos   vector        :inline     :offset-assert 224)
-   (drip-old-pos      vector        :inline     :offset-assert 240)
-   (drip-joint-index  int32                     :offset-assert 256)
-   (drip-wetness      float                     :offset-assert 260)
-   (drip-time         uint64                    :offset-assert 264)
-   (drip-speed        float                     :offset-assert 272)
-   (drip-height       float                     :offset-assert 276)
-   (drip-mult         float                     :offset-assert 280)
+  ((flags             uint32                  :offset-assert   4)
+   (process           basic                   :offset-assert   8)
+   (joint-index       int32                   :offset-assert  12)
+   (top-y-offset      float                   :offset-assert  16)
+   (ripple-size       float                   :offset-assert  20)
+   (enter-water-time  uint64                  :offset-assert  24)
+   (wade-time         uint64                  :offset-assert  32)
+   (on-water-time     uint64                  :offset-assert  40)
+   (enter-swim-time   uint64                  :offset-assert  48)
+   (swim-time         uint64                  :offset-assert  56)
+   (base-height       float                   :offset-assert  64)
+   (wade-height       float                   :offset-assert  68)
+   (swim-height       float                   :offset-assert  72)
+   (surface-height    float                   :offset-assert  76)
+   (bottom-height     float                   :offset-assert  80)
+   (height            float                   :offset-assert  84)
+   (height-offset     float         4         :offset-assert  88)
+   (real-ocean-offset float                   :offset         88)
+   (ocean-offset      float                   :offset         92)
+   (bob-offset        float                   :offset         96)
+   (align-offset      float                   :offset        100)
+   (swim-depth        float                   :offset-assert 104)
+   (bob               smush-control :inline   :offset-assert 112)
+   (volume            uint64                  :offset-assert 144)
+   (bottom            vector        2 :inline :offset-assert 160)
+   (top               vector        2 :inline :offset-assert 192)
+   (enter-water-pos   vector        :inline   :offset-assert 224)
+   (drip-old-pos      vector        :inline   :offset-assert 240)
+   (drip-joint-index  int32                   :offset-assert 256)
+   (drip-wetness      float                   :offset-assert 260)
+   (drip-time         uint64                  :offset-assert 264)
+   (drip-speed        float                   :offset-assert 272)
+   (drip-height       float                   :offset-assert 276)
+   (drip-mult         float                   :offset-assert 280)
    )
   :method-count-assert 17
   :size-assert         #x11c
diff --git a/test/decompiler/reference/engine/gfx/wind-h_REF.gc b/test/decompiler/reference/engine/gfx/wind-h_REF.gc
index e357657891..3be469c87a 100644
--- a/test/decompiler/reference/engine/gfx/wind-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/wind-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type wind-vector
 (deftype wind-vector (structure)
-  ((wind-pos vector2w :inline :offset-assert 0)
-   (wind-vel vector2w :inline :offset-assert 8)
+  ((wind-pos vector2w :inline :offset-assert   0)
+   (wind-vel vector2w :inline :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -65,7 +65,7 @@
 
 ;; definition of type wind-work
 (deftype wind-work (basic)
-  ((wind-array  vector 64 :inline :offset-assert 16)
+  ((wind-array  vector 64 :inline :offset-assert  16)
    (wind-normal vector :inline    :offset-assert 1040)
    (wind-temp   vector :inline    :offset-assert 1056)
    (wind-force  float  64         :offset-assert 1072)
diff --git a/test/decompiler/reference/engine/level/level-h_REF.gc b/test/decompiler/reference/engine/level/level-h_REF.gc
index 91a8f24d94..b0558208d2 100644
--- a/test/decompiler/reference/engine/level/level-h_REF.gc
+++ b/test/decompiler/reference/engine/level/level-h_REF.gc
@@ -3,19 +3,19 @@
 
 ;; definition of type level-vis-info
 (deftype level-vis-info (basic)
-  ((level              basic           :offset-assert 4)
-   (from-level         basic           :offset-assert 8)
-   (from-bsp           basic           :offset-assert 12)
-   (flags              uint32          :offset-assert 16)
-   (length             uint32          :offset-assert 20)
-   (allocated-length   uint32          :offset-assert 24)
-   (dictionary-length  uint32          :offset-assert 28)
-   (dictionary         uint32          :offset-assert 32)
-   (string-block       uint32          :offset-assert 36)
-   (ramdisk            uint32          :offset-assert 40)
-   (vis-bits           uint32          :offset-assert 44)
-   (current-vis-string uint32          :offset-assert 48)
-   (vis-string         uint8  :dynamic :offset-assert 52)
+  ((level              basic           :offset-assert   4)
+   (from-level         basic           :offset-assert   8)
+   (from-bsp           basic           :offset-assert  12)
+   (flags              uint32          :offset-assert  16)
+   (length             uint32          :offset-assert  20)
+   (allocated-length   uint32          :offset-assert  24)
+   (dictionary-length  uint32          :offset-assert  28)
+   (dictionary         uint32          :offset-assert  32)
+   (string-block       uint32          :offset-assert  36)
+   (ramdisk            uint32          :offset-assert  40)
+   (vis-bits           uint32          :offset-assert  44)
+   (current-vis-string uint32          :offset-assert  48)
+   (vis-string         uint8  :dynamic :offset-assert  52)
    )
   :method-count-assert 9
   :size-assert         #x34
@@ -49,33 +49,33 @@
 
 ;; definition of type level-load-info
 (deftype level-load-info (basic)
-  ((name-list         basic  3           :offset-assert 4)
-   (index             int32              :offset-assert 16)
-   (name              basic  :offset   4)
-   (visname           basic  :offset   8)
-   (nickname          basic  :offset  12)
-   (packages          pair               :offset-assert 20)
-   (sound-banks       pair               :offset-assert 24)
-   (music-bank        basic              :offset-assert 28)
-   (ambient-sounds    pair               :offset-assert 32)
-   (mood              basic              :offset-assert 36)
-   (mood-func         basic              :offset-assert 40)
-   (ocean             basic              :offset-assert 44)
-   (sky               basic              :offset-assert 48)
-   (sun-fade          float              :offset-assert 52)
-   (continues         pair               :offset-assert 56)
-   (tasks             pair               :offset-assert 60)
-   (priority          int32              :offset-assert 64)
-   (load-commands     pair               :offset-assert 68)
-   (alt-load-commands pair               :offset-assert 72)
-   (bsp-mask          uint64             :offset-assert 80)
-   (bsphere           sphere             :offset-assert 88)
-   (buzzer            int32              :offset-assert 92)
-   (bottom-height     float              :offset-assert 96)
-   (run-packages      pair               :offset-assert 100)
-   (prev-level        basic              :offset-assert 104)
-   (next-level        basic              :offset-assert 108)
-   (wait-for-load     basic              :offset-assert 112)
+  ((name-list         basic  3 :offset-assert   4)
+   (index             int32    :offset-assert  16)
+   (name              basic    :offset          4)
+   (visname           basic    :offset          8)
+   (nickname          basic    :offset         12)
+   (packages          pair     :offset-assert  20)
+   (sound-banks       pair     :offset-assert  24)
+   (music-bank        basic    :offset-assert  28)
+   (ambient-sounds    pair     :offset-assert  32)
+   (mood              basic    :offset-assert  36)
+   (mood-func         basic    :offset-assert  40)
+   (ocean             basic    :offset-assert  44)
+   (sky               basic    :offset-assert  48)
+   (sun-fade          float    :offset-assert  52)
+   (continues         pair     :offset-assert  56)
+   (tasks             pair     :offset-assert  60)
+   (priority          int32    :offset-assert  64)
+   (load-commands     pair     :offset-assert  68)
+   (alt-load-commands pair     :offset-assert  72)
+   (bsp-mask          uint64   :offset-assert  80)
+   (bsphere           sphere   :offset-assert  88)
+   (buzzer            int32    :offset-assert  92)
+   (bottom-height     float    :offset-assert  96)
+   (run-packages      pair     :offset-assert 100)
+   (prev-level        basic    :offset-assert 104)
+   (next-level        basic    :offset-assert 108)
+   (wait-for-load     basic    :offset-assert 112)
    )
   :method-count-assert 9
   :size-assert         #x74
@@ -117,10 +117,10 @@
 
 ;; definition of type login-state
 (deftype login-state (basic)
-  ((state int32     :offset-assert 4)
-   (pos   uint32    :offset-assert 8)
-   (elts  uint32    :offset-assert 12)
-   (elt   uint32 16 :offset-assert 16)
+  ((state int32     :offset-assert   4)
+   (pos   uint32    :offset-assert   8)
+   (elts  uint32    :offset-assert  12)
+   (elt   uint32 16 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -139,18 +139,18 @@
 
 ;; definition of type level
 (deftype level (basic)
-  ((name                      basic                               :offset-assert 4)
-   (load-name                 basic                               :offset-assert 8)
-   (nickname                  basic                               :offset-assert 12)
-   (index                     int32                               :offset-assert 16)
-   (status                    basic                               :offset-assert 20)
-   (other                     basic                               :offset-assert 24)
-   (heap                      kheap                     :inline   :offset-assert 32)
-   (bsp                       bsp-header                          :offset-assert 48)
-   (art-group                 art-group                           :offset-assert 52)
-   (info                      basic                               :offset-assert 56)
-   (texture-page              texture-page              9         :offset-assert 60)
-   (loaded-texture-page       basic                     16        :offset-assert 96)
+  ((name                      basic                               :offset-assert   4)
+   (load-name                 basic                               :offset-assert   8)
+   (nickname                  basic                               :offset-assert  12)
+   (index                     int32                               :offset-assert  16)
+   (status                    basic                               :offset-assert  20)
+   (other                     basic                               :offset-assert  24)
+   (heap                      kheap                     :inline   :offset-assert  32)
+   (bsp                       bsp-header                          :offset-assert  48)
+   (art-group                 art-group                           :offset-assert  52)
+   (info                      basic                               :offset-assert  56)
+   (texture-page              texture-page              9         :offset-assert  60)
+   (loaded-texture-page       basic                     16        :offset-assert  96)
    (loaded-texture-page-count int32                               :offset-assert 160)
    (foreground-sink-group     dma-foreground-sink-group 3 :inline :offset-assert 176)
    (foreground-draw-engine    basic                     3         :offset-assert 272)
@@ -268,22 +268,22 @@
 
 ;; definition of type level-group
 (deftype level-group (basic)
-  ((length          int32                              :offset-assert 4)
-   (unknown-level-1 level                              :offset-assert 8)
-   (unknown-level-2 level                              :offset-assert 12)
-   (entity-link     entity-links :offset  16)
-   (border?         basic                              :offset-assert 20)
-   (vis?            basic                              :offset-assert 24)
-   (want-level      basic                              :offset-assert 28)
-   (receiving-level basic                              :offset-assert 32)
-   (load-commands   pair                               :offset-assert 36)
-   (play?           basic                              :offset-assert 40)
-   (hack-pad        uint8        :offset  90)
-   (level0          level        :inline               :offset-assert 96)
-   (level1          level        :inline               :offset-assert 2704)
-   (level-default   level        :inline               :offset-assert 5312)
-   (level           level        3 :inline :offset  96)
-   (pad             uint32                             :offset-assert 7920)
+  ((length          int32                  :offset-assert   4)
+   (unknown-level-1 level                  :offset-assert   8)
+   (unknown-level-2 level                  :offset-assert  12)
+   (entity-link     entity-links           :offset         16)
+   (border?         basic                  :offset-assert  20)
+   (vis?            basic                  :offset-assert  24)
+   (want-level      basic                  :offset-assert  28)
+   (receiving-level basic                  :offset-assert  32)
+   (load-commands   pair                   :offset-assert  36)
+   (play?           basic                  :offset-assert  40)
+   (hack-pad        uint8                  :offset         90)
+   (level0          level        :inline   :offset-assert  96)
+   (level1          level        :inline   :offset-assert 2704)
+   (level-default   level        :inline   :offset-assert 5312)
+   (level           level        3 :inline :offset         96)
+   (pad             uint32                 :offset-assert 7920)
    )
   :method-count-assert 27
   :size-assert         #x1ef4
diff --git a/test/decompiler/reference/engine/load/file-io_REF.gc b/test/decompiler/reference/engine/load/file-io_REF.gc
index 2999e78387..a1145eea0e 100644
--- a/test/decompiler/reference/engine/load/file-io_REF.gc
+++ b/test/decompiler/reference/engine/load/file-io_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type file-stream
 (deftype file-stream (basic)
-  ((flags uint32  :offset-assert 4)
-   (mode  basic   :offset-assert 8)
-   (name  string  :offset-assert 12)
-   (file  uint32  :offset-assert 16)
+  ((flags uint32  :offset-assert   4)
+   (mode  basic   :offset-assert   8)
+   (name  string  :offset-assert  12)
+   (file  uint32  :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -52,13 +52,13 @@
 
 ;; definition of type file-info
 (deftype file-info (basic)
-  ((file-type      symbol  :offset-assert 4)
-   (file-name      basic   :offset-assert 8)
-   (major-version  uint32  :offset-assert 12)
-   (minor-version  uint32  :offset-assert 16)
-   (maya-file-name basic   :offset-assert 20)
-   (tool-debug     basic   :offset-assert 24)
-   (mdb-file-name  basic   :offset-assert 28)
+  ((file-type      symbol  :offset-assert   4)
+   (file-name      basic   :offset-assert   8)
+   (major-version  uint32  :offset-assert  12)
+   (minor-version  uint32  :offset-assert  16)
+   (maya-file-name basic   :offset-assert  20)
+   (tool-debug     basic   :offset-assert  24)
+   (mdb-file-name  basic   :offset-assert  28)
    )
   :method-count-assert 9
   :size-assert         #x20
diff --git a/test/decompiler/reference/engine/load/load-dgo_REF.gc b/test/decompiler/reference/engine/load/load-dgo_REF.gc
index 47482a6f22..fe46d7ae7b 100644
--- a/test/decompiler/reference/engine/load/load-dgo_REF.gc
+++ b/test/decompiler/reference/engine/load/load-dgo_REF.gc
@@ -3,14 +3,14 @@
 
 ;; definition of type load-dgo-msg
 (deftype load-dgo-msg (structure)
-  ((rsvd       uint16                         :offset-assert 0)
-   (result     load-msg-result                :offset-assert 2)
-   (b1         uint32                         :offset-assert 4)
-   (b2         uint32                         :offset-assert 8)
-   (bt         uint32                         :offset-assert 12)
-   (name       uint128                        :offset-assert 16)
-   (name-chars uint8           16 :offset  16)
-   (address    uint32          :offset   4)
+  ((rsvd       uint16             :offset-assert   0)
+   (result     load-msg-result    :offset-assert   2)
+   (b1         uint32             :offset-assert   4)
+   (b2         uint32             :offset-assert   8)
+   (bt         uint32             :offset-assert  12)
+   (name       uint128            :offset-assert  16)
+   (name-chars uint8           16 :offset         16)
+   (address    uint32             :offset          4)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -33,13 +33,13 @@
 
 ;; definition of type load-chunk-msg
 (deftype load-chunk-msg (structure)
-  ((rsvd     uint16                      :offset-assert 0)
-   (result   load-msg-result             :offset-assert 2)
-   (address  pointer                     :offset-assert 4)
-   (section  uint32                      :offset-assert 8)
-   (maxlen   uint32                      :offset-assert 12)
-   (id       uint32          :offset   4)
-   (basename uint8           48          :offset-assert 16)
+  ((rsvd     uint16             :offset-assert   0)
+   (result   load-msg-result    :offset-assert   2)
+   (address  pointer            :offset-assert   4)
+   (section  uint32             :offset-assert   8)
+   (maxlen   uint32             :offset-assert  12)
+   (id       uint32             :offset          4)
+   (basename uint8           48 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -61,9 +61,9 @@
 
 ;; definition of type dgo-header
 (deftype dgo-header (structure)
-  ((length   uint32          :offset-assert 0)
-   (rootname uint8  60       :offset-assert 4)
-   (data     uint8  :dynamic :offset-assert 64)
+  ((length   uint32          :offset-assert   0)
+   (rootname uint8  60       :offset-assert   4)
+   (data     uint8  :dynamic :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #x40
diff --git a/test/decompiler/reference/engine/load/loader-h_REF.gc b/test/decompiler/reference/engine/load/loader-h_REF.gc
index 7584a7d1ef..74b4ddb507 100644
--- a/test/decompiler/reference/engine/load/loader-h_REF.gc
+++ b/test/decompiler/reference/engine/load/loader-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type load-dir
 (deftype load-dir (basic)
-  ((unknown      basic           :offset-assert 4)
-   (string-array (array string)  :offset-assert 8)
-   (data-array   (array basic)   :offset-assert 12)
+  ((unknown      basic           :offset-assert   4)
+   (string-array (array string)  :offset-assert   8)
+   (data-array   (array basic)   :offset-assert  12)
    )
   :method-count-assert 11
   :size-assert         #x10
@@ -74,22 +74,22 @@
 
 ;; definition of type external-art-buffer
 (deftype external-art-buffer (basic)
-  ((index                      int32                       :offset-assert 4)
-   (other                      external-art-buffer         :offset-assert 8)
-   (status                     basic                       :offset-assert 12)
-   (locked?                    basic                       :offset-assert 16)
-   (frame-lock                 basic                       :offset-assert 20)
-   (heap                       kheap               :inline :offset-assert 32)
-   (pending-load-file          basic                       :offset-assert 48)
-   (pending-load-file-part     int32                       :offset-assert 52)
-   (pending-load-file-owner    uint64                      :offset-assert 56)
-   (pending-load-file-priority float                       :offset-assert 64)
-   (load-file                  basic                       :offset-assert 68)
-   (load-file-part             int32                       :offset-assert 72)
-   (load-file-owner            uint64                      :offset-assert 80)
-   (load-file-priority         float                       :offset-assert 88)
-   (buf                        uint32                      :offset-assert 92)
-   (len                        int32                       :offset-assert 96)
+  ((index                      int32                       :offset-assert   4)
+   (other                      external-art-buffer         :offset-assert   8)
+   (status                     basic                       :offset-assert  12)
+   (locked?                    basic                       :offset-assert  16)
+   (frame-lock                 basic                       :offset-assert  20)
+   (heap                       kheap               :inline :offset-assert  32)
+   (pending-load-file          basic                       :offset-assert  48)
+   (pending-load-file-part     int32                       :offset-assert  52)
+   (pending-load-file-owner    uint64                      :offset-assert  56)
+   (pending-load-file-priority float                       :offset-assert  64)
+   (load-file                  basic                       :offset-assert  68)
+   (load-file-part             int32                       :offset-assert  72)
+   (load-file-owner            uint64                      :offset-assert  80)
+   (load-file-priority         float                       :offset-assert  88)
+   (buf                        uint32                      :offset-assert  92)
+   (len                        int32                       :offset-assert  96)
    (art-group                  basic                       :offset-assert 100)
    )
   :method-count-assert 16
@@ -163,12 +163,12 @@
 
 ;; definition of type spool-anim
 (deftype spool-anim (basic)
-  ((name         basic  :offset  16)
-   (index        int32              :offset-assert 20)
-   (parts        int32              :offset-assert 24)
-   (priority     float              :offset-assert 28)
-   (owner        uint64             :offset-assert 32)
-   (command-list basic              :offset-assert 40)
+  ((name         basic   :offset         16)
+   (index        int32   :offset-assert  20)
+   (parts        int32   :offset-assert  24)
+   (priority     float   :offset-assert  28)
+   (owner        uint64  :offset-assert  32)
+   (command-list basic   :offset-assert  40)
    )
   :pack-me
   :method-count-assert 9
@@ -190,8 +190,8 @@
 
 ;; definition of type external-art-control
 (deftype external-art-control (basic)
-  ((buffer               external-art-buffer 2         :offset-assert 4)
-   (rec                  spool-anim          3 :inline :offset-assert 16)
+  ((buffer               external-art-buffer 2         :offset-assert   4)
+   (rec                  spool-anim          3 :inline :offset-assert  16)
    (spool-lock           uint64                        :offset-assert 160)
    (reserve-buffer       basic                         :offset-assert 168)
    (reserve-buffer-count int32                         :offset-assert 172)
diff --git a/test/decompiler/reference/engine/load/ramdisk_REF.gc b/test/decompiler/reference/engine/load/ramdisk_REF.gc
index 7eac6b7f48..3d2b40c682 100644
--- a/test/decompiler/reference/engine/load/ramdisk_REF.gc
+++ b/test/decompiler/reference/engine/load/ramdisk_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type ramdisk-rpc-fill
 (deftype ramdisk-rpc-fill (structure)
-  ((rsvd1    int32     :offset-assert 0)
-   (ee-id    int32     :offset-assert 4)
-   (rsvd2    int32   2 :offset-assert 8)
-   (filename uint128   :offset-assert 16)
+  ((rsvd1    int32     :offset-assert   0)
+   (ee-id    int32     :offset-assert   4)
+   (rsvd2    int32   2 :offset-assert   8)
+   (filename uint128   :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -26,10 +26,10 @@
 
 ;; definition of type ramdisk-rpc-load
 (deftype ramdisk-rpc-load (structure)
-  ((rsvd   int32   :offset-assert 0)
-   (ee-id  int32   :offset-assert 4)
-   (offset uint32  :offset-assert 8)
-   (length uint32  :offset-assert 12)
+  ((rsvd   int32   :offset-assert   0)
+   (ee-id  int32   :offset-assert   4)
+   (offset uint32  :offset-assert   8)
+   (length uint32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -48,11 +48,11 @@
 
 ;; definition of type ramdisk-rpc-load-to-ee
 (deftype ramdisk-rpc-load-to-ee (structure)
-  ((rsvd     int32    :offset-assert 0)
-   (addr     int32    :offset-assert 4)
-   (offset   int32    :offset-assert 8)
-   (length   int32    :offset-assert 12)
-   (filename uint128  :offset-assert 16)
+  ((rsvd     int32    :offset-assert   0)
+   (addr     int32    :offset-assert   4)
+   (offset   int32    :offset-assert   8)
+   (length   int32    :offset-assert  12)
+   (filename uint128  :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
diff --git a/test/decompiler/reference/engine/math/math_REF.gc b/test/decompiler/reference/engine/math/math_REF.gc
index 8f4ba281d3..e9fb7c1acc 100644
--- a/test/decompiler/reference/engine/math/math_REF.gc
+++ b/test/decompiler/reference/engine/math/math_REF.gc
@@ -198,7 +198,7 @@
 
 ;; definition of type random-generator
 (deftype random-generator (basic)
-  ((seed uint32  :offset-assert 4)
+  ((seed uint32  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
diff --git a/test/decompiler/reference/engine/math/matrix-h_REF.gc b/test/decompiler/reference/engine/math/matrix-h_REF.gc
index abd1e461b1..b1f1961d72 100644
--- a/test/decompiler/reference/engine/math/matrix-h_REF.gc
+++ b/test/decompiler/reference/engine/math/matrix-h_REF.gc
@@ -4,8 +4,8 @@
 ;; definition of type matrix
 (deftype matrix (structure)
   ((vector vector  4 :inline :offset   0)
-   (quad   uint128 4 :offset   0)
-   (data   float   16 :offset   0)
+   (quad   uint128 4         :offset   0)
+   (data   float   16        :offset   0)
    )
   :method-count-assert 10
   :size-assert         #x40
@@ -27,9 +27,9 @@
 
 ;; definition of type matrix3
 (deftype matrix3 (structure)
-  ((data   float   12                    :offset-assert 0)
-   (vector vector  3 :inline :offset   0)
-   (quad   uint128 3 :offset   0)
+  ((data   float   12        :offset-assert   0)
+   (vector vector  3 :inline :offset          0)
+   (quad   uint128 3         :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -48,9 +48,9 @@
 
 ;; definition of type matrix4h
 (deftype matrix4h (structure)
-  ((data     int16    16                    :offset-assert 0)
-   (vector4h vector4h 4 :inline :offset   0)
-   (long     int64    4 :offset   0)
+  ((data     int16    16        :offset-assert   0)
+   (vector4h vector4h 4 :inline :offset          0)
+   (long     int64    4         :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x20
diff --git a/test/decompiler/reference/engine/math/matrix_REF.gc b/test/decompiler/reference/engine/math/matrix_REF.gc
index 5ea6198612..ec043498a3 100644
--- a/test/decompiler/reference/engine/math/matrix_REF.gc
+++ b/test/decompiler/reference/engine/math/matrix_REF.gc
@@ -255,6 +255,7 @@
   )
 
 ;; definition for function matrix-transpose!
+;; WARN: Function may read a register that is not set: f31
 ;; Used lq/sq
 (defun matrix-transpose! ((dst matrix) (src matrix))
   (local-vars
@@ -337,9 +338,9 @@
   )
 
 ;; definition for function matrix-4x4-inverse!
-;; WARN: Bad vector register dependency: vf5
 ;; WARN: Bad vector register dependency: vf3
 ;; WARN: Bad vector register dependency: vf4
+;; WARN: Bad vector register dependency: vf5
 (defun matrix-4x4-inverse! ((dst matrix) (src matrix))
   (rlet ((acc :class vf)
          (Q :class vf)
diff --git a/test/decompiler/reference/engine/math/quaternion-h_REF.gc b/test/decompiler/reference/engine/math/quaternion-h_REF.gc
index dd9f671011..447fc8485e 100644
--- a/test/decompiler/reference/engine/math/quaternion-h_REF.gc
+++ b/test/decompiler/reference/engine/math/quaternion-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type quaternion
 (deftype quaternion (structure)
-  ((x    float                       :offset-assert 0)
-   (y    float                       :offset-assert 4)
-   (z    float                       :offset-assert 8)
-   (w    float                       :offset-assert 12)
-   (data float   4 :offset   0)
-   (vec  vector  :inline :offset   0)
-   (quad uint128 :offset   0)
+  ((x    float           :offset-assert   0)
+   (y    float           :offset-assert   4)
+   (z    float           :offset-assert   8)
+   (w    float           :offset-assert  12)
+   (data float   4       :offset          0)
+   (vec  vector  :inline :offset          0)
+   (quad uint128         :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/math/transform-h_REF.gc b/test/decompiler/reference/engine/math/transform-h_REF.gc
index 795c7f6cca..b34d6733bb 100644
--- a/test/decompiler/reference/engine/math/transform-h_REF.gc
+++ b/test/decompiler/reference/engine/math/transform-h_REF.gc
@@ -3,9 +3,9 @@
 
 ;; definition of type transform
 (deftype transform (structure)
-  ((trans vector :inline :offset-assert 0)
-   (rot   vector :inline :offset-assert 16)
-   (scale vector :inline :offset-assert 32)
+  ((trans vector :inline :offset-assert   0)
+   (rot   vector :inline :offset-assert  16)
+   (scale vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -23,9 +23,9 @@
 
 ;; definition of type trs
 (deftype trs (basic)
-  ((trans vector :inline :offset-assert 16)
-   (rot   vector :inline :offset-assert 32)
-   (scale vector :inline :offset-assert 48)
+  ((trans vector :inline :offset-assert  16)
+   (rot   vector :inline :offset-assert  32)
+   (scale vector :inline :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x40
diff --git a/test/decompiler/reference/engine/math/transformq-h_REF.gc b/test/decompiler/reference/engine/math/transformq-h_REF.gc
index deb7e6fa84..252f496dd3 100644
--- a/test/decompiler/reference/engine/math/transformq-h_REF.gc
+++ b/test/decompiler/reference/engine/math/transformq-h_REF.gc
@@ -41,14 +41,14 @@
 
 ;; definition of type trsqv
 (deftype trsqv (trsq)
-  ((pause-adjust-distance float      :offset   4)
-   (nav-radius            float      :offset   8)
-   (transv                vector     :inline     :offset-assert 64)
-   (rotv                  vector     :inline     :offset-assert 80)
-   (scalev                vector     :inline     :offset-assert 96)
-   (dir-targ              quaternion :inline     :offset-assert 112)
-   (angle-change-time     uint64                 :offset-assert 128)
-   (old-y-angle-diff      float                  :offset-assert 136)
+  ((pause-adjust-distance float              :offset          4)
+   (nav-radius            float              :offset          8)
+   (transv                vector     :inline :offset-assert  64)
+   (rotv                  vector     :inline :offset-assert  80)
+   (scalev                vector     :inline :offset-assert  96)
+   (dir-targ              quaternion :inline :offset-assert 112)
+   (angle-change-time     uint64             :offset-assert 128)
+   (old-y-angle-diff      float              :offset-assert 136)
    )
   :method-count-assert 28
   :size-assert         #x8c
diff --git a/test/decompiler/reference/engine/math/vector-h_REF.gc b/test/decompiler/reference/engine/math/vector-h_REF.gc
index 544f8ed81b..8ea121d595 100644
--- a/test/decompiler/reference/engine/math/vector-h_REF.gc
+++ b/test/decompiler/reference/engine/math/vector-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type bit-array
 (deftype bit-array (basic)
-  ((length           int32                      :offset-assert 4)
-   (allocated-length int32                      :offset-assert 8)
-   (_pad             uint8                      :offset-assert 12)
-   (bytes            uint8 :dynamic :offset  12)
+  ((length           int32          :offset-assert   4)
+   (allocated-length int32          :offset-assert   8)
+   (_pad             uint8          :offset-assert  12)
+   (bytes            uint8 :dynamic :offset         12)
    )
   :method-count-assert 13
   :size-assert         #xd
@@ -108,12 +108,12 @@
 
 ;; definition of type vector4ub
 (deftype vector4ub (structure)
-  ((data uint8  4           :offset-assert 0)
-   (x    uint8  :offset   0)
-   (y    uint8  :offset   1)
-   (z    uint8  :offset   2)
-   (w    uint8  :offset   3)
-   (clr  uint32 :offset   0)
+  ((data uint8  4 :offset-assert   0)
+   (x    uint8    :offset          0)
+   (y    uint8    :offset          1)
+   (z    uint8    :offset          2)
+   (w    uint8    :offset          3)
+   (clr  uint32   :offset          0)
    )
   :pack-me
   :method-count-assert 9
@@ -135,11 +135,11 @@
 
 ;; definition of type vector4b
 (deftype vector4b (structure)
-  ((data int8 4           :offset-assert 0)
-   (x    int8 :offset   0)
-   (y    int8 :offset   1)
-   (z    int8 :offset   2)
-   (w    int8 :offset   3)
+  ((data int8 4 :offset-assert   0)
+   (x    int8   :offset          0)
+   (y    int8   :offset          1)
+   (z    int8   :offset          2)
+   (w    int8   :offset          3)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -159,9 +159,9 @@
 
 ;; definition of type vector2h
 (deftype vector2h (structure)
-  ((data int16 2           :offset-assert 0)
-   (x    int16 :offset   0)
-   (y    int16 :offset   2)
+  ((data int16 2 :offset-assert   0)
+   (x    int16   :offset          0)
+   (y    int16   :offset          2)
    )
   :pack-me
   :method-count-assert 9
@@ -180,10 +180,10 @@
 
 ;; definition of type vector2uh
 (deftype vector2uh (structure)
-  ((data uint16 2           :offset-assert 0)
-   (x    uint16 :offset   0)
-   (y    uint16 :offset   2)
-   (val  uint32 :offset   0)
+  ((data uint16 2 :offset-assert   0)
+   (x    uint16   :offset          0)
+   (y    uint16   :offset          2)
+   (val  uint32   :offset          0)
    )
   :pack-me
   :method-count-assert 9
@@ -203,10 +203,10 @@
 
 ;; definition of type vector3h
 (deftype vector3h (structure)
-  ((data int16 2           :offset-assert 0)
-   (x    int16 :offset   0)
-   (y    int16 :offset   2)
-   (z    int16             :offset-assert 4)
+  ((data int16 2 :offset-assert   0)
+   (x    int16   :offset          0)
+   (y    int16   :offset          2)
+   (z    int16   :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x6
@@ -225,9 +225,9 @@
 
 ;; definition of type vector2w
 (deftype vector2w (structure)
-  ((data int32 2           :offset-assert 0)
-   (x    int32 :offset   0)
-   (y    int32 :offset   4)
+  ((data int32 2 :offset-assert   0)
+   (x    int32   :offset          0)
+   (y    int32   :offset          4)
    )
   :pack-me
   :method-count-assert 9
@@ -246,10 +246,10 @@
 
 ;; definition of type vector3w
 (deftype vector3w (structure)
-  ((data int32 3           :offset-assert 0)
-   (x    int32 :offset   0)
-   (y    int32 :offset   4)
-   (z    int32 :offset   8)
+  ((data int32 3 :offset-assert   0)
+   (x    int32   :offset          0)
+   (y    int32   :offset          4)
+   (z    int32   :offset          8)
    )
   :allow-misaligned  :method-count-assert 9
   :size-assert         #xc
@@ -268,13 +268,13 @@
 
 ;; definition of type vector4w
 (deftype vector4w (structure)
-  ((data  int32   4             :offset-assert 0)
-   (x     int32   :offset   0)
-   (y     int32   :offset   4)
-   (z     int32   :offset   8)
-   (w     int32   :offset  12)
-   (dword uint64  2 :offset   0)
-   (quad  uint128 :offset   0)
+  ((data  int32   4 :offset-assert   0)
+   (x     int32     :offset          0)
+   (y     int32     :offset          4)
+   (z     int32     :offset          8)
+   (w     int32     :offset         12)
+   (dword uint64  2 :offset          0)
+   (quad  uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -311,9 +311,9 @@
 
 ;; definition of type vector4w-2
 (deftype vector4w-2 (structure)
-  ((data   int32    8                     :offset-assert 0)
-   (quad   uint128  2 :offset   0)
-   (vector vector4w 2 :inline :offset   0)
+  ((data   int32    8         :offset-assert   0)
+   (quad   uint128  2         :offset          0)
+   (vector vector4w 2 :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -331,9 +331,9 @@
 
 ;; definition of type vector4w-3
 (deftype vector4w-3 (structure)
-  ((data   int32    12                    :offset-assert 0)
-   (quad   uint128  3 :offset   0)
-   (vector vector4w 3 :inline :offset   0)
+  ((data   int32    12        :offset-assert   0)
+   (quad   uint128  3         :offset          0)
+   (vector vector4w 3 :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -351,9 +351,9 @@
 
 ;; definition of type vector4w-4
 (deftype vector4w-4 (structure)
-  ((data   int32    16                    :offset-assert 0)
-   (quad   uint128  4 :offset   0)
-   (vector vector4w 4 :inline :offset   0)
+  ((data   int32    16        :offset-assert   0)
+   (quad   uint128  4         :offset          0)
+   (vector vector4w 4 :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -371,12 +371,12 @@
 
 ;; definition of type vector4h
 (deftype vector4h (structure)
-  ((data int16  4           :offset-assert 0)
-   (x    int16  :offset   0)
-   (y    int16  :offset   2)
-   (z    int16  :offset   4)
-   (w    int16  :offset   6)
-   (long uint64 :offset   0)
+  ((data int16  4 :offset-assert   0)
+   (x    int16    :offset          0)
+   (y    int16    :offset          2)
+   (z    int16    :offset          4)
+   (w    int16    :offset          6)
+   (long uint64   :offset          0)
    )
   :pack-me
   :method-count-assert 9
@@ -398,8 +398,8 @@
 
 ;; definition of type vector8h
 (deftype vector8h (structure)
-  ((data int16   8           :offset-assert 0)
-   (quad uint128 :offset   0)
+  ((data int16   8 :offset-assert   0)
+   (quad uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -417,8 +417,8 @@
 
 ;; definition of type vector16b
 (deftype vector16b (structure)
-  ((data int8    16          :offset-assert 0)
-   (quad uint128 :offset   0)
+  ((data int8    16 :offset-assert   0)
+   (quad uint128    :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -436,12 +436,12 @@
 
 ;; definition of type vector
 (deftype vector (structure)
-  ((data float   4           :offset-assert 0)
-   (x    float   :offset   0)
-   (y    float   :offset   4)
-   (z    float   :offset   8)
-   (w    float   :offset  12)
-   (quad uint128 :offset   0)
+  ((data float   4 :offset-assert   0)
+   (x    float     :offset          0)
+   (y    float     :offset          4)
+   (z    float     :offset          8)
+   (w    float     :offset         12)
+   (quad uint128   :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -511,9 +511,9 @@
 
 ;; definition of type vector4s-3
 (deftype vector4s-3 (structure)
-  ((data   float   12                    :offset-assert 0)
-   (quad   uint128 3 :offset   0)
-   (vector vector  3 :inline :offset   0)
+  ((data   float   12        :offset-assert   0)
+   (quad   uint128 3         :offset          0)
+   (vector vector  3 :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -551,10 +551,10 @@
 
 ;; definition of type rgbaf
 (deftype rgbaf (vector)
-  ((r float :offset   0)
-   (g float :offset   4)
-   (b float :offset   8)
-   (a float :offset  12)
+  ((r float  :offset   0)
+   (g float  :offset   4)
+   (b float  :offset   8)
+   (a float  :offset  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -580,10 +580,10 @@
 
 ;; definition of type plane
 (deftype plane (vector)
-  ((a float :offset   0)
-   (b float :offset   4)
-   (c float :offset   8)
-   (d float :offset  12)
+  ((a float  :offset   0)
+   (b float  :offset   4)
+   (c float  :offset   8)
+   (d float  :offset  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -609,7 +609,7 @@
 
 ;; definition of type sphere
 (deftype sphere (vector)
-  ((r float :offset  12)
+  ((r float  :offset  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -640,11 +640,11 @@
 
 ;; definition of type box8s
 (deftype box8s (structure)
-  ((data   float   8                   :offset-assert 0)
-   (quad   uint128 2 :offset   0)
-   (vector vector  2 :offset   0)
-   (min    vector  :inline :offset   0)
-   (max    vector  :inline :offset  16)
+  ((data   float   8       :offset-assert   0)
+   (quad   uint128 2       :offset          0)
+   (vector vector  2       :offset          0)
+   (min    vector  :inline :offset          0)
+   (max    vector  :inline :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -684,10 +684,10 @@
 
 ;; definition of type cylinder
 (deftype cylinder (structure)
-  ((origin vector :inline :offset-assert 0)
-   (axis   vector :inline :offset-assert 16)
-   (radius float          :offset-assert 32)
-   (length float          :offset-assert 36)
+  ((origin vector :inline :offset-assert   0)
+   (axis   vector :inline :offset-assert  16)
+   (radius float          :offset-assert  32)
+   (length float          :offset-assert  36)
    )
   :method-count-assert 11
   :size-assert         #x28
@@ -710,10 +710,10 @@
 
 ;; definition of type cylinder-flat
 (deftype cylinder-flat (structure)
-  ((origin vector :inline :offset-assert 0)
-   (axis   vector :inline :offset-assert 16)
-   (radius float          :offset-assert 32)
-   (length float          :offset-assert 36)
+  ((origin vector :inline :offset-assert   0)
+   (axis   vector :inline :offset-assert  16)
+   (radius float          :offset-assert  32)
+   (length float          :offset-assert  36)
    )
   :method-count-assert 11
   :size-assert         #x28
@@ -736,7 +736,7 @@
 
 ;; definition of type vertical-planes
 (deftype vertical-planes (structure)
-  ((data uint128 4 :offset-assert 0)
+  ((data uint128 4 :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -752,8 +752,8 @@
 
 ;; definition of type vertical-planes-array
 (deftype vertical-planes-array (basic)
-  ((length uint32                               :offset-assert 4)
-   (data   vertical-planes :dynamic :offset  16)
+  ((length uint32                   :offset-assert   4)
+   (data   vertical-planes :dynamic :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -770,14 +770,14 @@
 
 ;; definition of type qword
 (deftype qword (structure)
-  ((data     uint32   4                   :offset-assert 0)
-   (byte     uint8    16 :offset   0)
-   (hword    uint16   8 :offset   0)
-   (word     uint32   4 :offset   0)
-   (dword    uint64   2 :offset   0)
-   (quad     uint128  :offset   0)
-   (vector   vector   :inline :offset   0)
-   (vector4w vector4w :inline :offset   0)
+  ((data     uint32   4       :offset-assert   0)
+   (byte     uint8    16      :offset          0)
+   (hword    uint16   8       :offset          0)
+   (word     uint32   4       :offset          0)
+   (dword    uint64   2       :offset          0)
+   (quad     uint128          :offset          0)
+   (vector   vector   :inline :offset          0)
+   (vector4w vector4w :inline :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -801,10 +801,10 @@
 
 ;; definition of type vector3s
 (deftype vector3s (structure)
-  ((data float 3           :offset-assert 0)
-   (x    float :offset   0)
-   (y    float :offset   4)
-   (z    float :offset   8)
+  ((data float 3 :offset-assert   0)
+   (x    float   :offset          0)
+   (y    float   :offset          4)
+   (z    float   :offset          8)
    )
   :method-count-assert 9
   :size-assert         #xc
diff --git a/test/decompiler/reference/engine/nav/navigate-h_REF.gc b/test/decompiler/reference/engine/nav/navigate-h_REF.gc
index 7376cb3057..261c984a59 100644
--- a/test/decompiler/reference/engine/nav/navigate-h_REF.gc
+++ b/test/decompiler/reference/engine/nav/navigate-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type nav-poly
 (deftype nav-poly (structure)
-  ((id       uint8   :offset-assert 0)
-   (vertex   uint8 3 :offset-assert 1)
-   (adj-poly uint8 3 :offset-assert 4)
-   (pat      uint8   :offset-assert 7)
+  ((id       uint8   :offset-assert   0)
+   (vertex   uint8 3 :offset-assert   1)
+   (adj-poly uint8 3 :offset-assert   4)
+   (pat      uint8   :offset-assert   7)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -46,7 +46,7 @@
 
 ;; definition of type nav-sphere
 (deftype nav-sphere (structure)
-  ((trans sphere :inline :offset-assert 0)
+  ((trans sphere :inline :offset-assert   0)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -62,17 +62,17 @@
 
 ;; definition of type nav-ray
 (deftype nav-ray (structure)
-  ((current-pos  vector   :inline :offset-assert 0)
-   (dir          vector   :inline :offset-assert 16)
-   (dest-pos     vector   :inline :offset-assert 32)
-   (current-poly nav-poly         :offset-assert 48)
-   (next-poly    nav-poly         :offset-assert 52)
-   (len          float            :offset-assert 56)
-   (last-edge    int8             :offset-assert 60)
-   (terminated   basic            :offset-assert 64)
-   (reached-dest basic            :offset-assert 68)
-   (hit-boundary basic            :offset-assert 72)
-   (hit-gap      basic            :offset-assert 76)
+  ((current-pos  vector   :inline :offset-assert   0)
+   (dir          vector   :inline :offset-assert  16)
+   (dest-pos     vector   :inline :offset-assert  32)
+   (current-poly nav-poly         :offset-assert  48)
+   (next-poly    nav-poly         :offset-assert  52)
+   (len          float            :offset-assert  56)
+   (last-edge    int8             :offset-assert  60)
+   (terminated   basic            :offset-assert  64)
+   (reached-dest basic            :offset-assert  68)
+   (hit-boundary basic            :offset-assert  72)
+   (hit-gap      basic            :offset-assert  76)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -98,9 +98,9 @@
 
 ;; definition of type nav-route-portal
 (deftype nav-route-portal (structure)
-  ((next-poly  nav-poly     :offset-assert 0)
-   (vertex     nav-vertex 2 :offset-assert 4)
-   (edge-index int8         :offset-assert 12)
+  ((next-poly  nav-poly     :offset-assert   0)
+   (vertex     nav-vertex 2 :offset-assert   4)
+   (edge-index int8         :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #xd
@@ -118,15 +118,15 @@
 
 ;; definition of type clip-travel-vector-to-mesh-return-info
 (deftype clip-travel-vector-to-mesh-return-info (structure)
-  ((found-boundary  basic            :offset-assert 0)
-   (intersection    vector   :inline :offset-assert 16)
-   (boundary-normal vector   :inline :offset-assert 32)
-   (prev-normal     vector   :inline :offset-assert 48)
-   (next-normal     vector   :inline :offset-assert 64)
-   (poly            nav-poly         :offset-assert 80)
-   (gap-poly        nav-poly         :offset-assert 84)
-   (edge            int32            :offset-assert 88)
-   (vert-prev       vector   :inline :offset-assert 96)
+  ((found-boundary  basic            :offset-assert   0)
+   (intersection    vector   :inline :offset-assert  16)
+   (boundary-normal vector   :inline :offset-assert  32)
+   (prev-normal     vector   :inline :offset-assert  48)
+   (next-normal     vector   :inline :offset-assert  64)
+   (poly            nav-poly         :offset-assert  80)
+   (gap-poly        nav-poly         :offset-assert  84)
+   (edge            int32            :offset-assert  88)
+   (vert-prev       vector   :inline :offset-assert  96)
    (vert-0          vector   :inline :offset-assert 112)
    (vert-1          vector   :inline :offset-assert 128)
    (vert-next       vector   :inline :offset-assert 144)
@@ -159,24 +159,24 @@
 
 ;; definition of type nav-node
 (deftype nav-node (structure)
-  ((center-x      float                      :offset-assert 0)
-   (center-y      float                      :offset-assert 4)
-   (center-z      float                      :offset-assert 8)
-   (type          uint16                     :offset-assert 12)
-   (parent-offset uint16                     :offset-assert 14)
-   (center        vector :inline :offset   0)
-   (radius-x      float                      :offset-assert 16)
-   (radius-y      float                      :offset-assert 20)
-   (radius-z      float                      :offset-assert 24)
-   (left-offset   uint16                     :offset-assert 28)
-   (right-offset  uint16                     :offset-assert 30)
-   (num-tris      uint32 :offset  28)
-   (radius        vector :inline :offset  16)
-   (scale-x       float                      :offset-assert 32)
-   (first-tris    uint8  4                   :offset-assert 36)
-   (scale-z       float                      :offset-assert 40)
-   (last-tris     uint8  4                   :offset-assert 44)
-   (scale         vector :inline :offset  32)
+  ((center-x      float          :offset-assert   0)
+   (center-y      float          :offset-assert   4)
+   (center-z      float          :offset-assert   8)
+   (type          uint16         :offset-assert  12)
+   (parent-offset uint16         :offset-assert  14)
+   (center        vector :inline :offset          0)
+   (radius-x      float          :offset-assert  16)
+   (radius-y      float          :offset-assert  20)
+   (radius-z      float          :offset-assert  24)
+   (left-offset   uint16         :offset-assert  28)
+   (right-offset  uint16         :offset-assert  30)
+   (num-tris      uint32         :offset         28)
+   (radius        vector :inline :offset         16)
+   (scale-x       float          :offset-assert  32)
+   (first-tris    uint8  4       :offset-assert  36)
+   (scale-z       float          :offset-assert  40)
+   (last-tris     uint8  4       :offset-assert  44)
+   (scale         vector :inline :offset         32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -209,14 +209,14 @@
 
 ;; definition of type nav-lookup-elem
 (deftype nav-lookup-elem (structure)
-  ((vec         vector :inline     :offset-assert 0)
-   (y-thresh    float  :offset  12)
-   (time        uint32             :offset-assert 16)
-   (node-offset uint32             :offset-assert 20)
-   (lookup-type uint8              :offset-assert 24)
-   (poly-ind    uint8              :offset-assert 25)
-   (dummy0      uint16             :offset-assert 26)
-   (dummy       uint32             :offset-assert 28)
+  ((vec         vector :inline :offset-assert   0)
+   (y-thresh    float          :offset         12)
+   (time        uint32         :offset-assert  16)
+   (node-offset uint32         :offset-assert  20)
+   (lookup-type uint8          :offset-assert  24)
+   (poly-ind    uint8          :offset-assert  25)
+   (dummy0      uint16         :offset-assert  26)
+   (dummy       uint32         :offset-assert  28)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -239,14 +239,14 @@
 
 ;; definition of type nav-mesh
 (deftype nav-mesh (basic)
-  ((user-list           engine                    :offset-assert 4)
-   (poly-lookup-history uint8           2         :offset-assert 8)
-   (debug-time          uint8                     :offset-assert 10)
-   (static-sphere-count uint8                     :offset-assert 11)
-   (static-sphere       uint32                    :offset-assert 12)
-   (bounds              sphere          :inline   :offset-assert 16)
-   (origin              vector          :inline   :offset-assert 32)
-   (cache               nav-lookup-elem 4 :inline :offset-assert 48)
+  ((user-list           engine                    :offset-assert   4)
+   (poly-lookup-history uint8           2         :offset-assert   8)
+   (debug-time          uint8                     :offset-assert  10)
+   (static-sphere-count uint8                     :offset-assert  11)
+   (static-sphere       uint32                    :offset-assert  12)
+   (bounds              sphere          :inline   :offset-assert  16)
+   (origin              vector          :inline   :offset-assert  32)
+   (cache               nav-lookup-elem 4 :inline :offset-assert  48)
    (node-count          int32                     :offset-assert 176)
    (nodes               uint32                    :offset-assert 180)
    (vertex-count        int32                     :offset-assert 184)
@@ -306,9 +306,9 @@
 
 ;; definition of type check-vector-collision-with-nav-spheres-info
 (deftype check-vector-collision-with-nav-spheres-info (structure)
-  ((u         float          :offset-assert 0)
-   (intersect vector :inline :offset-assert 16)
-   (normal    vector :inline :offset-assert 32)
+  ((u         float          :offset-assert   0)
+   (intersect vector :inline :offset-assert  16)
+   (normal    vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -329,8 +329,8 @@
 
 ;; definition of type nav-gap-info
 (deftype nav-gap-info (structure)
-  ((dest vector   :inline :offset-assert 0)
-   (poly nav-poly         :offset-assert 16)
+  ((dest vector   :inline :offset-assert   0)
+   (poly nav-poly         :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -347,20 +347,20 @@
 
 ;; definition of type nav-control
 (deftype nav-control (basic)
-  ((flags               nav-control-flags                  :offset-assert 4)
-   (process             basic                              :offset-assert 8)
-   (shape               collide-shape                      :offset-assert 12)
-   (mesh                nav-mesh                           :offset-assert 16)
-   (gap-event           basic                              :offset-assert 20)
-   (block-event         basic                              :offset-assert 24)
-   (current-poly        nav-poly                           :offset-assert 28)
-   (next-poly           nav-poly                           :offset-assert 32)
-   (target-poly         nav-poly                           :offset-assert 36)
-   (portal              nav-route-portal  2                :offset-assert 40)
-   (nearest-y-threshold float                              :offset-assert 48)
-   (event-temp          vector            :inline          :offset-assert 64)
-   (old-travel          vector            :inline          :offset-assert 80)
-   (blocked-travel      vector            :inline          :offset-assert 96)
+  ((flags               nav-control-flags                  :offset-assert   4)
+   (process             basic                              :offset-assert   8)
+   (shape               collide-shape                      :offset-assert  12)
+   (mesh                nav-mesh                           :offset-assert  16)
+   (gap-event           basic                              :offset-assert  20)
+   (block-event         basic                              :offset-assert  24)
+   (current-poly        nav-poly                           :offset-assert  28)
+   (next-poly           nav-poly                           :offset-assert  32)
+   (target-poly         nav-poly                           :offset-assert  36)
+   (portal              nav-route-portal  2                :offset-assert  40)
+   (nearest-y-threshold float                              :offset-assert  48)
+   (event-temp          vector            :inline          :offset-assert  64)
+   (old-travel          vector            :inline          :offset-assert  80)
+   (blocked-travel      vector            :inline          :offset-assert  96)
    (prev-pos            vector            :inline          :offset-assert 112)
    (extra-nav-sphere    vector            :inline          :offset-assert 128)
    (travel              vector            :inline          :offset-assert 144)
diff --git a/test/decompiler/reference/engine/nav/path-h_REF.gc b/test/decompiler/reference/engine/nav/path-h_REF.gc
index 5dc0313626..c3989145aa 100644
--- a/test/decompiler/reference/engine/nav/path-h_REF.gc
+++ b/test/decompiler/reference/engine/nav/path-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type path-control
 (deftype path-control (basic)
-  ((flags      path-control-flag             :offset-assert 4)
-   (name       basic                         :offset-assert 8)
-   (process    basic                         :offset-assert 12)
-   (curve      curve             :inline     :offset-assert 16)
-   (num-cverts int32             :offset  20)
-   (cverts     pointer           :offset  16)
+  ((flags      path-control-flag         :offset-assert   4)
+   (name       basic                     :offset-assert   8)
+   (process    basic                     :offset-assert  12)
+   (curve      curve             :inline :offset-assert  16)
+   (num-cverts int32                     :offset         20)
+   (cverts     pointer                   :offset         16)
    )
   :method-count-assert 21
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/physics/dynamics-h_REF.gc b/test/decompiler/reference/engine/physics/dynamics-h_REF.gc
index be16a7f7b4..8f83528585 100644
--- a/test/decompiler/reference/engine/physics/dynamics-h_REF.gc
+++ b/test/decompiler/reference/engine/physics/dynamics-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type dynamics
 (deftype dynamics (basic)
-  ((name           basic          :offset-assert 4)
-   (gravity-max    float          :offset-assert 8)
-   (gravity-length float          :offset-assert 12)
-   (gravity        vector :inline :offset-assert 16)
-   (gravity-normal vector :inline :offset-assert 32)
-   (walk-distance  float          :offset-assert 48)
-   (run-distance   float          :offset-assert 52)
+  ((name           basic          :offset-assert   4)
+   (gravity-max    float          :offset-assert   8)
+   (gravity-length float          :offset-assert  12)
+   (gravity        vector :inline :offset-assert  16)
+   (gravity-normal vector :inline :offset-assert  32)
+   (walk-distance  float          :offset-assert  48)
+   (run-distance   float          :offset-assert  52)
    )
   :method-count-assert 9
   :size-assert         #x38
diff --git a/test/decompiler/reference/engine/physics/trajectory-h_REF.gc b/test/decompiler/reference/engine/physics/trajectory-h_REF.gc
index 3da0f4dedb..ffd545bdc8 100644
--- a/test/decompiler/reference/engine/physics/trajectory-h_REF.gc
+++ b/test/decompiler/reference/engine/physics/trajectory-h_REF.gc
@@ -3,10 +3,10 @@
 
 ;; definition of type trajectory
 (deftype trajectory (structure)
-  ((initial-position vector :inline :offset-assert 0)
-   (initial-velocity vector :inline :offset-assert 16)
-   (time             float          :offset-assert 32)
-   (gravity          float          :offset-assert 36)
+  ((initial-position vector :inline :offset-assert   0)
+   (initial-velocity vector :inline :offset-assert  16)
+   (time             float          :offset-assert  32)
+   (gravity          float          :offset-assert  36)
    )
   :method-count-assert 16
   :size-assert         #x28
diff --git a/test/decompiler/reference/engine/ps2/memcard-h_REF.gc b/test/decompiler/reference/engine/ps2/memcard-h_REF.gc
index 7810b5c69c..6b06114489 100644
--- a/test/decompiler/reference/engine/ps2/memcard-h_REF.gc
+++ b/test/decompiler/reference/engine/ps2/memcard-h_REF.gc
@@ -5,20 +5,20 @@
 
 ;; definition of type mc-file-info
 (deftype mc-file-info (structure)
-  ((present               int32                :offset-assert 0)
-   (blind-data            float 16             :offset-assert 4)
-   (blind-data-int8       int8  64 :offset   4)
-   (level-index           int32 :offset   4)
-   (fuel-cell-count       float :offset   8)
-   (money-count           float :offset  12)
-   (buzzer-count          float :offset  16)
-   (completion-percentage float :offset  20)
-   (minute                uint8 :offset  24)
-   (hour                  uint8 :offset  25)
-   (week                  uint8 :offset  26)
-   (day                   uint8 :offset  27)
-   (month                 uint8 :offset  28)
-   (year                  uint8 :offset  29)
+  ((present               int32    :offset-assert   0)
+   (blind-data            float 16 :offset-assert   4)
+   (blind-data-int8       int8  64 :offset          4)
+   (level-index           int32    :offset          4)
+   (fuel-cell-count       float    :offset          8)
+   (money-count           float    :offset         12)
+   (buzzer-count          float    :offset         16)
+   (completion-percentage float    :offset         20)
+   (minute                uint8    :offset         24)
+   (hour                  uint8    :offset         25)
+   (week                  uint8    :offset         26)
+   (day                   uint8    :offset         27)
+   (month                 uint8    :offset         28)
+   (year                  uint8    :offset         29)
    )
   :pack-me
   :method-count-assert 9
@@ -48,14 +48,14 @@
 
 ;; definition of type mc-slot-info
 (deftype mc-slot-info (structure)
-  ((handle       int32                  :offset-assert 0)
-   (known        int32                  :offset-assert 4)
-   (formatted    int32                  :offset-assert 8)
-   (inited       int32                  :offset-assert 12)
-   (last-file    int32                  :offset-assert 16)
-   (mem-required int32                  :offset-assert 20)
-   (mem-actual   int32                  :offset-assert 24)
-   (file         mc-file-info 4 :inline :offset-assert 28)
+  ((handle       int32                  :offset-assert   0)
+   (known        int32                  :offset-assert   4)
+   (formatted    int32                  :offset-assert   8)
+   (inited       int32                  :offset-assert  12)
+   (last-file    int32                  :offset-assert  16)
+   (mem-required int32                  :offset-assert  20)
+   (mem-actual   int32                  :offset-assert  24)
+   (file         mc-file-info 4 :inline :offset-assert  28)
    )
   :pack-me
   :method-count-assert 9
diff --git a/test/decompiler/reference/engine/ps2/pad_REF.gc b/test/decompiler/reference/engine/ps2/pad_REF.gc
index 370bbe0bdd..189deaa061 100644
--- a/test/decompiler/reference/engine/ps2/pad_REF.gc
+++ b/test/decompiler/reference/engine/ps2/pad_REF.gc
@@ -6,15 +6,15 @@
 
 ;; definition of type hw-cpad
 (deftype hw-cpad (basic)
-  ((valid   uint8     :offset-assert 4)
-   (status  uint8     :offset-assert 5)
-   (button0 uint16    :offset-assert 6)
-   (rightx  uint8     :offset-assert 8)
-   (righty  uint8     :offset-assert 9)
-   (leftx   uint8     :offset-assert 10)
-   (lefty   uint8     :offset-assert 11)
-   (abutton uint8  12 :offset-assert 12)
-   (dummy   uint8  12 :offset-assert 24)
+  ((valid   uint8     :offset-assert   4)
+   (status  uint8     :offset-assert   5)
+   (button0 uint16    :offset-assert   6)
+   (rightx  uint8     :offset-assert   8)
+   (righty  uint8     :offset-assert   9)
+   (leftx   uint8     :offset-assert  10)
+   (lefty   uint8     :offset-assert  11)
+   (abutton uint8  12 :offset-assert  12)
+   (dummy   uint8  12 :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x24
@@ -38,17 +38,17 @@
 
 ;; definition of type cpad-info
 (deftype cpad-info (hw-cpad)
-  ((number             int32         :offset-assert 36)
-   (cpad-file          int32         :offset-assert 40)
-   (button0-abs        pad-buttons 3 :offset-assert 44)
-   (button0-shadow-abs pad-buttons 1 :offset-assert 56)
-   (button0-rel        pad-buttons 3 :offset-assert 60)
-   (stick0-dir         float         :offset-assert 72)
-   (stick0-speed       float         :offset-assert 76)
-   (new-pad            int32         :offset-assert 80)
-   (state              int32         :offset-assert 84)
-   (align              uint8       6 :offset-assert 88)
-   (direct             uint8       6 :offset-assert 94)
+  ((number             int32         :offset-assert  36)
+   (cpad-file          int32         :offset-assert  40)
+   (button0-abs        pad-buttons 3 :offset-assert  44)
+   (button0-shadow-abs pad-buttons 1 :offset-assert  56)
+   (button0-rel        pad-buttons 3 :offset-assert  60)
+   (stick0-dir         float         :offset-assert  72)
+   (stick0-speed       float         :offset-assert  76)
+   (new-pad            int32         :offset-assert  80)
+   (state              int32         :offset-assert  84)
+   (align              uint8       6 :offset-assert  88)
+   (direct             uint8       6 :offset-assert  94)
    (buzz-val           uint8       2 :offset-assert 100)
    (buzz-time          uint64      2 :offset-assert 104)
    (buzz               basic         :offset-assert 120)
@@ -143,8 +143,8 @@
 
 ;; definition of type cpad-list
 (deftype cpad-list (basic)
-  ((num-cpads int32       :offset-assert 4)
-   (cpads     cpad-info 2 :offset-assert 8)
+  ((num-cpads int32       :offset-assert   4)
+   (cpads     cpad-info 2 :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/ps2/rpc-h_REF.gc b/test/decompiler/reference/engine/ps2/rpc-h_REF.gc
index 50317b85ec..416140bed0 100644
--- a/test/decompiler/reference/engine/ps2/rpc-h_REF.gc
+++ b/test/decompiler/reference/engine/ps2/rpc-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type rpc-buffer
 (deftype rpc-buffer (basic)
-  ((elt-size  uint32                       :offset-assert 4)
-   (elt-count uint32                       :offset-assert 8)
-   (elt-used  uint32                       :offset-assert 12)
-   (busy      basic                        :offset-assert 16)
-   (base      pointer                      :offset-assert 20)
-   (data      uint8   :dynamic :offset  32)
+  ((elt-size  uint32           :offset-assert   4)
+   (elt-count uint32           :offset-assert   8)
+   (elt-used  uint32           :offset-assert  12)
+   (busy      basic            :offset-assert  16)
+   (base      pointer          :offset-assert  20)
+   (data      uint8   :dynamic :offset         32)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -55,10 +55,10 @@
 
 ;; definition of type rpc-buffer-pair
 (deftype rpc-buffer-pair (basic)
-  ((buffer           rpc-buffer 2 :offset-assert 4)
-   (current          rpc-buffer   :offset-assert 12)
-   (last-recv-buffer pointer      :offset-assert 16)
-   (rpc-port         int32        :offset-assert 20)
+  ((buffer           rpc-buffer 2 :offset-assert   4)
+   (current          rpc-buffer   :offset-assert  12)
+   (last-recv-buffer pointer      :offset-assert  16)
+   (rpc-port         int32        :offset-assert  20)
    )
   :method-count-assert 15
   :size-assert         #x18
diff --git a/test/decompiler/reference/engine/ps2/timer-h_REF.gc b/test/decompiler/reference/engine/ps2/timer-h_REF.gc
index 2e2488c646..7fb687198b 100644
--- a/test/decompiler/reference/engine/ps2/timer-h_REF.gc
+++ b/test/decompiler/reference/engine/ps2/timer-h_REF.gc
@@ -21,9 +21,9 @@
 
 ;; definition of type timer-bank
 (deftype timer-bank (structure)
-  ((count uint32     :offset   0)
-   (mode  timer-mode :offset  16)
-   (comp  uint32     :offset  32)
+  ((count uint32      :offset   0)
+   (mode  timer-mode  :offset  16)
+   (comp  uint32      :offset  32)
    )
   :method-count-assert 9
   :size-assert         #x24
@@ -41,7 +41,7 @@
 
 ;; definition of type timer-hold-bank
 (deftype timer-hold-bank (timer-bank)
-  ((hold uint32 :offset  48)
+  ((hold uint32  :offset  48)
    )
   :method-count-assert 9
   :size-assert         #x34
@@ -60,9 +60,9 @@
 
 ;; definition of type stopwatch
 (deftype stopwatch (basic)
-  ((prev-time-elapsed uint64  :offset-assert 8)
-   (start-time        uint64  :offset-assert 16)
-   (begin-level       int32   :offset-assert 24)
+  ((prev-time-elapsed uint64  :offset-assert   8)
+   (start-time        uint64  :offset-assert  16)
+   (begin-level       int32   :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -96,9 +96,9 @@
 
 ;; definition of type profile-frame
 (deftype profile-frame (structure)
-  ((name       symbol  :offset-assert 0)
-   (time-stamp uint32  :offset-assert 4)
-   (color      rgba    :offset-assert 8)
+  ((name       symbol  :offset-assert   0)
+   (time-stamp uint32  :offset-assert   4)
+   (color      rgba    :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -133,9 +133,9 @@
 
 ;; definition of type profile-bar
 (deftype profile-bar (basic)
-  ((profile-frame-count int32                      :offset-assert 4)
-   (cache-time          uint64                     :offset-assert 8)
-   (data                profile-frame 1024 :inline :offset-assert 16)
+  ((profile-frame-count int32                      :offset-assert   4)
+   (cache-time          uint64                     :offset-assert   8)
+   (data                profile-frame 1024 :inline :offset-assert  16)
    )
   :method-count-assert 14
   :size-assert         #x4010
diff --git a/test/decompiler/reference/engine/ps2/vif-h_REF.gc b/test/decompiler/reference/engine/ps2/vif-h_REF.gc
index 013e64414e..5d3b572e35 100644
--- a/test/decompiler/reference/engine/ps2/vif-h_REF.gc
+++ b/test/decompiler/reference/engine/ps2/vif-h_REF.gc
@@ -60,29 +60,29 @@
 
 ;; definition of type vif-bank
 (deftype vif-bank (structure)
-  ((stat   uint32              :offset-assert 0)
-   (fbrst  uint32  :offset  16)
-   (err    vif-err :offset  32)
-   (mark   uint32  :offset  48)
-   (cycle  uint32  :offset  64)
-   (mode   uint32  :offset  80)
-   (num    uint32  :offset  96)
-   (mask   uint32  :offset 112)
-   (code   uint32  :offset 128)
-   (itops  uint32  :offset 144)
-   (base   uint32  :offset 160)
-   (offset uint32  :offset 176)
-   (tops   uint32  :offset 192)
-   (itop   uint32  :offset 208)
-   (top    uint32  :offset 224)
-   (r0     uint32  :offset 256)
-   (r1     uint32  :offset 272)
-   (r2     uint32  :offset 288)
-   (r3     uint32  :offset 304)
-   (c0     uint32  :offset 320)
-   (c1     uint32  :offset 336)
-   (c2     uint32  :offset 352)
-   (c3     uint32  :offset 368)
+  ((stat   uint32   :offset-assert   0)
+   (fbrst  uint32   :offset         16)
+   (err    vif-err  :offset         32)
+   (mark   uint32   :offset         48)
+   (cycle  uint32   :offset         64)
+   (mode   uint32   :offset         80)
+   (num    uint32   :offset         96)
+   (mask   uint32   :offset        112)
+   (code   uint32   :offset        128)
+   (itops  uint32   :offset        144)
+   (base   uint32   :offset        160)
+   (offset uint32   :offset        176)
+   (tops   uint32   :offset        192)
+   (itop   uint32   :offset        208)
+   (top    uint32   :offset        224)
+   (r0     uint32   :offset        256)
+   (r1     uint32   :offset        272)
+   (r2     uint32   :offset        288)
+   (r3     uint32   :offset        304)
+   (c0     uint32   :offset        320)
+   (c1     uint32   :offset        336)
+   (c2     uint32   :offset        352)
+   (c3     uint32   :offset        368)
    )
   :method-count-assert 9
   :size-assert         #x174
diff --git a/test/decompiler/reference/engine/sound/gsound-h_REF.gc b/test/decompiler/reference/engine/sound/gsound-h_REF.gc
index ce77d455c0..44cd641210 100644
--- a/test/decompiler/reference/engine/sound/gsound-h_REF.gc
+++ b/test/decompiler/reference/engine/sound/gsound-h_REF.gc
@@ -32,8 +32,8 @@
 
 ;; definition of type sound-rpc-cmd
 (deftype sound-rpc-cmd (structure)
-  ((rsvd1   uint16         :offset-assert 0)
-   (command sound-command  :offset-assert 2)
+  ((rsvd1   uint16         :offset-assert   0)
+   (command sound-command  :offset-assert   2)
    )
   :method-count-assert 9
   :size-assert         #x4
@@ -50,16 +50,16 @@
 
 ;; definition of type sound-play-parms
 (deftype sound-play-parms (structure)
-  ((mask      uint16           :offset-assert 0)
-   (pitch-mod int16            :offset-assert 2)
-   (bend      int16            :offset-assert 4)
-   (fo-min    int16            :offset-assert 6)
-   (fo-max    int16            :offset-assert 8)
-   (fo-curve  int8             :offset-assert 10)
-   (priority  int8             :offset-assert 11)
-   (volume    int32            :offset-assert 12)
-   (trans     vector3w :inline :offset-assert 16)
-   (group     uint8            :offset-assert 28)
+  ((mask      uint16           :offset-assert   0)
+   (pitch-mod int16            :offset-assert   2)
+   (bend      int16            :offset-assert   4)
+   (fo-min    int16            :offset-assert   6)
+   (fo-max    int16            :offset-assert   8)
+   (fo-curve  int8             :offset-assert  10)
+   (priority  int8             :offset-assert  11)
+   (volume    int32            :offset-assert  12)
+   (trans     vector3w :inline :offset-assert  16)
+   (group     uint8            :offset-assert  28)
    )
   :pack-me
   :method-count-assert 9
@@ -85,7 +85,7 @@
 
 ;; definition of type sound-rpc-bank-cmd
 (deftype sound-rpc-bank-cmd (sound-rpc-cmd)
-  ((bank-name sound-name  :offset-assert 16)
+  ((bank-name sound-name  :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -104,7 +104,7 @@
 
 ;; definition of type sound-rpc-sound-cmd
 (deftype sound-rpc-sound-cmd (sound-rpc-cmd)
-  ((id sound-id  :offset-assert 4)
+  ((id sound-id  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -122,7 +122,7 @@
 
 ;; definition of type sound-rpc-group-cmd
 (deftype sound-rpc-group-cmd (sound-rpc-cmd)
-  ((group uint8  :offset-assert 4)
+  ((group uint8  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x5
@@ -194,8 +194,8 @@
 
 ;; definition of type sound-rpc-play
 (deftype sound-rpc-play (sound-rpc-sound-cmd)
-  ((name  sound-name               :offset-assert 16)
-   (parms sound-play-parms :inline :offset-assert 32)
+  ((name  sound-name               :offset-assert  16)
+   (parms sound-play-parms :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x3d
@@ -267,9 +267,9 @@
 
 ;; definition of type sound-rpc-set-param
 (deftype sound-rpc-set-param (sound-rpc-sound-cmd)
-  ((parms     sound-play-parms :inline :offset-assert 8)
-   (auto-time int32                    :offset-assert 40)
-   (auto-from int32                    :offset-assert 44)
+  ((parms     sound-play-parms :inline :offset-assert   8)
+   (auto-time int32                    :offset-assert  40)
+   (auto-from int32                    :offset-assert  44)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -290,7 +290,7 @@
 
 ;; definition of type sound-rpc-set-master-volume
 (deftype sound-rpc-set-master-volume (sound-rpc-group-cmd)
-  ((volume int32  :offset-assert 8)
+  ((volume int32  :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #xc
@@ -363,9 +363,9 @@
 
 ;; definition of type sound-rpc-get-irx-version
 (deftype sound-rpc-get-irx-version (sound-rpc-cmd)
-  ((major   uint32   :offset-assert 4)
-   (minor   uint32   :offset-assert 8)
-   (ee-addr pointer  :offset-assert 12)
+  ((major   uint32   :offset-assert   4)
+   (minor   uint32   :offset-assert   8)
+   (ee-addr pointer  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -385,7 +385,7 @@
 
 ;; definition of type sound-rpc-set-language
 (deftype sound-rpc-set-language (sound-rpc-cmd)
-  ((lang uint32  :offset-assert 4)
+  ((lang uint32  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -403,9 +403,9 @@
 
 ;; definition of type sound-rpc-set-falloff-curve
 (deftype sound-rpc-set-falloff-curve (sound-rpc-cmd)
-  ((curve   int32  :offset-assert 4)
-   (falloff int32  :offset-assert 8)
-   (ease    int32  :offset-assert 12)
+  ((curve   int32  :offset-assert   4)
+   (falloff int32  :offset-assert   8)
+   (ease    int32  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -428,10 +428,10 @@
 
 ;; definition of type sound-rpc-set-sound-falloff
 (deftype sound-rpc-set-sound-falloff (sound-rpc-cmd)
-  ((name  sound-name  :offset-assert 16)
-   (curve int32       :offset-assert 32)
-   (min   int32       :offset-assert 36)
-   (max   int32       :offset-assert 40)
+  ((name  sound-name  :offset-assert  16)
+   (curve int32       :offset-assert  32)
+   (min   int32       :offset-assert  36)
+   (max   int32       :offset-assert  40)
    )
   :method-count-assert 9
   :size-assert         #x2c
@@ -472,10 +472,10 @@
 
 ;; definition of type sound-rpc-set-reverb
 (deftype sound-rpc-set-reverb (sound-rpc-cmd)
-  ((core   uint8   :offset-assert 4)
-   (reverb int32   :offset-assert 8)
-   (left   uint32  :offset-assert 12)
-   (right  uint32  :offset-assert 16)
+  ((core   uint8   :offset-assert   4)
+   (reverb int32   :offset-assert   8)
+   (left   uint32  :offset-assert  12)
+   (right  uint32  :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x14
@@ -496,9 +496,9 @@
 
 ;; definition of type sound-rpc-set-ear-trans
 (deftype sound-rpc-set-ear-trans (sound-rpc-cmd)
-  ((ear-trans vector3w :inline :offset-assert 4)
-   (cam-trans vector3w :inline :offset-assert 16)
-   (cam-angle int32            :offset-assert 28)
+  ((ear-trans vector3w :inline :offset-assert   4)
+   (cam-trans vector3w :inline :offset-assert  16)
+   (cam-angle int32            :offset-assert  28)
    )
   :method-count-assert 9
   :size-assert         #x20
@@ -518,7 +518,7 @@
 
 ;; definition of type sound-rpc-set-flava
 (deftype sound-rpc-set-flava (sound-rpc-cmd)
-  ((flava uint8  :offset-assert 4)
+  ((flava uint8  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x5
@@ -584,29 +584,29 @@
 
 ;; definition of type sound-rpc-union
 (deftype sound-rpc-union (structure)
-  ((data              uint32                      20          :offset-assert 0)
-   (load-bank         sound-rpc-load-bank         :offset   0)
-   (unload-bank       sound-rpc-unload-bank       :offset   0)
-   (play              sound-rpc-play              :offset   0)
-   (pause-sound       sound-rpc-pause-sound       :offset   0)
-   (stop-sound        sound-rpc-stop-sound        :offset   0)
-   (continue-sound    sound-rpc-continue-sound    :offset   0)
-   (set-param         sound-rpc-set-param         :offset   0)
-   (set-master-volume sound-rpc-set-master-volume :offset   0)
-   (pause-group       sound-rpc-pause-group       :offset   0)
-   (stop-group        sound-rpc-stop-group        :offset   0)
-   (continue-group    sound-rpc-continue-group    :offset   0)
-   (get-irx-version   sound-rpc-get-irx-version   :offset   0)
-   (set-falloff-curve sound-rpc-set-falloff-curve :offset   0)
-   (set-sound-falloff sound-rpc-set-sound-falloff :offset   0)
-   (reload-info       sound-rpc-reload-info       :offset   0)
-   (set-language      sound-rpc-set-language      :offset   0)
-   (set-reverb        sound-rpc-set-reverb        :offset   0)
-   (set-ear-trans     sound-rpc-set-ear-trans     :offset   0)
-   (set-flava         sound-rpc-set-flava         :offset   0)
-   (shutdown          sound-rpc-shutdown          :offset   0)
-   (list-sounds       sound-rpc-list-sounds       :offset   0)
-   (unload-music      sound-rpc-unload-music      :offset   0)
+  ((data              uint32                      20 :offset-assert   0)
+   (load-bank         sound-rpc-load-bank            :offset          0)
+   (unload-bank       sound-rpc-unload-bank          :offset          0)
+   (play              sound-rpc-play                 :offset          0)
+   (pause-sound       sound-rpc-pause-sound          :offset          0)
+   (stop-sound        sound-rpc-stop-sound           :offset          0)
+   (continue-sound    sound-rpc-continue-sound       :offset          0)
+   (set-param         sound-rpc-set-param            :offset          0)
+   (set-master-volume sound-rpc-set-master-volume    :offset          0)
+   (pause-group       sound-rpc-pause-group          :offset          0)
+   (stop-group        sound-rpc-stop-group           :offset          0)
+   (continue-group    sound-rpc-continue-group       :offset          0)
+   (get-irx-version   sound-rpc-get-irx-version      :offset          0)
+   (set-falloff-curve sound-rpc-set-falloff-curve    :offset          0)
+   (set-sound-falloff sound-rpc-set-sound-falloff    :offset          0)
+   (reload-info       sound-rpc-reload-info          :offset          0)
+   (set-language      sound-rpc-set-language         :offset          0)
+   (set-reverb        sound-rpc-set-reverb           :offset          0)
+   (set-ear-trans     sound-rpc-set-ear-trans        :offset          0)
+   (set-flava         sound-rpc-set-flava            :offset          0)
+   (shutdown          sound-rpc-shutdown             :offset          0)
+   (list-sounds       sound-rpc-list-sounds          :offset          0)
+   (unload-music      sound-rpc-unload-music         :offset          0)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -712,21 +712,21 @@
 
 ;; definition of type sound-spec
 (deftype sound-spec (basic)
-  ((mask            uint16                    :offset-assert 4)
-   (num             float                     :offset-assert 8)
-   (group           uint8                     :offset-assert 12)
-   (sound-name-char uint8      16 :offset  16)
-   (sound-name      sound-name :offset  16)
-   (trans           float      4              :offset-assert 32)
-   (volume          int32                     :offset-assert 48)
-   (pitch-mod       int32                     :offset-assert 52)
-   (bend            int32                     :offset-assert 56)
-   (fo-min          int16                     :offset-assert 60)
-   (fo-max          int16                     :offset-assert 62)
-   (fo-curve        int8                      :offset-assert 64)
-   (priority        int8                      :offset-assert 65)
-   (auto-time       int32                     :offset-assert 68)
-   (auto-from       int32                     :offset-assert 72)
+  ((mask            uint16        :offset-assert   4)
+   (num             float         :offset-assert   8)
+   (group           uint8         :offset-assert  12)
+   (sound-name-char uint8      16 :offset         16)
+   (sound-name      sound-name    :offset         16)
+   (trans           float      4  :offset-assert  32)
+   (volume          int32         :offset-assert  48)
+   (pitch-mod       int32         :offset-assert  52)
+   (bend            int32         :offset-assert  56)
+   (fo-min          int16         :offset-assert  60)
+   (fo-max          int16         :offset-assert  62)
+   (fo-curve        int8          :offset-assert  64)
+   (priority        int8          :offset-assert  65)
+   (auto-time       int32         :offset-assert  68)
+   (auto-from       int32         :offset-assert  72)
    )
   :method-count-assert 9
   :size-assert         #x4c
@@ -760,20 +760,20 @@
 
 ;; definition of type ambient-sound
 (deftype ambient-sound (basic)
-  ((spec         sound-spec               :offset-assert 4)
-   (playing-id   sound-id                 :offset-assert 8)
-   (trans        vector           :inline :offset-assert 16)
-   (name         sound-name               :offset-assert 32)
-   (play-time    uint64                   :offset-assert 48)
-   (time-base    uint64                   :offset-assert 56)
-   (time-random  uint64                   :offset-assert 64)
-   (volume       int32                    :offset-assert 72)
-   (pitch        int32                    :offset-assert 76)
-   (falloff-near int32                    :offset-assert 80)
-   (falloff-far  int32                    :offset-assert 84)
-   (falloff-mode int32                    :offset-assert 88)
-   (params       sound-play-parms         :offset-assert 92)
-   (param-count  int32                    :offset-assert 96)
+  ((spec         sound-spec               :offset-assert   4)
+   (playing-id   sound-id                 :offset-assert   8)
+   (trans        vector           :inline :offset-assert  16)
+   (name         sound-name               :offset-assert  32)
+   (play-time    uint64                   :offset-assert  48)
+   (time-base    uint64                   :offset-assert  56)
+   (time-random  uint64                   :offset-assert  64)
+   (volume       int32                    :offset-assert  72)
+   (pitch        int32                    :offset-assert  76)
+   (falloff-near int32                    :offset-assert  80)
+   (falloff-far  int32                    :offset-assert  84)
+   (falloff-mode int32                    :offset-assert  88)
+   (params       sound-play-parms         :offset-assert  92)
+   (param-count  int32                    :offset-assert  96)
    (entity       entity                   :offset-assert 100)
    (sound-count  int32                    :offset-assert 104)
    )
diff --git a/test/decompiler/reference/engine/target/joint-mod-h_REF.gc b/test/decompiler/reference/engine/target/joint-mod-h_REF.gc
index 5b027562b6..42b0457fd2 100644
--- a/test/decompiler/reference/engine/target/joint-mod-h_REF.gc
+++ b/test/decompiler/reference/engine/target/joint-mod-h_REF.gc
@@ -3,25 +3,25 @@
 
 ;; definition of type joint-mod
 (deftype joint-mod (basic)
-  ((mode            joint-mod-handler-mode             :offset-assert 4)
-   (process         process-drawable                   :offset-assert 8)
-   (joint           cspace                             :offset-assert 12)
-   (target          vector                 :inline     :offset-assert 16)
-   (twist           vector                 :inline     :offset-assert 32)
-   (twist-max       vector                 :inline     :offset-assert 48)
-   (trans           vector                 :inline     :offset-assert 64)
-   (quat            quaternion             :inline     :offset-assert 80)
-   (scale           vector                 :inline     :offset-assert 96)
-   (notice-time     uint64                             :offset-assert 112)
-   (flex-blend      float                              :offset-assert 120)
-   (blend           float                              :offset-assert 124)
-   (max-dist        float                              :offset-assert 128)
-   (ignore-angle    float                              :offset-assert 132)
-   (up              uint8                              :offset-assert 136)
-   (nose            uint8                              :offset-assert 137)
-   (ear             uint8                              :offset-assert 138)
-   (shutting-down?  basic                              :offset-assert 140)
-   (parented-scale? basic                  :offset 128)
+  ((mode            joint-mod-handler-mode         :offset-assert   4)
+   (process         process-drawable               :offset-assert   8)
+   (joint           cspace                         :offset-assert  12)
+   (target          vector                 :inline :offset-assert  16)
+   (twist           vector                 :inline :offset-assert  32)
+   (twist-max       vector                 :inline :offset-assert  48)
+   (trans           vector                 :inline :offset-assert  64)
+   (quat            quaternion             :inline :offset-assert  80)
+   (scale           vector                 :inline :offset-assert  96)
+   (notice-time     uint64                         :offset-assert 112)
+   (flex-blend      float                          :offset-assert 120)
+   (blend           float                          :offset-assert 124)
+   (max-dist        float                          :offset-assert 128)
+   (ignore-angle    float                          :offset-assert 132)
+   (up              uint8                          :offset-assert 136)
+   (nose            uint8                          :offset-assert 137)
+   (ear             uint8                          :offset-assert 138)
+   (shutting-down?  basic                          :offset-assert 140)
+   (parented-scale? basic                          :offset        128)
    )
   :method-count-assert 16
   :size-assert         #x90
@@ -257,9 +257,9 @@
 
 ;; definition of type try-to-look-at-info
 (deftype try-to-look-at-info (basic)
-  ((who  handle  :offset-assert 8)
-   (horz float   :offset-assert 16)
-   (vert float   :offset-assert 20)
+  ((who  handle  :offset-assert   8)
+   (horz float   :offset-assert  16)
+   (vert float   :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x18
@@ -866,11 +866,11 @@
 
 ;; definition of type joint-mod-wheel
 (deftype joint-mod-wheel (basic)
-  ((last-position vector           :inline :offset-assert 16)
-   (angle         float                    :offset-assert 32)
-   (process       process-drawable         :offset-assert 36)
-   (wheel-radius  float                    :offset-assert 40)
-   (wheel-axis    int8                     :offset-assert 44)
+  ((last-position vector           :inline :offset-assert  16)
+   (angle         float                    :offset-assert  32)
+   (process       process-drawable         :offset-assert  36)
+   (wheel-radius  float                    :offset-assert  40)
+   (wheel-axis    int8                     :offset-assert  44)
    )
   :method-count-assert 9
   :size-assert         #x2d
@@ -984,11 +984,11 @@
 
 ;; definition of type joint-mod-set-local
 (deftype joint-mod-set-local (basic)
-  ((transform       transformq :inline :offset-assert 16)
-   (set-rotation    basic              :offset-assert 64)
-   (set-scale       basic              :offset-assert 68)
-   (set-translation basic              :offset-assert 72)
-   (enable          basic              :offset-assert 76)
+  ((transform       transformq :inline :offset-assert  16)
+   (set-rotation    basic              :offset-assert  64)
+   (set-scale       basic              :offset-assert  68)
+   (set-translation basic              :offset-assert  72)
+   (enable          basic              :offset-assert  76)
    )
   :method-count-assert 9
   :size-assert         #x50
@@ -1069,9 +1069,9 @@
 
 ;; definition of type joint-mod-set-world
 (deftype joint-mod-set-world (basic)
-  ((transform  transformq :inline :offset-assert 16)
-   (node-index int32              :offset-assert 64)
-   (enable     basic              :offset-assert 68)
+  ((transform  transformq :inline :offset-assert  16)
+   (node-index int32              :offset-assert  64)
+   (enable     basic              :offset-assert  68)
    )
   :method-count-assert 9
   :size-assert         #x48
@@ -1132,8 +1132,8 @@
 
 ;; definition of type joint-mod-blend-local
 (deftype joint-mod-blend-local (basic)
-  ((transform       transformq :inline :offset-assert 16)
-   (blend-transform transformq :inline :offset-assert 64)
+  ((transform       transformq :inline :offset-assert  16)
+   (blend-transform transformq :inline :offset-assert  64)
    (node-index      int32              :offset-assert 112)
    (blend           float              :offset-assert 116)
    (enable          basic              :offset-assert 120)
@@ -1226,10 +1226,10 @@
 
 ;; definition of type joint-mod-spinner
 (deftype joint-mod-spinner (basic)
-  ((spin-axis vector :inline :offset-assert 16)
-   (angle     float          :offset-assert 32)
-   (spin-rate float          :offset-assert 36)
-   (enable    basic          :offset-assert 40)
+  ((spin-axis vector :inline :offset-assert  16)
+   (angle     float          :offset-assert  32)
+   (spin-rate float          :offset-assert  36)
+   (enable    basic          :offset-assert  40)
    )
   :method-count-assert 9
   :size-assert         #x2c
diff --git a/test/decompiler/reference/engine/target/pat-h_REF.gc b/test/decompiler/reference/engine/target/pat-h_REF.gc
index bdff64565c..ec08943964 100644
--- a/test/decompiler/reference/engine/target/pat-h_REF.gc
+++ b/test/decompiler/reference/engine/target/pat-h_REF.gc
@@ -167,10 +167,10 @@
 
 ;; definition of type pat-mode-info
 (deftype pat-mode-info (structure)
-  ((name         string  :offset-assert 0)
-   (wall-angle   float   :offset-assert 4)
-   (color        rgba    :offset-assert 8)
-   (hilite-color rgba    :offset-assert 12)
+  ((name         string  :offset-assert   0)
+   (wall-angle   float   :offset-assert   4)
+   (color        rgba    :offset-assert   8)
+   (hilite-color rgba    :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/target/surface-h_REF.gc b/test/decompiler/reference/engine/target/surface-h_REF.gc
index 19048dedde..0fb6e8a247 100644
--- a/test/decompiler/reference/engine/target/surface-h_REF.gc
+++ b/test/decompiler/reference/engine/target/surface-h_REF.gc
@@ -3,38 +3,38 @@
 
 ;; definition of type surface
 (deftype surface (basic)
-  ((name              basic                                                      :offset-assert 4)
-   (turnv             float                                                      :offset-assert 8)
-   (turnvv            float                                                      :offset-assert 12)
-   (tiltv             float                                                      :offset-assert 16)
-   (tiltvv            float                                                      :offset-assert 20)
-   (transv-max        float                                                      :offset-assert 24)
-   (target-speed      float                                                      :offset-assert 28)
-   (seek0             float                                                      :offset-assert 32)
-   (seek90            float                                                      :offset-assert 36)
-   (seek180           float                                                      :offset-assert 40)
-   (fric              float                                                      :offset-assert 44)
-   (nonlin-fric-dist  float                                                      :offset-assert 48)
-   (slip-factor       float                                                      :offset-assert 52)
-   (slide-factor      float                                                      :offset-assert 56)
-   (slope-up-factor   float                                                      :offset-assert 60)
-   (slope-down-factor float                                                      :offset-assert 64)
-   (slope-slip-angle  float                                                      :offset-assert 68)
-   (impact-fric       float                                                      :offset-assert 72)
-   (bend-factor       float                                                      :offset-assert 76)
-   (bend-speed        float                                                      :offset-assert 80)
-   (alignv            float                                                      :offset-assert 84)
-   (slope-up-traction float                                                      :offset-assert 88)
-   (align-speed       float                                                      :offset-assert 92)
-   (active-hook       basic                                       :offset 128)
-   (touch-hook        basic                                                      :offset-assert 132)
-   (impact-hook       basic                                                      :offset-assert 136)
-   (mult-hook         (function surface surface surface int none)                :offset-assert 140)
-   (mode              basic                                                      :offset-assert 144)
-   (flags             uint32                                                     :offset-assert 148)
-   (data              float                                       30 :offset   8)
-   (hook              basic                                       4 :offset 128)
-   (dataw             uint32                                      2 :offset 144)
+  ((name              basic                                          :offset-assert   4)
+   (turnv             float                                          :offset-assert   8)
+   (turnvv            float                                          :offset-assert  12)
+   (tiltv             float                                          :offset-assert  16)
+   (tiltvv            float                                          :offset-assert  20)
+   (transv-max        float                                          :offset-assert  24)
+   (target-speed      float                                          :offset-assert  28)
+   (seek0             float                                          :offset-assert  32)
+   (seek90            float                                          :offset-assert  36)
+   (seek180           float                                          :offset-assert  40)
+   (fric              float                                          :offset-assert  44)
+   (nonlin-fric-dist  float                                          :offset-assert  48)
+   (slip-factor       float                                          :offset-assert  52)
+   (slide-factor      float                                          :offset-assert  56)
+   (slope-up-factor   float                                          :offset-assert  60)
+   (slope-down-factor float                                          :offset-assert  64)
+   (slope-slip-angle  float                                          :offset-assert  68)
+   (impact-fric       float                                          :offset-assert  72)
+   (bend-factor       float                                          :offset-assert  76)
+   (bend-speed        float                                          :offset-assert  80)
+   (alignv            float                                          :offset-assert  84)
+   (slope-up-traction float                                          :offset-assert  88)
+   (align-speed       float                                          :offset-assert  92)
+   (active-hook       basic                                          :offset        128)
+   (touch-hook        basic                                          :offset-assert 132)
+   (impact-hook       basic                                          :offset-assert 136)
+   (mult-hook         (function surface surface surface int none)    :offset-assert 140)
+   (mode              basic                                          :offset-assert 144)
+   (flags             uint32                                         :offset-assert 148)
+   (data              float                                       30 :offset          8)
+   (hook              basic                                       4  :offset        128)
+   (dataw             uint32                                      2  :offset        144)
    )
   :method-count-assert 9
   :size-assert         #x98
@@ -100,7 +100,6 @@
 
 ;; definition for method 2 of type surface
 (defmethod print surface ((obj surface))
-  (local-vars (t3-0 none))
   (format
    #t
    "#<surface f0:~m f1:~f tf+:~f tf-:~f sf:~f tvv:~m"
@@ -109,7 +108,6 @@
    (-> obj tiltv)
    (-> obj tiltvv)
    (-> obj transv-max)
-   t3-0
    )
   (format
    #t
diff --git a/test/decompiler/reference/engine/target/target-h_REF.gc b/test/decompiler/reference/engine/target/target-h_REF.gc
index 5dbbbf4eea..c57b349631 100644
--- a/test/decompiler/reference/engine/target/target-h_REF.gc
+++ b/test/decompiler/reference/engine/target/target-h_REF.gc
@@ -3,30 +3,30 @@
 
 ;; definition of type target
 (deftype target (process-drawable)
-  ((control             basic       :offset 112)
-   (skel2               basic                   :offset-assert 176)
-   (racer               basic                   :offset-assert 180)
-   (game                basic                   :offset-assert 184)
-   (neck                basic                   :offset-assert 188)
-   (state-hook-time     uint64                  :offset-assert 192)
-   (state-hook          basic                   :offset-assert 200)
-   (cam-user-mode       basic                   :offset-assert 204)
-   (sidekick            uint32                  :offset-assert 208)
-   (manipy              uint32                  :offset-assert 212)
-   (attack-info         attack-info :inline     :offset-assert 224)
-   (attack-info-rec     attack-info :inline     :offset-assert 336)
-   (anim-seed           uint64                  :offset-assert 440)
-   (alt-cam-pos         vector      :inline     :offset-assert 448)
-   (snowball            basic                   :offset-assert 464)
-   (tube                basic                   :offset-assert 468)
-   (flut                basic                   :offset-assert 472)
-   (current-level       basic                   :offset-assert 476)
-   (saved-pos           transformq  :inline     :offset-assert 480)
-   (saved-owner         uint64                  :offset-assert 528)
-   (alt-neck-pos        vector      :inline     :offset-assert 544)
-   (fp-hud              uint64                  :offset-assert 560)
-   (no-load-wait        uint64                  :offset-assert 568)
-   (no-look-around-wait uint64                  :offset-assert 576)
+  ((control             basic               :offset        112)
+   (skel2               basic               :offset-assert 176)
+   (racer               basic               :offset-assert 180)
+   (game                basic               :offset-assert 184)
+   (neck                basic               :offset-assert 188)
+   (state-hook-time     uint64              :offset-assert 192)
+   (state-hook          basic               :offset-assert 200)
+   (cam-user-mode       basic               :offset-assert 204)
+   (sidekick            uint32              :offset-assert 208)
+   (manipy              uint32              :offset-assert 212)
+   (attack-info         attack-info :inline :offset-assert 224)
+   (attack-info-rec     attack-info :inline :offset-assert 336)
+   (anim-seed           uint64              :offset-assert 440)
+   (alt-cam-pos         vector      :inline :offset-assert 448)
+   (snowball            basic               :offset-assert 464)
+   (tube                basic               :offset-assert 468)
+   (flut                basic               :offset-assert 472)
+   (current-level       basic               :offset-assert 476)
+   (saved-pos           transformq  :inline :offset-assert 480)
+   (saved-owner         uint64              :offset-assert 528)
+   (alt-neck-pos        vector      :inline :offset-assert 544)
+   (fp-hud              uint64              :offset-assert 560)
+   (no-load-wait        uint64              :offset-assert 568)
+   (no-look-around-wait uint64              :offset-assert 576)
    )
   :heap-base #x1e0
   :method-count-assert 21
@@ -78,9 +78,9 @@
 
 ;; definition of type sidekick
 (deftype sidekick (process-drawable)
-  ((control          basic  :offset 112)
-   (anim-seed        uint64 :offset 192)
-   (shadow-in-movie? basic              :offset-assert 200)
+  ((control          basic   :offset        112)
+   (anim-seed        uint64  :offset        192)
+   (shadow-in-movie? basic   :offset-assert 200)
    )
   :heap-base #x60
   :method-count-assert 20
diff --git a/test/decompiler/reference/engine/ui/hud-h_REF.gc b/test/decompiler/reference/engine/ui/hud-h_REF.gc
index aaebeabba2..06ac93a50c 100644
--- a/test/decompiler/reference/engine/ui/hud-h_REF.gc
+++ b/test/decompiler/reference/engine/ui/hud-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type hud-icon
 (deftype hud-icon (basic)
-  ((icon    uint32  :offset-assert 4)
-   (icon-y  int32   :offset-assert 8)
-   (icon-x  int32   :offset-assert 12)
-   (icon-z  int32   :offset-assert 16)
-   (scale-x float   :offset-assert 20)
-   (scale-y float   :offset-assert 24)
+  ((icon    uint32  :offset-assert   4)
+   (icon-y  int32   :offset-assert   8)
+   (icon-x  int32   :offset-assert  12)
+   (icon-z  int32   :offset-assert  16)
+   (scale-x float   :offset-assert  20)
+   (scale-y float   :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -29,10 +29,10 @@
 
 ;; definition of type hud-particle
 (deftype hud-particle (basic)
-  ((part     basic          :offset-assert 4)
-   (init-pos vector :inline :offset-assert 16)
-   (pos      vector :inline :offset-assert 32)
-   (prev-pos vector :inline :offset-assert 48)
+  ((part     basic          :offset-assert   4)
+   (init-pos vector :inline :offset-assert  16)
+   (pos      vector :inline :offset-assert  32)
+   (prev-pos vector :inline :offset-assert  48)
    )
   :method-count-assert 9
   :size-assert         #x40
@@ -135,15 +135,15 @@
 
 ;; definition of type hud-parts
 (deftype hud-parts (structure)
-  ((pickups    basic  :offset-assert 0)
-   (money      basic  :offset-assert 4)
-   (fuel-cell  basic  :offset-assert 8)
-   (health     basic  :offset-assert 12)
-   (buzzers    basic  :offset-assert 16)
-   (power      basic  :offset-assert 20)
-   (bike-speed basic  :offset-assert 24)
-   (bike-heat  basic  :offset-assert 28)
-   (money-all  basic  :offset-assert 32)
+  ((pickups    basic  :offset-assert   0)
+   (money      basic  :offset-assert   4)
+   (fuel-cell  basic  :offset-assert   8)
+   (health     basic  :offset-assert  12)
+   (buzzers    basic  :offset-assert  16)
+   (power      basic  :offset-assert  20)
+   (bike-speed basic  :offset-assert  24)
+   (bike-heat  basic  :offset-assert  28)
+   (money-all  basic  :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x24
diff --git a/test/decompiler/reference/engine/ui/progress-h_REF.gc b/test/decompiler/reference/engine/ui/progress-h_REF.gc
index 98915e4bd4..60305d4727 100644
--- a/test/decompiler/reference/engine/ui/progress-h_REF.gc
+++ b/test/decompiler/reference/engine/ui/progress-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type count-info
 (deftype count-info (structure)
-  ((money-count  int32  :offset-assert 0)
-   (buzzer-count int32  :offset-assert 4)
+  ((money-count  int32  :offset-assert   0)
+   (buzzer-count int32  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -22,8 +22,8 @@
 
 ;; definition of type game-count-info
 (deftype game-count-info (basic)
-  ((length int32                       :offset-assert 4)
-   (data   count-info :inline :dynamic :offset-assert 8)
+  ((length int32                       :offset-assert   4)
+   (data   count-info :inline :dynamic :offset-assert   8)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -40,9 +40,9 @@
 
 ;; definition of type task-info-data
 (deftype task-info-data (basic)
-  ((task-id                  uint8    :offset-assert 4)
-   (task-name                symbol 4 :offset-assert 8)
-   (text-index-when-resolved int32    :offset-assert 24)
+  ((task-id                  uint8    :offset-assert   4)
+   (task-name                symbol 4 :offset-assert   8)
+   (text-index-when-resolved int32    :offset-assert  24)
    )
   :method-count-assert 9
   :size-assert         #x1c
@@ -64,11 +64,11 @@
 
 ;; definition of type level-tasks-info
 (deftype level-tasks-info (basic)
-  ((level-name-id     uint32           :offset-assert 4)
-   (text-group-index  int32            :offset-assert 8)
-   (nb-of-tasks       int32            :offset-assert 12)
-   (buzzer-task-index int32            :offset-assert 16)
-   (task-info         task-info-data 8 :offset-assert 20)
+  ((level-name-id     uint32           :offset-assert   4)
+   (text-group-index  int32            :offset-assert   8)
+   (nb-of-tasks       int32            :offset-assert  12)
+   (buzzer-task-index int32            :offset-assert  16)
+   (task-info         task-info-data 8 :offset-assert  20)
    )
   :method-count-assert 9
   :size-assert         #x34
@@ -88,13 +88,13 @@
 
 ;; definition of type game-option
 (deftype game-option (basic)
-  ((option-type     uint64  :offset-assert 8)
-   (name            uint32  :offset-assert 16)
-   (scale           basic   :offset-assert 20)
-   (param1          float   :offset-assert 24)
-   (param2          float   :offset-assert 28)
-   (param3          int32   :offset-assert 32)
-   (value-to-modify uint32  :offset-assert 36)
+  ((option-type     uint64  :offset-assert   8)
+   (name            uint32  :offset-assert  16)
+   (scale           basic   :offset-assert  20)
+   (param1          float   :offset-assert  24)
+   (param2          float   :offset-assert  28)
+   (param3          int32   :offset-assert  32)
+   (value-to-modify uint32  :offset-assert  36)
    )
   :method-count-assert 9
   :size-assert         #x28
diff --git a/test/decompiler/reference/engine/ui/text-h_REF.gc b/test/decompiler/reference/engine/ui/text-h_REF.gc
index c5b2f443c2..99caa2899d 100644
--- a/test/decompiler/reference/engine/ui/text-h_REF.gc
+++ b/test/decompiler/reference/engine/ui/text-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type game-text
 (deftype game-text (structure)
-  ((id   uint32  :offset-assert 0)
-   (text string  :offset-assert 4)
+  ((id   uint32  :offset-assert   0)
+   (text string  :offset-assert   4)
    )
   :pack-me
   :method-count-assert 9
@@ -22,10 +22,10 @@
 
 ;; definition of type game-text-info
 (deftype game-text-info (basic)
-  ((length      int32                      :offset-assert 4)
-   (language-id int32                      :offset-assert 8)
-   (group-name  string                     :offset-assert 12)
-   (data        game-text :inline :dynamic :offset-assert 16)
+  ((length      int32                      :offset-assert   4)
+   (language-id int32                      :offset-assert   8)
+   (group-name  string                     :offset-assert  12)
+   (data        game-text :inline :dynamic :offset-assert  16)
    )
   :method-count-assert 10
   :size-assert         #x10
diff --git a/test/decompiler/reference/engine/util/smush-control-h_REF.gc b/test/decompiler/reference/engine/util/smush-control-h_REF.gc
index ca7372119c..9b45f68c57 100644
--- a/test/decompiler/reference/engine/util/smush-control-h_REF.gc
+++ b/test/decompiler/reference/engine/util/smush-control-h_REF.gc
@@ -3,13 +3,13 @@
 
 ;; definition of type smush-control
 (deftype smush-control (structure)
-  ((start-time  uint64  :offset-assert 0)
-   (period      float   :offset-assert 8)
-   (duration    float   :offset-assert 12)
-   (amp         float   :offset-assert 16)
-   (damp-amp    float   :offset-assert 20)
-   (damp-period float   :offset-assert 24)
-   (ticks       float   :offset-assert 28)
+  ((start-time  uint64  :offset-assert   0)
+   (period      float   :offset-assert   8)
+   (duration    float   :offset-assert  12)
+   (amp         float   :offset-assert  16)
+   (damp-amp    float   :offset-assert  20)
+   (damp-period float   :offset-assert  24)
+   (ticks       float   :offset-assert  28)
    )
   :method-count-assert 15
   :size-assert         #x20
diff --git a/test/decompiler/reference/engine/util/sync-info-h_REF.gc b/test/decompiler/reference/engine/util/sync-info-h_REF.gc
index 439f630a28..60715decb2 100644
--- a/test/decompiler/reference/engine/util/sync-info-h_REF.gc
+++ b/test/decompiler/reference/engine/util/sync-info-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type sync-info
 (deftype sync-info (structure)
-  ((offset float   :offset-assert 0)
-   (period uint32  :offset-assert 4)
+  ((offset float   :offset-assert   0)
+   (period uint32  :offset-assert   4)
    )
   :method-count-assert 18
   :size-assert         #x8
@@ -32,11 +32,11 @@
 
 ;; definition of type sync-info-eased
 (deftype sync-info-eased (sync-info)
-  ((tlo  float  :offset-assert 8)
-   (thi  float  :offset-assert 12)
-   (ylo  float  :offset-assert 16)
-   (m2   float  :offset-assert 20)
-   (yend float  :offset-assert 24)
+  ((tlo  float  :offset-assert   8)
+   (thi  float  :offset-assert  12)
+   (ylo  float  :offset-assert  16)
+   (m2   float  :offset-assert  20)
+   (yend float  :offset-assert  24)
    )
   :method-count-assert 18
   :size-assert         #x1c
@@ -58,8 +58,8 @@
 
 ;; definition of type sync-info-paused
 (deftype sync-info-paused (sync-info)
-  ((pause-after-out float  :offset-assert 8)
-   (pause-after-in  float  :offset-assert 12)
+  ((pause-after-out float  :offset-assert   8)
+   (pause-after-in  float  :offset-assert  12)
    )
   :method-count-assert 18
   :size-assert         #x10
@@ -78,12 +78,12 @@
 
 ;; definition of type delayed-rand-float
 (deftype delayed-rand-float (structure)
-  ((min-time   int32   :offset-assert 0)
-   (max-time   int32   :offset-assert 4)
-   (max-val    float   :offset-assert 8)
-   (timer      int32   :offset-assert 12)
-   (start-time uint64  :offset-assert 16)
-   (value      float   :offset-assert 24)
+  ((min-time   int32   :offset-assert   0)
+   (max-time   int32   :offset-assert   4)
+   (max-val    float   :offset-assert   8)
+   (timer      int32   :offset-assert  12)
+   (start-time uint64  :offset-assert  16)
+   (value      float   :offset-assert  24)
    )
   :method-count-assert 11
   :size-assert         #x1c
@@ -108,12 +108,12 @@
 
 ;; definition of type oscillating-float
 (deftype oscillating-float (structure)
-  ((value   float  :offset-assert 0)
-   (target  float  :offset-assert 4)
-   (vel     float  :offset-assert 8)
-   (max-vel float  :offset-assert 12)
-   (damping float  :offset-assert 16)
-   (accel   float  :offset-assert 20)
+  ((value   float  :offset-assert   0)
+   (target  float  :offset-assert   4)
+   (vel     float  :offset-assert   8)
+   (max-vel float  :offset-assert  12)
+   (damping float  :offset-assert  16)
+   (accel   float  :offset-assert  20)
    )
   :method-count-assert 11
   :size-assert         #x18
@@ -138,11 +138,11 @@
 
 ;; definition of type bouncing-float
 (deftype bouncing-float (structure)
-  ((osc        oscillating-float :inline :offset-assert 0)
-   (max-value  float                     :offset-assert 24)
-   (min-value  float                     :offset-assert 28)
-   (elasticity float                     :offset-assert 32)
-   (state      int32                     :offset-assert 36)
+  ((osc        oscillating-float :inline :offset-assert   0)
+   (max-value  float                     :offset-assert  24)
+   (min-value  float                     :offset-assert  28)
+   (elasticity float                     :offset-assert  32)
+   (state      int32                     :offset-assert  36)
    )
   :method-count-assert 13
   :size-assert         #x28
@@ -168,13 +168,13 @@
 
 ;; definition of type delayed-rand-vector
 (deftype delayed-rand-vector (structure)
-  ((min-time   int32          :offset-assert 0)
-   (max-time   int32          :offset-assert 4)
-   (xz-max     float          :offset-assert 8)
-   (y-max      float          :offset-assert 12)
-   (timer      int32          :offset-assert 16)
-   (start-time uint64         :offset-assert 24)
-   (value      vector :inline :offset-assert 32)
+  ((min-time   int32          :offset-assert   0)
+   (max-time   int32          :offset-assert   4)
+   (xz-max     float          :offset-assert   8)
+   (y-max      float          :offset-assert  12)
+   (timer      int32          :offset-assert  16)
+   (start-time uint64         :offset-assert  24)
+   (value      vector :inline :offset-assert  32)
    )
   :method-count-assert 13
   :size-assert         #x30
@@ -202,12 +202,12 @@
 
 ;; definition of type oscillating-vector
 (deftype oscillating-vector (structure)
-  ((value   vector :inline :offset-assert 0)
-   (target  vector :inline :offset-assert 16)
-   (vel     vector :inline :offset-assert 32)
-   (max-vel float          :offset-assert 48)
-   (damping float          :offset-assert 52)
-   (accel   float          :offset-assert 56)
+  ((value   vector :inline :offset-assert   0)
+   (target  vector :inline :offset-assert  16)
+   (vel     vector :inline :offset-assert  32)
+   (max-vel float          :offset-assert  48)
+   (damping float          :offset-assert  52)
+   (accel   float          :offset-assert  56)
    )
   :method-count-assert 11
   :size-assert         #x3c
diff --git a/test/decompiler/reference/kernel/dgo-h_REF.gc b/test/decompiler/reference/kernel/dgo-h_REF.gc
index 615da25ad3..aacd7ad1fd 100644
--- a/test/decompiler/reference/kernel/dgo-h_REF.gc
+++ b/test/decompiler/reference/kernel/dgo-h_REF.gc
@@ -3,8 +3,8 @@
 
 ;; definition of type dgo-entry
 (deftype dgo-entry (structure)
-  ((offset uint32  :offset-assert 0)
-   (length uint32  :offset-assert 4)
+  ((offset uint32  :offset-assert   0)
+   (length uint32  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -21,10 +21,10 @@
 
 ;; definition of type dgo-file
 (deftype dgo-file (basic)
-  ((num-go-files uint32          :offset-assert 4)
-   (total-length uint32          :offset-assert 8)
-   (rsvd         uint32          :offset-assert 12)
-   (data         uint8  :dynamic :offset-assert 16)
+  ((num-go-files uint32          :offset-assert   4)
+   (total-length uint32          :offset-assert   8)
+   (rsvd         uint32          :offset-assert  12)
+   (data         uint8  :dynamic :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/kernel/gcommon_REF.gc b/test/decompiler/reference/kernel/gcommon_REF.gc
index bf7295fd33..40a5dc3277 100644
--- a/test/decompiler/reference/kernel/gcommon_REF.gc
+++ b/test/decompiler/reference/kernel/gcommon_REF.gc
@@ -137,7 +137,7 @@
 
 ;; definition of type bfloat
 (deftype bfloat (basic)
-  ((data float  :offset-assert 4)
+  ((data float  :offset-assert   4)
    )
   :method-count-assert 9
   :size-assert         #x8
@@ -453,9 +453,9 @@
 
 ;; definition of type inline-array-class
 (deftype inline-array-class (basic)
-  ((length           int32                      :offset-assert 4)
-   (allocated-length int32                      :offset-assert 8)
-   (_data            uint8 :dynamic :offset  16)
+  ((length           int32          :offset-assert   4)
+   (allocated-length int32          :offset-assert   8)
+   (_data            uint8 :dynamic :offset         16)
    )
   :method-count-assert 9
   :size-assert         #x10
diff --git a/test/decompiler/reference/kernel/gkernel-h_REF.gc b/test/decompiler/reference/kernel/gkernel-h_REF.gc
index 81ee995173..6e45539b5a 100644
--- a/test/decompiler/reference/kernel/gkernel-h_REF.gc
+++ b/test/decompiler/reference/kernel/gkernel-h_REF.gc
@@ -3,17 +3,17 @@
 
 ;; definition of type kernel-context
 (deftype kernel-context (basic)
-  ((prevent-from-run   process-mask  :offset-assert 4)
-   (require-for-run    process-mask  :offset-assert 8)
-   (allow-to-run       process-mask  :offset-assert 12)
-   (next-pid           int32         :offset-assert 16)
-   (fast-stack-top     pointer       :offset-assert 20)
-   (current-process    basic         :offset-assert 24)
-   (relocating-process basic         :offset-assert 28)
-   (relocating-min     int32         :offset-assert 32)
-   (relocating-max     int32         :offset-assert 36)
-   (relocating-offset  int32         :offset-assert 40)
-   (low-memory-message basic         :offset-assert 44)
+  ((prevent-from-run   process-mask  :offset-assert   4)
+   (require-for-run    process-mask  :offset-assert   8)
+   (allow-to-run       process-mask  :offset-assert  12)
+   (next-pid           int32         :offset-assert  16)
+   (fast-stack-top     pointer       :offset-assert  20)
+   (current-process    basic         :offset-assert  24)
+   (relocating-process basic         :offset-assert  28)
+   (relocating-min     int32         :offset-assert  32)
+   (relocating-max     int32         :offset-assert  36)
+   (relocating-offset  int32         :offset-assert  40)
+   (low-memory-message basic         :offset-assert  44)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -39,15 +39,15 @@
 
 ;; definition of type thread
 (deftype thread (basic)
-  ((name         basic                       :offset-assert 4)
-   (process      process                     :offset-assert 8)
-   (previous     thread                      :offset-assert 12)
-   (suspend-hook (function cpu-thread none)  :offset-assert 16)
-   (resume-hook  (function cpu-thread none)  :offset-assert 20)
-   (pc           pointer                     :offset-assert 24)
-   (sp           pointer                     :offset-assert 28)
-   (stack-top    pointer                     :offset-assert 32)
-   (stack-size   int32                       :offset-assert 36)
+  ((name         basic                       :offset-assert   4)
+   (process      process                     :offset-assert   8)
+   (previous     thread                      :offset-assert  12)
+   (suspend-hook (function cpu-thread none)  :offset-assert  16)
+   (resume-hook  (function cpu-thread none)  :offset-assert  20)
+   (pc           pointer                     :offset-assert  24)
+   (sp           pointer                     :offset-assert  28)
+   (stack-top    pointer                     :offset-assert  32)
+   (stack-size   int32                       :offset-assert  36)
    )
   :method-count-assert 12
   :size-assert         #x28
@@ -76,8 +76,8 @@
 
 ;; definition of type cpu-thread
 (deftype cpu-thread (thread)
-  ((rreg  uint64 7        :offset-assert 40)
-   (freg  float  8        :offset-assert 96)
+  ((rreg  uint64 7        :offset-assert  40)
+   (freg  float  8        :offset-assert  96)
    (stack uint8  :dynamic :offset-assert 128)
    )
   :method-count-assert 12
@@ -134,9 +134,9 @@
 
 ;; definition of type dead-pool-heap-rec
 (deftype dead-pool-heap-rec (structure)
-  ((process process             :offset-assert 0)
-   (prev    dead-pool-heap-rec  :offset-assert 4)
-   (next    dead-pool-heap-rec  :offset-assert 8)
+  ((process process             :offset-assert   0)
+   (prev    dead-pool-heap-rec  :offset-assert   4)
+   (next    dead-pool-heap-rec  :offset-assert   8)
    )
   :pack-me
   :method-count-assert 9
@@ -155,17 +155,17 @@
 
 ;; definition of type dead-pool-heap
 (deftype dead-pool-heap (dead-pool)
-  ((allocated-length   int32                               :offset-assert 32)
-   (compact-time       uint32                              :offset-assert 36)
-   (compact-count-targ uint32                              :offset-assert 40)
-   (compact-count      uint32                              :offset-assert 44)
-   (fill-percent       float                               :offset-assert 48)
-   (first-gap          dead-pool-heap-rec                  :offset-assert 52)
-   (first-shrink       dead-pool-heap-rec                  :offset-assert 56)
-   (heap               kheap              :inline          :offset-assert 64)
-   (alive-list         dead-pool-heap-rec :inline          :offset-assert 80)
-   (last               dead-pool-heap-rec :offset  84)
-   (dead-list          dead-pool-heap-rec :inline          :offset-assert 92)
+  ((allocated-length   int32                               :offset-assert  32)
+   (compact-time       uint32                              :offset-assert  36)
+   (compact-count-targ uint32                              :offset-assert  40)
+   (compact-count      uint32                              :offset-assert  44)
+   (fill-percent       float                               :offset-assert  48)
+   (first-gap          dead-pool-heap-rec                  :offset-assert  52)
+   (first-shrink       dead-pool-heap-rec                  :offset-assert  56)
+   (heap               kheap              :inline          :offset-assert  64)
+   (alive-list         dead-pool-heap-rec :inline          :offset-assert  80)
+   (last               dead-pool-heap-rec                  :offset         84)
+   (dead-list          dead-pool-heap-rec :inline          :offset-assert  92)
    (process-list       dead-pool-heap-rec :inline :dynamic :offset-assert 104)
    )
   :method-count-assert 27
@@ -219,10 +219,10 @@
 
 ;; definition of type catch-frame
 (deftype catch-frame (stack-frame)
-  ((sp   int32      :offset-assert 12)
-   (ra   int32      :offset-assert 16)
-   (freg float   10 :offset-assert 20)
-   (rreg uint128 7  :offset-assert 64)
+  ((sp   int32      :offset-assert  12)
+   (ra   int32      :offset-assert  16)
+   (freg float   10 :offset-assert  20)
+   (rreg uint128 7  :offset-assert  64)
    )
   :method-count-assert 9
   :size-assert         #xb0
@@ -246,7 +246,7 @@
 
 ;; definition of type protect-frame
 (deftype protect-frame (stack-frame)
-  ((exit (function object)  :offset-assert 12)
+  ((exit (function object)  :offset-assert  12)
    )
   :method-count-assert 9
   :size-assert         #x10
@@ -320,11 +320,11 @@
 
 ;; definition of type state
 (deftype state (protect-frame)
-  ((code  function                                                     :offset-assert 16)
-   (trans (function object)                                            :offset-assert 20)
-   (post  function                                                     :offset-assert 24)
-   (enter (function object object object object object object object)  :offset-assert 28)
-   (event (function basic int basic event-message-block object)        :offset-assert 32)
+  ((code  function                                                     :offset-assert  16)
+   (trans (function object)                                            :offset-assert  20)
+   (post  function                                                     :offset-assert  24)
+   (enter (function object object object object object object object)  :offset-assert  28)
+   (event (function basic int basic event-message-block object)        :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x24
@@ -350,11 +350,11 @@
 
 ;; definition of type event-message-block
 (deftype event-message-block (structure)
-  ((to         basic    :offset-assert 0)
-   (from       basic    :offset-assert 4)
-   (num-params int32    :offset-assert 8)
-   (message    basic    :offset-assert 12)
-   (param      uint64 7 :offset-assert 16)
+  ((to         basic    :offset-assert   0)
+   (from       basic    :offset-assert   4)
+   (num-params int32    :offset-assert   8)
+   (message    basic    :offset-assert  12)
+   (param      uint64 7 :offset-assert  16)
    )
   :method-count-assert 9
   :size-assert         #x48
diff --git a/test/decompiler/reference/kernel/gkernel_REF.gc b/test/decompiler/reference/kernel/gkernel_REF.gc
index fd44695a1f..0589a5b2c4 100644
--- a/test/decompiler/reference/kernel/gkernel_REF.gc
+++ b/test/decompiler/reference/kernel/gkernel_REF.gc
@@ -1020,7 +1020,6 @@
 ;; definition for method 16 of type dead-pool-heap
 ;; INFO: Return type mismatch int vs none.
 (defmethod compact dead-pool-heap ((obj dead-pool-heap) (arg0 int))
-  (local-vars (a2-0 none))
   (let* ((s4-0 (memory-free obj))
          (v1-2 (memory-total obj))
          (f0-2 (/ (the float s4-0) (the float v1-2)))
@@ -1029,7 +1028,7 @@
     ((< f0-2 0.1)
      (set! arg0 1000)
      (if (and *debug-segment* (-> *kernel-context* low-memory-message))
-      (format *stdcon* "~3LLow Actor Memory~%~0L" a2-0)
+      (format *stdcon* "~3LLow Actor Memory~%~0L")
       )
      )
     ((< f0-2 0.2)
diff --git a/test/decompiler/reference/levels/beach/air-h_REF.gc b/test/decompiler/reference/levels/beach/air-h_REF.gc
index 5f7498abdb..9e8df51b15 100644
--- a/test/decompiler/reference/levels/beach/air-h_REF.gc
+++ b/test/decompiler/reference/levels/beach/air-h_REF.gc
@@ -3,14 +3,14 @@
 
 ;; definition of type air-box
 (deftype air-box (structure)
-  ((vecs         vector 2 :inline   :offset-assert 0)
-   (x-pos        float  :offset   0)
-   (height-level float  :offset   4)
-   (z-pos        float  :offset   8)
-   (cos-angle    float  :offset  12)
-   (x-length     float  :offset  16)
-   (z-length     float  :offset  24)
-   (sin-angle    float  :offset  28)
+  ((vecs         vector 2 :inline :offset-assert   0)
+   (x-pos        float            :offset          0)
+   (height-level float            :offset          4)
+   (z-pos        float            :offset          8)
+   (cos-angle    float            :offset         12)
+   (x-length     float            :offset         16)
+   (z-length     float            :offset         24)
+   (sin-angle    float            :offset         28)
    )
   :method-count-assert 9
   :size-assert         #x20
diff --git a/test/decompiler/reference/levels/common/nav-enemy-h_REF.gc b/test/decompiler/reference/levels/common/nav-enemy-h_REF.gc
index 961774512f..72d8576d70 100644
--- a/test/decompiler/reference/levels/common/nav-enemy-h_REF.gc
+++ b/test/decompiler/reference/levels/common/nav-enemy-h_REF.gc
@@ -3,27 +3,27 @@
 
 ;; definition of type nav-enemy-info
 (deftype nav-enemy-info (basic)
-  ((idle-anim                 int32   :offset-assert 4)
-   (walk-anim                 int32   :offset-assert 8)
-   (turn-anim                 int32   :offset-assert 12)
-   (notice-anim               int32   :offset-assert 16)
-   (run-anim                  int32   :offset-assert 20)
-   (jump-anim                 int32   :offset-assert 24)
-   (jump-land-anim            int32   :offset-assert 28)
-   (victory-anim              int32   :offset-assert 32)
-   (taunt-anim                int32   :offset-assert 36)
-   (die-anim                  int32   :offset-assert 40)
-   (neck-joint                int32   :offset-assert 44)
-   (player-look-at-joint      int32   :offset-assert 48)
-   (run-travel-speed          float   :offset-assert 52)
-   (run-rotate-speed          float   :offset-assert 56)
-   (run-acceleration          float   :offset-assert 60)
-   (run-turn-time             uint64  :offset-assert 64)
-   (walk-travel-speed         float   :offset-assert 72)
-   (walk-rotate-speed         float   :offset-assert 76)
-   (walk-acceleration         float   :offset-assert 80)
-   (walk-turn-time            uint64  :offset-assert 88)
-   (attack-shove-back         float   :offset-assert 96)
+  ((idle-anim                 int32   :offset-assert   4)
+   (walk-anim                 int32   :offset-assert   8)
+   (turn-anim                 int32   :offset-assert  12)
+   (notice-anim               int32   :offset-assert  16)
+   (run-anim                  int32   :offset-assert  20)
+   (jump-anim                 int32   :offset-assert  24)
+   (jump-land-anim            int32   :offset-assert  28)
+   (victory-anim              int32   :offset-assert  32)
+   (taunt-anim                int32   :offset-assert  36)
+   (die-anim                  int32   :offset-assert  40)
+   (neck-joint                int32   :offset-assert  44)
+   (player-look-at-joint      int32   :offset-assert  48)
+   (run-travel-speed          float   :offset-assert  52)
+   (run-rotate-speed          float   :offset-assert  56)
+   (run-acceleration          float   :offset-assert  60)
+   (run-turn-time             uint64  :offset-assert  64)
+   (walk-travel-speed         float   :offset-assert  72)
+   (walk-rotate-speed         float   :offset-assert  76)
+   (walk-acceleration         float   :offset-assert  80)
+   (walk-turn-time            uint64  :offset-assert  88)
+   (attack-shove-back         float   :offset-assert  96)
    (attack-shove-up           float   :offset-assert 100)
    (shadow-size               float   :offset-assert 104)
    (notice-nav-radius         float   :offset-assert 108)
diff --git a/test/decompiler/reference/levels/common/rigid-body-h_REF.gc b/test/decompiler/reference/levels/common/rigid-body-h_REF.gc
index 853b45b4fd..c2ae50a59c 100644
--- a/test/decompiler/reference/levels/common/rigid-body-h_REF.gc
+++ b/test/decompiler/reference/levels/common/rigid-body-h_REF.gc
@@ -3,12 +3,12 @@
 
 ;; definition of type rigid-body
 (deftype rigid-body (structure)
-  ((mass                        float              :offset-assert 0)
-   (inv-mass                    float              :offset-assert 4)
-   (lin-momentum-damping-factor float              :offset-assert 8)
-   (ang-momentum-damping-factor float              :offset-assert 12)
-   (inertial-tensor             matrix     :inline :offset-assert 16)
-   (inv-inertial-tensor         matrix     :inline :offset-assert 80)
+  ((mass                        float              :offset-assert   0)
+   (inv-mass                    float              :offset-assert   4)
+   (lin-momentum-damping-factor float              :offset-assert   8)
+   (ang-momentum-damping-factor float              :offset-assert  12)
+   (inertial-tensor             matrix     :inline :offset-assert  16)
+   (inv-inertial-tensor         matrix     :inline :offset-assert  80)
    (cm-offset-joint             vector     :inline :offset-assert 144)
    (position                    vector     :inline :offset-assert 160)
    (rotation                    quaternion :inline :offset-assert 176)
@@ -83,9 +83,9 @@
 
 ;; definition of type rigid-body-control-point
 (deftype rigid-body-control-point (structure)
-  ((local-pos vector :inline :offset-assert 0)
-   (world-pos vector :inline :offset-assert 16)
-   (velocity  vector :inline :offset-assert 32)
+  ((local-pos vector :inline :offset-assert   0)
+   (world-pos vector :inline :offset-assert  16)
+   (velocity  vector :inline :offset-assert  32)
    )
   :method-count-assert 9
   :size-assert         #x30
@@ -104,7 +104,3 @@
 ;; failed to figure out what this is:
 (let ((v0-4 0))
   )
-
-
-
-
diff --git a/test/decompiler/test_gkernel_decomp.cpp b/test/decompiler/test_gkernel_decomp.cpp
index 4a1c8cfc05..0c865e44e5 100644
--- a/test/decompiler/test_gkernel_decomp.cpp
+++ b/test/decompiler/test_gkernel_decomp.cpp
@@ -2578,7 +2578,7 @@ TEST_F(FormRegressionTest, ExprMethod16DeadPoolHeap) {
       "    ((< f0-2 (l.f L346))\n"
       "     (set! arg1 1000)\n"
       "     (if (and *debug-segment* (-> *kernel-context* low-memory-message))\n"
-      "      (format *stdcon* \"~3LLow Actor Memory~%~0L\" a2-0)\n"
+      "      (format *stdcon* \"~3LLow Actor Memory~%~0L\")\n"
       "      )\n"
       "     )\n"
       "    ((< f0-2 (l.f L347))\n"
diff --git a/test/offline/offline_test_main.cpp b/test/offline/offline_test_main.cpp
index 05898d1a0d..1b3d71c514 100644
--- a/test/offline/offline_test_main.cpp
+++ b/test/offline/offline_test_main.cpp
@@ -319,7 +319,8 @@ TEST_F(OfflineDecompilation, CheckBasicDecode) {
 
 /*!
  * Not a super great test, but check that we find functions, methods, and logins.
- * This is a test of ir2_top_level_pass, which isn't tested as part of the normal decompiler tests.
+ * This is a test of ir2_top_level_pass, which isn't tested as part of the normal decompiler
+ tests.
  */
 TEST_F(OfflineDecompilation, FunctionDetect) {
   int function_count = 0;  // global functions
@@ -535,8 +536,8 @@ int line_count(const std::string& str) {
 TEST_F(OfflineDecompilation, Compile) {
   Compiler compiler;
 
-  compiler.run_front_end_on_file(
-      {"test", "decompiler", "reference", "all_forward_declarations.gc"});
+  compiler.run_front_end_on_file({"decompiler", "config", "all-types.gc"});
+  compiler.run_front_end_on_file({"test", "decompiler", "reference", "decompiler-macros.gc"});
 
   Timer timer;
   int total_lines = 0;