From fff99dbd4b37a84db80eb1b0bc046687920205db Mon Sep 17 00:00:00 2001
From: water <awaterford111445@gmail.com>
Date: Sat, 23 Sep 2023 14:27:52 -0400
Subject: [PATCH] ref

---
 scripts/shell/decomp.sh                       |  2 +-
 .../reference/jak2/engine/ai/enemy_REF.gc     |  6 +--
 .../jak2/engine/ambient/ambient_REF.gc        |  2 +-
 .../engine/common_objs/collectables_REF.gc    |  4 +-
 .../jak2/engine/common_objs/conveyor_REF.gc   |  6 +--
 .../jak2/engine/common_objs/elevator_REF.gc   |  3 +-
 .../engine/common_objs/rigid-body-plat_REF.gc |  9 +---
 .../jak2/engine/common_objs/water-anim_REF.gc |  3 +-
 .../jak2/engine/common_objs/water-flow_REF.gc |  2 +-
 .../jak2/engine/debug/editable_REF.gc         | 27 +++---------
 .../engine/debug/nav/nav-graph-editor_REF.gc  |  6 +--
 .../jak2/engine/entity/entity_REF.gc          |  6 +--
 .../jak2/engine/game/task/task-control_REF.gc |  3 +-
 .../engine/spatial-hash/spatial-hash_REF.gc   |  2 +-
 .../jak2/engine/target/logic-target_REF.gc    |  2 +-
 .../reference/jak2/engine/ui/minimap_REF.gc   |  2 +-
 .../jak2/engine/ui/progress/progress_REF.gc   |  2 +-
 .../jak2/levels/atoll/atoll-obs_REF.gc        |  8 +---
 .../reference/jak2/levels/atoll/juicer_REF.gc |  6 +--
 .../levels/castle/boss/castle-baron_REF.gc    |  4 +-
 .../jak2/levels/castle/castle-obs_REF.gc      |  6 +--
 .../jak2/levels/castle/pad/caspad-obs_REF.gc  |  2 +-
 .../jak2/levels/castle/roboguard-level_REF.gc | 24 +++++------
 .../jak2/levels/city/bombbot/bombbot_REF.gc   |  4 +-
 .../jak2/levels/city/ctywide-obs_REF.gc       | 12 +-----
 .../levels/city/traffic/citizen/guard_REF.gc  |  6 +--
 .../traffic/citizen/metalhead-predator_REF.gc |  6 +--
 .../levels/city/traffic/vehicle/bike_REF.gc   | 12 +++---
 .../levels/city/traffic/vehicle/car_REF.gc    | 13 ++----
 .../city/traffic/vehicle/transport_REF.gc     |  8 +---
 .../city/traffic/vehicle/vehicle-rider_REF.gc |  4 +-
 .../city/traffic/vehicle/vehicle-util_REF.gc  |  2 +-
 .../levels/common/ai/ashelin/ash-shot_REF.gc  |  3 +-
 .../jak2/levels/common/battle_REF.gc          |  6 +--
 .../jak2/levels/common/elec-gate_REF.gc       |  2 +-
 .../jak2/levels/common/enemy/centurion_REF.gc | 12 ++----
 .../jak2/levels/common/enemy/flitter_REF.gc   |  2 +-
 .../levels/common/enemy/fodder/fodder_REF.gc  |  3 +-
 .../jak2/levels/common/enemy/grenadier_REF.gc |  6 +--
 .../jak2/levels/common/enemy/grunt_REF.gc     |  2 +-
 .../enemy/guards/crimson-guard-level_REF.gc   |  6 +--
 .../jak2/levels/common/enemy/hopper_REF.gc    |  8 +---
 .../enemy/hover/crimson-guard-hover_REF.gc    | 43 ++++---------------
 .../levels/common/enemy/hover/flamer_REF.gc   |  6 +--
 .../enemy/hover/hover-enemy-battle_REF.gc     |  6 +--
 .../common/enemy/hover/hover-enemy_REF.gc     |  2 +-
 .../common/enemy/hover/hover-formation_REF.gc |  3 +-
 .../levels/common/enemy/hover/wasp_REF.gc     |  2 +-
 .../jak2/levels/common/enemy/metalmonk_REF.gc |  6 +--
 .../jak2/levels/common/enemy/spyder_REF.gc    |  9 +---
 .../common/entities/com-elevator_REF.gc       | 10 ++---
 .../levels/common/entities/spydroid_REF.gc    |  2 +-
 .../levels/common/race/race-manager_REF.gc    |  2 +-
 .../jak2/levels/common/scene-actor_REF.gc     |  5 +--
 .../reference/jak2/levels/dig/dig-obs_REF.gc  |  2 +-
 .../reference/jak2/levels/dig/dig3-obs_REF.gc |  2 +-
 .../jak2/levels/drill/drill-baron_REF.gc      | 11 +----
 .../jak2/levels/drill/drill-obs_REF.gc        | 10 ++---
 .../jak2/levels/drill/drillmid-obs_REF.gc     |  4 +-
 .../reference/jak2/levels/drill/ginsu_REF.gc  |  6 +--
 .../jak2/levels/forest/forest-obs_REF.gc      |  2 +-
 .../jak2/levels/forest/predator_REF.gc        |  6 +--
 .../reference/jak2/levels/forest/wren_REF.gc  |  3 +-
 .../levels/fortress/dump/fordumpc-obs_REF.gc  |  8 +---
 .../fortress/dump/fort-robotank-turret_REF.gc |  2 +-
 .../levels/fortress/dump/fort-robotank_REF.gc |  6 +--
 .../fortress/rescue/forresca-obs_REF.gc       |  2 +-
 .../fortress/rescue/forrescb-obs_REF.gc       |  7 +--
 .../jak2/levels/gungame/gungame-obs_REF.gc    |  2 +-
 .../reference/jak2/levels/hiphog/whack_REF.gc |  8 +---
 .../jak2/levels/intro/intro-obs_REF.gc        |  6 +--
 .../jak2/levels/mountain/mountain-obs_REF.gc  |  6 +--
 .../jak2/levels/mountain/rhino_REF.gc         |  6 +--
 .../jak2/levels/nest/flying-spider_REF.gc     |  7 +--
 .../reference/jak2/levels/nest/mammoth_REF.gc |  6 +--
 .../reference/jak2/levels/nest/mantis_REF.gc  |  2 +-
 .../levels/palace/cable/palcab-obs_REF.gc     |  2 +-
 .../jak2/levels/ruins/rapid-gunner_REF.gc     |  6 +--
 .../jak2/levels/ruins/ruins-obs_REF.gc        |  2 +-
 .../jak2/levels/sewer/hosehead_REF.gc         |  4 +-
 .../jak2/levels/sewer/sew-gunturret_REF.gc    |  2 +-
 .../jak2/levels/sewer/sewer-obs2_REF.gc       |  8 +---
 .../jak2/levels/stadium/racebike_REF.gc       |  6 +--
 .../levels/stadium/skate/skatea-obs_REF.gc    |  2 +-
 .../jak2/levels/stadium/stadium-obs_REF.gc    |  6 +--
 .../jak2/levels/strip/strip-obs_REF.gc        |  6 +--
 .../jak2/levels/tomb/tomb-beetle_REF.gc       |  2 +-
 .../jak2/levels/tomb/tomb-obs_REF.gc          |  4 +-
 .../jak2/levels/tomb/tomb-water_REF.gc        |  2 +-
 .../jak2/levels/tomb/widow-extras_REF.gc      | 16 ++-----
 .../jak2/levels/under/jellyfish_REF.gc        |  4 +-
 .../jak2/levels/under/under-obs_REF.gc        |  4 +-
 .../levels/under/under-shoot-block_REF.gc     |  2 +-
 93 files changed, 160 insertions(+), 382 deletions(-)

diff --git a/scripts/shell/decomp.sh b/scripts/shell/decomp.sh
index 10917385c1..973e4eb1d5 100755
--- a/scripts/shell/decomp.sh
+++ b/scripts/shell/decomp.sh
@@ -3,4 +3,4 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
- "${DIR}"/../../build/decompiler/decompiler "${DIR}"/../../decompiler/config/jak1/jak1_config.jsonc "${DIR}"/../../iso_data "${DIR}"/../../decompiler_out --version ntsc_v1
+"${DIR}"/../../build/decompiler/decompiler "${DIR}"/../../decompiler/config/jak1/jak1_config.jsonc "${DIR}"/../../iso_data "${DIR}"/../../decompiler_out --version ntsc_v1
diff --git a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
index 231c339131..223cc4c9a3 100644
--- a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
@@ -22,15 +22,11 @@
   )
 
 ;; definition for method 7 of type enemy
-;; WARN: Return type mismatch process-focusable vs enemy.
 (defmethod relocate enemy ((obj enemy) (arg0 int))
   (if (nonzero? (-> obj neck))
       (&+! (-> obj neck) arg0)
       )
-  (the-as
-    enemy
-    ((the-as (function process-focusable int process-focusable) (find-parent-method enemy 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 117 of type enemy
diff --git a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
index 0096ab3bed..049bb515a8 100644
--- a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
@@ -272,7 +272,7 @@
 ;; definition for method 10 of type talker
 (defmethod deactivate talker ((obj talker))
   (send-event (handle->process (-> obj voicebox)) 'die)
-  ((the-as (function process none) (find-parent-method talker 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc
index 5b71993b23..5c31b89dd5 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc
@@ -1320,7 +1320,7 @@
     (if (not (logtest? (-> self fact options) (actor-option no-reaction)))
         (send-event (handle->process arg1) 'powerup (-> self fact pickup-type) (-> self fact pickup-amount))
         )
-    (let ((t9-2 (-> (the-as state (find-parent-method eco 26)) code)))
+    (let ((t9-2 (-> (the-as state (find-parent-state)) code)))
       (if t9-2
           ((the-as (function none) t9-2))
           )
@@ -1886,7 +1886,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type gem
 (defmethod deactivate gem ((obj gem))
   (+! (-> *game-info* live-gem-count) -1)
-  ((the-as (function gem none) (find-parent-method gem 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc
index 05f2bbfaa9..960454701c 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc
@@ -103,13 +103,9 @@
   )
 
 ;; definition for method 7 of type conveyor
-;; WARN: Return type mismatch process-drawable vs conveyor.
 (defmethod relocate conveyor ((obj conveyor) (new-addr int))
   (&+! (-> obj sections) new-addr)
-  (the-as
-    conveyor
-    ((the-as (function process-drawable int process-drawable) (find-parent-method conveyor 7)) obj new-addr)
-    )
+  (call-parent-method obj new-addr)
   )
 
 ;; definition for method 22 of type conveyor
diff --git a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc
index 7eea1e3efa..66c5c3964b 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc
@@ -808,12 +808,11 @@ For example for an elevator pre-compute the distance between the first and last
   )
 
 ;; definition for method 7 of type elevator
-;; WARN: Return type mismatch base-plat vs elevator.
 (defmethod relocate elevator ((obj elevator) (arg0 int))
   (if (nonzero? (-> obj path-seq))
       (&+! (-> obj path-seq) arg0)
       )
-  (the-as elevator ((the-as (function base-plat int base-plat) (find-parent-method elevator 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 40 of type elevator
diff --git a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc
index 317e75d7e4..dadaf89199 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc
@@ -161,18 +161,11 @@
   )
 
 ;; definition for method 7 of type rigid-body-platform
-;; WARN: Return type mismatch rigid-body-object vs rigid-body-platform.
 (defmethod relocate rigid-body-platform ((obj rigid-body-platform) (new-addr int))
   (if (nonzero? (-> obj control-point-array))
       (&+! (-> obj control-point-array) new-addr)
       )
-  (the-as
-    rigid-body-platform
-    ((the-as (function rigid-body-object int rigid-body-object) (find-parent-method rigid-body-platform 7))
-     obj
-     new-addr
-     )
-    )
+  (call-parent-method obj new-addr)
   )
 
 ;; definition for method 53 of type rigid-body-platform
diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc
index b2081447c2..d48bcde2e1 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc
@@ -63,7 +63,7 @@
   (if (nonzero? (-> obj flow))
       (&+! (-> obj flow) arg0)
       )
-  ((the-as (function water-anim int water-anim) (find-parent-method water-anim 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; failed to figure out what this is:
@@ -380,7 +380,6 @@
 
 ;; definition for function water-anim-event-handler
 ;; INFO: Used lq/sq
-;; WARN: Return type mismatch none vs object.
 (defbehavior water-anim-event-handler water-anim ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
   (local-vars (v0-1 object))
   (case arg2
diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc
index 690fbfad90..7c62eca2d1 100644
--- a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc
+++ b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc
@@ -111,7 +111,7 @@
   (if (nonzero? (-> obj path))
       (&+! (-> obj path) arg0)
       )
-  ((the-as (function flow-control int flow-control) (find-parent-method flow-control 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 9 of type flow-control
diff --git a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc
index 0c5fbb7b0c..e9d17372ed 100644
--- a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc
+++ b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc
@@ -776,10 +776,7 @@
        )
       )
     )
-  ((the-as (function editable-point editable-command none) (find-parent-method editable-point 28))
-   obj
-   (the-as editable-command arg0)
-   )
+  (call-parent-method obj arg0)
   0
   (none)
   )
@@ -1107,7 +1104,7 @@
 ;; WARN: Return type mismatch int vs none.
 ;; WARN: Function (method 25 editable-light) has a return type of none, but the expression builder found a return statement.
 (defmethod editable-method-25 editable-light ((obj editable-light) (arg0 editable-array))
-  ((the-as (function editable-light editable-array none) (find-parent-method editable-light 25)) obj arg0)
+  (call-parent-method obj arg0)
   (when (nonzero? (-> obj id))
     (let ((s5-1 (clear *temp-string*)))
       (format s5-1 "delete from light where light_id=~D" (-> obj id))
@@ -1272,7 +1269,7 @@
       (set! (-> s3-0 owner) (delete! obj (-> s3-0 owner)))
       )
     )
-  ((the-as (function editable-face editable-array none) (find-parent-method editable-face 25)) obj arg0)
+  (call-parent-method obj arg0)
   (none)
   )
 
@@ -1302,13 +1299,7 @@
 ;; definition for method 27 of type editable-face
 ;; WARN: Return type mismatch editable-face vs editable.
 (defmethod editable-method-27 editable-face ((obj editable-face) (arg0 editable-array))
-  (let ((gp-1
-          (the-as
-            editable-face
-            ((the-as (function editable-face editable-array editable) (find-parent-method editable-face 27)) obj arg0)
-            )
-          )
-        )
+  (let ((gp-1 (the-as editable-face (call-parent-method obj arg0))))
     (dotimes (s4-0 (-> gp-1 length))
       (set! (-> gp-1 vertex s4-0) (the-as editable-point (editable-method-27 (-> gp-1 vertex s4-0) arg0)))
       (set! (-> gp-1 vertex s4-0 owner) (cons gp-1 (-> gp-1 vertex s4-0 owner)))
@@ -1732,7 +1723,7 @@
       (set! (-> s3-0 owner) (delete! obj (-> s3-0 owner)))
       )
     )
-  ((the-as (function editable-plane editable-array none) (find-parent-method editable-plane 25)) obj arg0)
+  (call-parent-method obj arg0)
   (none)
   )
 
@@ -1746,13 +1737,7 @@
 ;; definition for method 27 of type editable-plane
 ;; WARN: Return type mismatch editable-plane vs editable.
 (defmethod editable-method-27 editable-plane ((obj editable-plane) (arg0 editable-array))
-  (let ((gp-1
-          (the-as
-            editable-plane
-            ((the-as (function editable-plane editable-array editable) (find-parent-method editable-plane 27)) obj arg0)
-            )
-          )
-        )
+  (let ((gp-1 (the-as editable-plane (call-parent-method obj arg0))))
     (dotimes (s4-0 (-> gp-1 length))
       (set! (-> gp-1 vertex s4-0) (the-as editable-point (editable-method-27 (-> gp-1 vertex s4-0) arg0)))
       (set! (-> gp-1 vertex s4-0 owner) (cons gp-1 (-> gp-1 vertex s4-0 owner)))
diff --git a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc
index 1d5c1467e0..113a9b19b8 100644
--- a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc
+++ b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc
@@ -225,12 +225,8 @@
   )
 
 ;; definition for method 7 of type nav-graph-editor
-;; WARN: Return type mismatch none vs nav-graph-editor.
 (defmethod relocate nav-graph-editor ((obj nav-graph-editor) (arg0 int))
-  (the-as
-    nav-graph-editor
-    ((the-as (function process int none) (find-parent-method nav-graph-editor 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 60 of type nav-graph-editor
diff --git a/test/decompiler/reference/jak2/engine/entity/entity_REF.gc b/test/decompiler/reference/jak2/engine/entity/entity_REF.gc
index 045bbb1f1d..7fbe32dd6a 100644
--- a/test/decompiler/reference/jak2/engine/entity/entity_REF.gc
+++ b/test/decompiler/reference/jak2/engine/entity/entity_REF.gc
@@ -71,7 +71,6 @@
   )
 
 ;; definition for method 3 of type actor-group
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect actor-group ((obj actor-group))
   (format #t "[~8x] ~A~%" obj (-> obj type))
   (format #t "~Tlength: ~D~%" (-> obj length))
@@ -531,7 +530,6 @@
   )
 
 ;; definition for method 2 of type process
-;; INFO: this function exists in multiple non-identical object files
 (defmethod print process ((obj process))
   (cond
     ((and (-> obj top-thread) (!= (-> obj status) 'dead))
@@ -569,7 +567,7 @@
 
 ;; definition for method 3 of type entity
 (defmethod inspect entity ((obj entity))
-  ((the-as (function entity entity) (find-parent-method entity 3)) obj)
+  (call-parent-method obj)
   (format #t "~Ttrans: ~`vector`P~%" (-> obj trans))
   (format #t "~Taid:   ~D~%" (-> obj aid))
   obj
@@ -587,7 +585,7 @@
 
 ;; definition for method 3 of type entity-actor
 (defmethod inspect entity-actor ((obj entity-actor))
-  ((the-as (function entity entity) (find-parent-method entity-actor 3)) obj)
+  (call-parent-method obj)
   (format #t "~Tetype:    ~A~%" (-> obj etype))
   (format #t "~Ttask:     ~d~%" (-> obj task))
   (format #t "~Tkill-mask: #x~X : (" (-> obj kill-mask))
diff --git a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
index 881ae613e1..bb2ba4664c 100644
--- a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
+++ b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
@@ -1647,7 +1647,6 @@
   )
 
 ;; definition for method 10 of type fail-mission
-;; WARN: Return type mismatch process vs none.
 (defmethod deactivate fail-mission ((obj fail-mission))
   (set-filter-color! 1.0 1.0 1.0)
   (sound-group-continue (sound-group sfx music dialog sog3 ambient dialog2 sog6 sog7))
@@ -1655,7 +1654,7 @@
   (update-rates! (-> *display* entity-clock) 1.0)
   (update-rates! (-> *display* target-clock) 1.0)
   (update-rates! (-> *display* camera-clock) 1.0)
-  ((the-as (function process process) (find-parent-method fail-mission 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc b/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc
index a1d83cb2ed..4f472b588b 100644
--- a/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc
+++ b/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc
@@ -813,7 +813,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defmethod dump-grid-info sphere-hash ((obj sphere-hash))
   "Prints out info about the grid-hash, also draws via [[grid-hash::draw-grid]] if `debug-draw` is `#t`"
-  ((find-parent-method sphere-hash 15) obj)
+  (call-parent-method obj)
   (new 'stack-no-clear 'vector)
   (let ((f30-0 6144.0))
     (set! (-> obj work temp-box-min quad) (-> (target-pos 0) quad))
diff --git a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
index 0594f530c0..07149db6dc 100644
--- a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
+++ b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
@@ -3357,7 +3357,7 @@
       )
   (set! (-> *setting-control* cam-default mode-name) #f)
   (set-zero! *camera-smush-control*)
-  ((the-as (function target none) (find-parent-method target 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc
index 36dc4f6d15..f43060b215 100644
--- a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc
@@ -1164,7 +1164,7 @@
 
 ;; definition for method 3 of type engine-minimap
 (defmethod inspect engine-minimap ((obj engine-minimap))
-  ((the-as (function engine-minimap engine-minimap) (find-parent-method engine-minimap 3)) obj)
+  (call-parent-method obj)
   (let ((s5-0 0)
         (s4-0 (the-as connection-pers (-> *minimap* engine alive-list)))
         )
diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
index b93a504975..4b81e276ae 100644
--- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
@@ -550,7 +550,7 @@
   (enable-level-text-file-loading)
   (persist-with-delay *setting-control* 'allow-progress (seconds 0.1) 'allow-progress #f 0.0 0)
   (persist-with-delay *setting-control* 'allow-pause (seconds 0.1) 'allow-pause #f 0.0 0)
-  ((the-as (function progress none) (find-parent-method progress 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc
index 7c1c76e623..674ad9afd4 100644
--- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc
@@ -918,22 +918,18 @@ This commonly includes things such as:
 ;; definition for method 10 of type slider
 (defmethod deactivate slider ((obj slider))
   (sound-stop (the-as sound-id (-> obj sound-id)))
-  ((the-as (function process-drawable none) (find-parent-method slider 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type slider
-;; WARN: Return type mismatch process-drawable vs slider.
 (defmethod relocate slider ((obj slider) (arg0 int))
   (dotimes (v1-0 4)
     (if (nonzero? (-> obj l-bolts v1-0))
         (&+! (-> obj l-bolts v1-0) arg0)
         )
     )
-  (the-as
-    slider
-    ((the-as (function process-drawable int process-drawable) (find-parent-method slider 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type slider
diff --git a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc
index 564729cd10..1c14f4e609 100644
--- a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc
+++ b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc
@@ -1873,7 +1873,6 @@
   )
 
 ;; definition for method 7 of type juicer
-;; WARN: Return type mismatch process-focusable vs juicer.
 (defmethod relocate juicer ((obj juicer) (arg0 int))
   (if (nonzero? (-> obj intro-path))
       (&+! (-> obj intro-path) arg0)
@@ -1881,10 +1880,7 @@
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
       )
-  (the-as
-    juicer
-    ((the-as (function process-focusable int process-focusable) (find-parent-method juicer 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type juicer
diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc
index 36f57ce050..13e7100f73 100644
--- a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc
+++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc
@@ -138,7 +138,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type cboss-elevator
 (defmethod deactivate cboss-elevator ((obj cboss-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method cboss-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -1491,7 +1491,7 @@ For example for an elevator pre-compute the distance between the first and last
 ;; WARN: Return type mismatch int vs none.
 (defmethod init-proj-settings! krew-boss-shot ((obj krew-boss-shot))
   "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc"
-  ((the-as (function projectile none) (find-parent-method krew-boss-shot 31)) obj)
+  (call-parent-method obj)
   (set! (-> obj move) krew-boss-shot-move)
   (set! (-> obj max-speed) 245760.0)
   (set! (-> obj timeout) (seconds 5))
diff --git a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc
index a24969fdac..e5cad3cf8a 100644
--- a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc
@@ -101,7 +101,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type cas-conveyor
 (defmethod deactivate cas-conveyor ((obj cas-conveyor))
   (sound-stop (-> obj sound-id))
-  ((the-as (function conveyor none) (find-parent-method cas-conveyor 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -1056,7 +1056,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type cas-elevator
 (defmethod deactivate cas-elevator ((obj cas-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function elevator none) (find-parent-method cas-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -2225,7 +2225,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type cas-rot-blade
 (defmethod deactivate cas-rot-blade ((obj cas-rot-blade))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method cas-rot-blade 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc
index 1ead0f62fa..3a40cbd2bc 100644
--- a/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc
@@ -170,7 +170,7 @@
 ;; definition for method 10 of type cpad-elevator
 (defmethod deactivate cpad-elevator ((obj cpad-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function elevator none) (find-parent-method cpad-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc
index fdbdfc90ab..403eef73ca 100644
--- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc
+++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc
@@ -362,9 +362,9 @@
 (defstate ambush (roboguard-level)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 44)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
-          ((the-as (function none) t9-1))
+          (t9-1)
           )
       )
     (logand! (-> self flags) -9)
@@ -431,9 +431,9 @@
 (defstate idle (roboguard-level)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 31)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
-          ((the-as (function none) t9-1))
+          (t9-1)
           )
       )
     (roboguard-level-method-185 self (the-as symbol 0))
@@ -520,9 +520,9 @@
 (defstate stare (roboguard-level)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 35)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
-          ((the-as (function none) t9-1))
+          (t9-1)
           )
       )
     (roboguard-level-method-185 self (the-as symbol 0))
@@ -789,9 +789,9 @@
 (defstate die (roboguard-level)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 38)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
-          ((the-as (function none) t9-1))
+          (t9-1)
           )
       )
     (roboguard-level-method-185 self (the-as symbol 0))
@@ -1239,17 +1239,13 @@
 ;; definition for method 10 of type roboguard-level
 (defmethod deactivate roboguard-level ((obj roboguard-level))
   (sound-stop (-> obj roll-sound))
-  ((the-as (function nav-enemy none) (find-parent-method roboguard-level 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type roboguard-level
-;; WARN: Return type mismatch nav-enemy vs roboguard-level.
 (defmethod relocate roboguard-level ((obj roboguard-level) (arg0 int))
-  (the-as
-    roboguard-level
-    ((the-as (function nav-enemy int nav-enemy) (find-parent-method roboguard-level 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 114 of type roboguard-level
diff --git a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc
index 669e610aa7..57a8bb84b4 100644
--- a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc
@@ -788,7 +788,6 @@
   )
 
 ;; definition for method 3 of type ik-setup
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect ik-setup ((obj ik-setup))
   (when (not obj)
     (set! obj obj)
@@ -2306,7 +2305,6 @@
   )
 
 ;; definition for method 7 of type bombbot
-;; WARN: Return type mismatch nav-enemy vs bombbot.
 (defmethod relocate bombbot ((obj bombbot) (arg0 int))
   (dotimes (v1-0 4)
     (if (nonzero? (-> obj joint-ik v1-0))
@@ -2316,7 +2314,7 @@
   (if (nonzero? (-> obj rigidbody))
       (&+! (-> obj rigidbody) arg0)
       )
-  (the-as bombbot ((the-as (function nav-enemy int nav-enemy) (find-parent-method bombbot 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 114 of type bombbot
diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
index a439184911..7806dce5af 100644
--- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
@@ -2056,7 +2056,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 7 of type cty-guard-turret
-;; WARN: Return type mismatch process-focusable vs cty-guard-turret.
 (defmethod relocate cty-guard-turret ((obj cty-guard-turret) (arg0 int))
   (if (nonzero? (-> obj jm-turret))
       (&+! (-> obj jm-turret) arg0)
@@ -2067,10 +2066,7 @@ This commonly includes things such as:
   (if (nonzero? (-> obj jm-gunsR))
       (&+! (-> obj jm-gunsR) arg0)
       )
-  (the-as
-    cty-guard-turret
-    ((the-as (function process-focusable int process-focusable) (find-parent-method cty-guard-turret 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type cty-guard-turret
@@ -4097,7 +4093,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 7 of type barons-ship-lores
-;; WARN: Return type mismatch process-drawable vs barons-ship-lores.
 (defmethod relocate barons-ship-lores ((obj barons-ship-lores) (arg0 int))
   (if (nonzero? (-> obj paths 0))
       (&+! (-> obj paths 0) arg0)
@@ -4108,10 +4103,7 @@ This commonly includes things such as:
   (if (nonzero? (-> obj paths 2))
       (&+! (-> obj paths 2) arg0)
       )
-  (the-as
-    barons-ship-lores
-    ((the-as (function process-drawable int process-drawable) (find-parent-method barons-ship-lores 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; failed to figure out what this is:
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc
index 0353f772a2..561d6957d7 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc
@@ -3866,7 +3866,6 @@
   )
 
 ;; definition for method 7 of type crimson-guard
-;; WARN: Return type mismatch process-drawable vs crimson-guard.
 (defmethod relocate crimson-guard ((obj crimson-guard) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
@@ -3874,10 +3873,7 @@
   (if (nonzero? (-> obj l-control))
       (&+! (-> obj l-control) arg0)
       )
-  (the-as
-    crimson-guard
-    ((the-as (function process-drawable int process-drawable) (find-parent-method crimson-guard 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type crimson-guard
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc
index 7ad59b7884..ade1cbd660 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc
@@ -1159,12 +1159,8 @@
   )
 
 ;; definition for method 7 of type metalhead-predator
-;; WARN: Return type mismatch process-drawable vs metalhead-predator.
 (defmethod relocate metalhead-predator ((obj metalhead-predator) (arg0 int))
-  (the-as
-    metalhead-predator
-    ((the-as (function process-drawable int process-drawable) (find-parent-method metalhead-predator 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type metalhead-predator
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc
index 8dd908e500..66c415cc41 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc
@@ -942,7 +942,7 @@
 ;; definition for method 36 of type bike-base
 ;; WARN: Return type mismatch int vs none.
 (defmethod do-engine-sounds bike-base ((obj bike-base))
-  ((the-as (function object none) (find-parent-method bike-base 36)) obj)
+  (call-parent-method obj)
   (when (logtest? (-> obj flags) (rigid-body-object-flag player-driving))
     (if (zero? (-> obj roll-sound-id))
         (set! (-> obj roll-sound-id) (new-sound-id))
@@ -977,7 +977,7 @@
 ;; INFO: Used lq/sq
 ;; WARN: Return type mismatch int vs none.
 (defmethod draw-thrusters bike-base ((obj bike-base))
-  ((the-as (function object none) (find-parent-method bike-base 85)) obj)
+  (call-parent-method obj)
   (when (logtest? (-> obj rbody state flags) (rigid-body-flag enable-physics))
     (let ((s5-0 (new 'stack-no-clear 'inline-array 'matrix 3)))
       (let* ((v1-4 (the-as object (-> s5-0 0 vector 2)))
@@ -1093,7 +1093,7 @@
   (if (nonzero? (-> obj brake-r))
       (&+! (-> obj brake-r) arg0)
       )
-  ((the-as (function object int bikea) (find-parent-method bikea 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type bikea
@@ -1255,7 +1255,7 @@
   (if (nonzero? (-> obj flap-r))
       (&+! (-> obj flap-r) arg0)
       )
-  ((the-as (function object int bikeb) (find-parent-method bikeb 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type bikeb
@@ -1434,7 +1434,7 @@
   (if (nonzero? (-> obj spoiler-r))
       (&+! (-> obj spoiler-r) arg0)
       )
-  ((the-as (function object int bikec) (find-parent-method bikec 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type bikec
@@ -1591,7 +1591,7 @@
   (if (nonzero? (-> obj turret-jm))
       (&+! (-> obj turret-jm) arg0)
       )
-  ((the-as (function object int guard-bike) (find-parent-method guard-bike 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 65 of type guard-bike
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc
index 69fd6ed4ff..c48110eac3 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc
@@ -1216,7 +1216,7 @@
   (if (nonzero? (-> obj rudder-r))
       (&+! (-> obj rudder-r) arg0)
       )
-  ((the-as (function object object cara) (find-parent-method cara 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type cara
@@ -1382,7 +1382,7 @@
   (if (nonzero? (-> obj fin-rr))
       (&+! (-> obj fin-rr) arg0)
       )
-  ((the-as (function object object carb) (find-parent-method carb 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type carb
@@ -1526,7 +1526,6 @@
   )
 
 ;; definition for method 7 of type carc
-;; WARN: Return type mismatch carb vs carc.
 (defmethod relocate carc ((obj carc) (arg0 int))
   (if (nonzero? (-> obj steering-wheel))
       (&+! (-> obj steering-wheel) arg0)
@@ -1549,7 +1548,7 @@
   (if (nonzero? (-> obj fin2-rr))
       (&+! (-> obj fin2-rr) arg0)
       )
-  (the-as carc ((the-as (function object object carb) (find-parent-method carc 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type carc
@@ -1704,7 +1703,7 @@
   (if (nonzero? (-> obj turret-jm))
       (&+! (-> obj turret-jm) arg0)
       )
-  ((the-as (function object object hellcat) (find-parent-method hellcat 7)) obj arg0)
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 32 of type hellcat
@@ -1793,7 +1792,3 @@
   0
   (none)
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc
index f8fe8ef29d..7547ae124d 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc
@@ -133,15 +133,11 @@
   )
 
 ;; definition for method 7 of type vehicle-turret
-;; WARN: Return type mismatch process-drawable vs vehicle-turret.
 (defmethod relocate vehicle-turret ((obj vehicle-turret) (arg0 int))
   (if (nonzero? (-> obj turret-jm))
       (&+! (-> obj turret-jm) arg0)
       )
-  (the-as
-    vehicle-turret
-    ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-turret 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 30 of type vehicle-turret
@@ -339,7 +335,7 @@
 ;; definition for method 10 of type transport
 (defmethod deactivate transport ((obj transport))
   (sound-stop (-> obj ambient-sound-id))
-  ((the-as (function process-drawable none) (find-parent-method transport 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc
index f072156b2a..e552233f5b 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc
@@ -344,7 +344,7 @@ This commonly includes things such as:
 ;; definition for method 33 of type citizen-norm-rider
 ;; WARN: Return type mismatch int vs none.
 (defmethod vehicle-rider-method-33 citizen-norm-rider ((obj citizen-norm-rider))
-  ((the-as (function vehicle-rider none) (find-parent-method citizen-norm-rider 33)) obj)
+  (call-parent-method obj)
   (setup-masks (-> obj draw) 0 -1)
   (setup-masks (-> obj draw) 32 0)
   (cond
@@ -461,7 +461,7 @@ This commonly includes things such as:
 ;; definition for method 33 of type crimson-guard-rider
 ;; WARN: Return type mismatch int vs none.
 (defmethod vehicle-rider-method-33 crimson-guard-rider ((obj crimson-guard-rider))
-  ((the-as (function vehicle-rider none) (find-parent-method crimson-guard-rider 33)) obj)
+  (call-parent-method obj)
   (setup-masks (-> obj draw) 0 28)
   (setup-masks (-> obj draw) 3 0)
   (if (logtest? (-> obj flags) 4)
diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc
index 981866b306..9105726322 100644
--- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc
@@ -198,7 +198,7 @@
 ;; definition for method 10 of type vehicle
 (defmethod deactivate vehicle ((obj vehicle))
   (vehicle-method-110 obj)
-  ((the-as (function rigid-body-object none) (find-parent-method vehicle 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc
index af14bf1337..668b300c54 100644
--- a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc
@@ -390,6 +390,7 @@
   )
 
 ;; definition for method 28 of type ashelin-shot
+;; WARN: Return type mismatch object vs none.
 (defmethod play-impact-sound ashelin-shot ((obj ashelin-shot) (arg0 projectile-options))
   (let ((v1-0 arg0))
     (cond
@@ -400,7 +401,7 @@
        (sound-play "ashelin-shot-hi")
        )
       ((= v1-0 (projectile-options lose-altitude proj-options-2))
-       ((the-as (function projectile projectile-options none) (find-parent-method ashelin-shot 28)) obj arg0)
+       (call-parent-method obj arg0)
        )
       )
     )
diff --git a/test/decompiler/reference/jak2/levels/common/battle_REF.gc b/test/decompiler/reference/jak2/levels/common/battle_REF.gc
index 26e3722ea3..86d8f2c9ed 100644
--- a/test/decompiler/reference/jak2/levels/common/battle_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/battle_REF.gc
@@ -1745,14 +1745,10 @@
   )
 
 ;; definition for method 7 of type battle
-;; WARN: Return type mismatch process-drawable vs battle.
 (defmethod relocate battle ((obj battle) (arg0 int))
   (&+! (-> obj spawners) arg0)
   (&+! (-> obj allies) arg0)
-  (the-as
-    battle
-    ((the-as (function process-drawable int process-drawable) (find-parent-method battle 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 29 of type battle
diff --git a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc
index f5ba875ca3..cdf3c0fc53 100644
--- a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc
@@ -836,7 +836,7 @@
 ;; definition for method 10 of type elec-gate
 (defmethod deactivate elec-gate ((obj elec-gate))
   (set-elec-scale-if-close! obj 0.0)
-  ((the-as (function process-drawable none) (find-parent-method elec-gate 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc
index 4c896741aa..0ff661e43f 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc
@@ -186,7 +186,7 @@
        (sound-play "cent-shot-hit")
        )
       ((= v1-0 (projectile-options lose-altitude proj-options-2))
-       ((the-as (function projectile projectile-options sound-id) (find-parent-method centurion-shot 28)) obj arg0)
+       (call-parent-method obj arg0)
        )
       )
     )
@@ -198,7 +198,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defmethod init-proj-settings! centurion-shot ((obj centurion-shot))
   "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc"
-  ((the-as (function projectile none) (find-parent-method centurion-shot 31)) obj)
+  (call-parent-method obj)
   (set! (-> obj max-speed) 327680.0)
   (set! (-> obj timeout) (seconds 1.25))
   (none)
@@ -983,7 +983,7 @@
 (defmethod dispose! centurion ((obj centurion))
   "Cleans-up the enemy and any associated resources. Potentially spawns skull gems"
   (play-communicator-speech! (-> *talker-speech* 58))
-  ((the-as (function enemy none) (find-parent-method centurion 132)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -1596,15 +1596,11 @@
   )
 
 ;; definition for method 7 of type centurion
-;; WARN: Return type mismatch process-focusable vs centurion.
 (defmethod relocate centurion ((obj centurion) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
       )
-  (the-as
-    centurion
-    ((the-as (function process-focusable int process-focusable) (find-parent-method centurion 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type centurion
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc
index ad186e0249..bef96a0a01 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc
@@ -1307,7 +1307,7 @@
     (logior! (-> obj minimap flags) (minimap-flag fade-out))
     (set! (-> obj minimap) #f)
     )
-  ((the-as (function nav-enemy none) (find-parent-method flitter 132)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc
index 980a19812a..52c20c746c 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc
@@ -1101,7 +1101,6 @@
   )
 
 ;; definition for method 7 of type fodder
-;; WARN: Return type mismatch nav-enemy vs fodder.
 (defmethod relocate fodder ((obj fodder) (arg0 int))
   (if (nonzero? (-> obj left-eye))
       (&+! (-> obj left-eye) arg0)
@@ -1109,7 +1108,7 @@
   (if (nonzero? (-> obj right-eye))
       (&+! (-> obj right-eye) arg0)
       )
-  (the-as fodder ((the-as (function nav-enemy int nav-enemy) (find-parent-method fodder 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for function fodder-setup-eye-control
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc
index ee952963d2..57eb8e1f0e 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc
@@ -1293,7 +1293,6 @@
   )
 
 ;; definition for method 7 of type grenadier
-;; WARN: Return type mismatch process-focusable vs grenadier.
 (defmethod relocate grenadier ((obj grenadier) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
@@ -1303,10 +1302,7 @@
         (&+! (-> obj hostile-path) arg0)
         )
     )
-  (the-as
-    grenadier
-    ((the-as (function process-focusable int process-focusable) (find-parent-method grenadier 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type grenadier
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc
index 96b80f0042..70574675e6 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc
@@ -1489,7 +1489,7 @@
     (logior! (-> obj minimap flags) (minimap-flag fade-out))
     (set! (-> obj minimap) #f)
     )
-  ((the-as (function nav-enemy none) (find-parent-method grunt 132)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc
index 4ca2072e1f..3f6e1de8fb 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc
@@ -4309,7 +4309,6 @@
   )
 
 ;; definition for method 7 of type crimson-guard-level
-;; WARN: Return type mismatch nav-enemy vs crimson-guard-level.
 (defmethod relocate crimson-guard-level ((obj crimson-guard-level) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
@@ -4317,10 +4316,7 @@
   (if (nonzero? (-> obj l-control))
       (&+! (-> obj l-control) arg0)
       )
-  (the-as
-    crimson-guard-level
-    ((the-as (function nav-enemy int nav-enemy) (find-parent-method crimson-guard-level 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 203 of type crimson-guard-level
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc
index dc63017099..fb6a3e49d7 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc
@@ -860,20 +860,16 @@
     (logior! (-> obj minimap flags) (minimap-flag fade-out))
     (set! (-> obj minimap) #f)
     )
-  ((the-as (function enemy none) (find-parent-method hopper 132)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type hopper
-;; WARN: Return type mismatch process-focusable vs hopper.
 (defmethod relocate hopper ((obj hopper) (arg0 int))
   (if (nonzero? (-> obj path-intro))
       (&+! (-> obj path-intro) arg0)
       )
-  (the-as
-    hopper
-    ((the-as (function process-focusable int process-focusable) (find-parent-method hopper 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 114 of type hopper
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc
index 902e9de24d..2ea474b5ac 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc
@@ -667,7 +667,7 @@
 (defmethod enemy-method-135 crimson-guard-hover ((obj crimson-guard-hover) (arg0 int))
   (if (and (zero? arg0) (logtest? #x4000000 (-> obj incoming penetrate-using)))
       (sound-play "hover-take-hit")
-      ((the-as (function enemy int sound-id) (find-parent-method crimson-guard-hover 135)) obj arg0)
+      (call-parent-method obj arg0)
       )
   (the-as sound-id 0)
   )
@@ -995,7 +995,7 @@
 (defstate knocked (crimson-guard-hover)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 30)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
           (t9-1)
           )
@@ -1072,7 +1072,7 @@
 (defstate flying-death (crimson-guard-hover)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 138)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
           (t9-1)
           )
@@ -1134,7 +1134,7 @@
 (defstate flying-death-explode (crimson-guard-hover)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 139)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
           (t9-1)
           )
@@ -1231,16 +1231,7 @@
              )
          )
        )
-     ((the-as
-        (function enemy process int symbol event-message-block object)
-        (find-parent-method crimson-guard-hover 74)
-        )
-      obj
-      arg0
-      arg1
-      arg2
-      arg3
-      )
+     (call-parent-method obj arg0 arg1 arg2 arg3)
      )
     (('notify)
      (let ((a0-27 (the-as object (-> arg3 param 0)))
@@ -1260,28 +1251,10 @@
            )
          )
        )
-     ((the-as
-        (function enemy process int symbol event-message-block object)
-        (find-parent-method crimson-guard-hover 74)
-        )
-      obj
-      arg0
-      arg1
-      arg2
-      arg3
-      )
+     (call-parent-method obj arg0 arg1 arg2 arg3)
      )
     (else
-      ((the-as
-         (function enemy process int symbol event-message-block object)
-         (find-parent-method crimson-guard-hover 74)
-         )
-       obj
-       arg0
-       arg1
-       arg2
-       arg3
-       )
+      (call-parent-method obj arg0 arg1 arg2 arg3)
       )
     )
   )
@@ -1379,7 +1352,7 @@
          )
        )
       (else
-        ((the-as (function hover-enemy vector none) (find-parent-method crimson-guard-hover 52)) obj arg0)
+        (call-parent-method obj arg0)
         )
       )
     )
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc
index 396af96014..4a247c7e21 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc
@@ -1496,15 +1496,11 @@
   )
 
 ;; definition for method 7 of type flamer
-;; WARN: Return type mismatch process-drawable vs flamer.
 (defmethod relocate flamer ((obj flamer) (arg0 int))
   (if (nonzero? (-> obj flit-joint))
       (&+! (-> obj flit-joint) arg0)
       )
-  (the-as
-    flamer
-    ((the-as (function process-drawable int process-drawable) (find-parent-method flamer 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type flamer
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc
index e66be0f393..f2955136b3 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc
@@ -287,7 +287,6 @@
   )
 
 ;; definition for method 7 of type hover-enemy-manager
-;; WARN: Return type mismatch process vs hover-enemy-manager.
 (defmethod relocate hover-enemy-manager ((obj hover-enemy-manager) (arg0 int))
   (when (-> obj formation)
     (if (nonzero? (-> obj formation))
@@ -297,10 +296,7 @@
   (if (nonzero? (-> obj path))
       (&+! (-> obj path) arg0)
       )
-  (the-as
-    hover-enemy-manager
-    ((the-as (function process int process) (find-parent-method hover-enemy-manager 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 17 of type hover-enemy-manager
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc
index 3a783dd857..95ba7ba3a6 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc
@@ -629,7 +629,7 @@
     (set! (-> self knocked-start-level) (-> self root trans y))
     )
   :exit (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method hover-enemy 30)) exit)))
+    (let ((t9-1 (-> (the-as state (find-parent-state)) exit)))
       (if t9-1
           (t9-1)
           )
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc
index b0b0acb78b..c53d772c0f 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc
@@ -681,7 +681,6 @@
   )
 
 ;; definition for method 7 of type hover-formation
-;; WARN: Return type mismatch basic vs hover-formation.
 (defmethod relocate hover-formation ((obj hover-formation) (arg0 int))
   (if (nonzero? (-> obj formation))
       (&+! (-> obj formation) arg0)
@@ -689,7 +688,7 @@
   (if (nonzero? (-> obj path))
       (&+! (-> obj path) arg0)
       )
-  (the-as hover-formation ((the-as (function basic int basic) (find-parent-method hover-formation 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 15 of type hover-formation
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc
index 03c24ccd36..9cc5e4075d 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc
@@ -537,7 +537,7 @@
          )
        )
       (else
-        ((the-as (function enemy vector none) (find-parent-method wasp 52)) obj arg0)
+        (call-parent-method obj arg0)
         )
       )
     )
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc
index 33ba7d557b..f776742775 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc
@@ -1231,15 +1231,11 @@
   )
 
 ;; definition for method 7 of type metalmonk
-;; WARN: Return type mismatch process-focusable vs metalmonk.
 (defmethod relocate metalmonk ((obj metalmonk) (arg0 int))
   (if (nonzero? (-> obj intro-path))
       (&+! (-> obj intro-path) arg0)
       )
-  (the-as
-    metalmonk
-    ((the-as (function process-focusable int process-focusable) (find-parent-method metalmonk 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type metalmonk
diff --git a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc
index 13f3cabad4..4052e05dc3 100644
--- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc
@@ -44,7 +44,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defmethod init-proj-settings! spyder-shot ((obj spyder-shot))
   "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc"
-  ((the-as (function projectile none) (find-parent-method spyder-shot 31)) obj)
+  (call-parent-method obj)
   (set! (-> obj max-speed) 307200.0)
   (set! (-> obj timeout) (seconds 0.267))
   (none)
@@ -752,7 +752,6 @@
   )
 
 ;; definition for method 3 of type ik-setup
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect ik-setup ((obj ik-setup))
   (when (not obj)
     (set! obj obj)
@@ -1393,7 +1392,6 @@
   )
 
 ;; definition for method 7 of type spyder
-;; WARN: Return type mismatch process-focusable vs spyder.
 (defmethod relocate spyder ((obj spyder) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
@@ -1403,10 +1401,7 @@
         (&+! (-> obj joint-ik v1-4) arg0)
         )
     )
-  (the-as
-    spyder
-    ((the-as (function process-focusable int process-focusable) (find-parent-method spyder 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type spyder
diff --git a/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc
index 3a905aee71..35f5fca518 100644
--- a/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc
@@ -114,9 +114,9 @@
 (defstate dormant (com-elevator)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method com-elevator 34)) enter)))
+    (let ((t9-1 (-> (find-parent-state) enter)))
       (if t9-1
-          ((the-as (function none) t9-1))
+          (t9-1)
           )
       )
     (process-entity-status! self (entity-perm-status subtask-complete) #t)
@@ -199,7 +199,7 @@
 ;; definition for method 10 of type com-elevator
 (defmethod deactivate com-elevator ((obj com-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function elevator none) (find-parent-method com-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -350,7 +350,7 @@ For example for an elevator pre-compute the distance between the first and last
 ;; definition for method 10 of type tomb-trans-elevator
 (defmethod deactivate tomb-trans-elevator ((obj tomb-trans-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -359,7 +359,7 @@ For example for an elevator pre-compute the distance between the first and last
 (defmethod init-plat! tomb-trans-elevator ((obj tomb-trans-elevator))
   "Does any necessary initial platform setup.
 For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound."
-  ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 33)) obj)
+  (call-parent-method obj)
   (set! (-> obj sound-id) (new-sound-id))
   (none)
   )
diff --git a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc
index ba0951df33..bab19d519e 100644
--- a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc
@@ -1366,7 +1366,7 @@
   (if (nonzero? (-> obj explode-part))
       (kill-and-free-particles (-> obj explode-part))
       )
-  ((the-as (function process-focusable none) (find-parent-method spydroid 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
index 2f01e113ef..d1972ce556 100644
--- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
@@ -1605,7 +1605,7 @@
 (defmethod deactivate race-manager ((obj race-manager))
   (persist-with-delay *setting-control* 'music-volume (seconds 3) 'music-volume 'abs 0.0 0)
   (send-event *traffic-manager* 'restore-default-settings)
-  ((the-as (function process none) (find-parent-method race-manager 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc
index e16d0e0a95..7fc4531082 100644
--- a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc
@@ -542,7 +542,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 3 of type keira-npc
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect keira-npc ((obj keira-npc))
   (when (not obj)
     (set! obj obj)
@@ -556,7 +555,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 35 of type keira-npc
-;; INFO: this function exists in multiple non-identical object files
 (defmethod get-art-elem keira-npc ((obj keira-npc))
   "Checks various things such the current actor, task status, etc to determine the right art-group data to use
 @returns the appropriate [[art-element]] for the given NPC"
@@ -571,7 +569,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 33 of type keira-npc
-;; INFO: this function exists in multiple non-identical object files
 ;; WARN: Return type mismatch int vs none.
 (defmethod init-art! keira-npc ((obj keira-npc))
   "@see [[initialize-skeleton]]"
@@ -864,7 +861,7 @@ This commonly includes things such as:
        )
      )
     )
-  ((the-as (function process-taskable none) (find-parent-method youngsamos-npc 32)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc
index 9fcf94562a..03ea85854a 100644
--- a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc
@@ -48,7 +48,7 @@
 ;; definition for method 29 of type dig-sinking-plat
 ;; WARN: Return type mismatch int vs none.
 (defmethod rigid-body-object-method-29 dig-sinking-plat ((obj dig-sinking-plat) (arg0 float))
-  ((the-as (function rigid-body-platform float none) (find-parent-method dig-sinking-plat 29)) obj arg0)
+  (call-parent-method obj arg0)
   (rigid-body-platform-method-56 obj (-> obj anchor-point))
   0
   (none)
diff --git a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc
index c3461cd4bc..a8a445e9ad 100644
--- a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc
@@ -1574,7 +1574,7 @@ This commonly includes things such as:
 ;; definition for method 29 of type dig-tipping-rock
 ;; WARN: Return type mismatch int vs none.
 (defmethod rigid-body-object-method-29 dig-tipping-rock ((obj dig-tipping-rock) (arg0 float))
-  ((the-as (function rigid-body-platform float none) (find-parent-method dig-tipping-rock 29)) obj arg0)
+  (call-parent-method obj arg0)
   (rigid-body-platform-method-56 obj (-> obj anchor-point))
   0
   (none)
diff --git a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc
index 7f1c555a10..30afbd4f91 100644
--- a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc
+++ b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc
@@ -1105,7 +1105,6 @@
   )
 
 ;; definition for method 7 of type drill-barons-ship-turret
-;; WARN: Return type mismatch process-drawable vs drill-barons-ship-turret.
 (defmethod relocate drill-barons-ship-turret ((obj drill-barons-ship-turret) (arg0 int))
   (when (-> obj jmod)
     (if (nonzero? (-> obj jmod))
@@ -1122,13 +1121,7 @@
         (&+! (-> obj jmod-right) arg0)
         )
     )
-  (the-as
-    drill-barons-ship-turret
-    ((the-as (function process-drawable int process-drawable) (find-parent-method drill-barons-ship-turret 7))
-     obj
-     arg0
-     )
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type drill-barons-ship
@@ -1271,7 +1264,7 @@ This commonly includes things such as:
 ;; WARN: Return type mismatch int vs none.
 (defmethod init-proj-settings! drill-ship-shot ((obj drill-ship-shot))
   "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc"
-  ((the-as (function guard-shot none) (find-parent-method drill-ship-shot 31)) obj)
+  (call-parent-method obj)
   (set! (-> obj attack-mode) 'drill-ship-shot)
   (set! (-> obj move) guard-shot-move)
   (set! (-> obj max-speed) 737280.0)
diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc
index 7459950304..72ba3ec70d 100644
--- a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc
@@ -531,7 +531,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type drill-elevator
 (defmethod deactivate drill-elevator ((obj drill-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method drill-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -946,15 +946,11 @@ For example for an elevator pre-compute the distance between the first and last
   )
 
 ;; definition for method 7 of type fire-floor
-;; WARN: Return type mismatch process-drawable vs fire-floor.
 (defmethod relocate fire-floor ((obj fire-floor) (arg0 int))
   (if (nonzero? (-> obj part-off))
       (&+! (-> obj part-off) arg0)
       )
-  (the-as
-    fire-floor
-    ((the-as (function process-drawable int process-drawable) (find-parent-method fire-floor 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 10 of type fire-floor
@@ -963,7 +959,7 @@ For example for an elevator pre-compute the distance between the first and last
   (if (nonzero? (-> obj part-off))
       (kill-and-free-particles (-> obj part-off))
       )
-  ((the-as (function process-drawable none) (find-parent-method fire-floor 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc
index 0cb025a4e8..6895e7e564 100644
--- a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc
@@ -204,7 +204,7 @@ This commonly includes things such as:
   :exit (behavior ()
     (sound-stop (-> self sound-id))
     (sound-play "drl-elev-stop")
-    (let ((t9-4 (-> (the-as state (find-parent-method drill-lift 36)) exit)))
+    (let ((t9-4 (-> (find-parent-state) exit)))
       (if t9-4
           (t9-4)
           )
@@ -212,7 +212,7 @@ This commonly includes things such as:
     )
   :post (behavior ()
     (sound-play "drl-elevator-lp" :id (-> self sound-id) :position (-> self root trans))
-    (let ((t9-2 (-> (the-as state (find-parent-method drill-lift 36)) post)))
+    (let ((t9-2 (-> (the-as state (find-parent-state)) post)))
       (if t9-2
           ((the-as (function none) t9-2))
           )
diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc
index b181dedfe7..8de4542509 100644
--- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc
+++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc
@@ -992,11 +992,9 @@
 
 ;; definition for method 10 of type ginsu
 (defmethod deactivate ginsu ((obj ginsu))
-  (when (nonzero? (-> obj blade-part))
-    (let ((a0-1 (-> obj blade-part)))
-      ((the-as (function sparticle-launch-control none) (method-of-object a0-1 kill-and-free-particles)) a0-1)
+  (if (nonzero? (-> obj blade-part))
+      (kill-and-free-particles (-> obj blade-part))
       )
-    )
   (if (-> obj blade-sound-playing)
       (sound-stop (-> obj blade-sound))
       )
diff --git a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc
index f145b3f1ec..59639ae815 100644
--- a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc
@@ -438,7 +438,7 @@ This commonly includes things such as:
       (send-event (handle->process (-> obj hud)) 'hide-and-die)
       )
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-focusable none) (find-parent-method forest-youngsamos 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc
index 93f3db8d02..be3e740641 100644
--- a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc
+++ b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc
@@ -1506,12 +1506,8 @@
   )
 
 ;; definition for method 7 of type predator
-;; WARN: Return type mismatch process-focusable vs predator.
 (defmethod relocate predator ((obj predator) (arg0 int))
-  (the-as
-    predator
-    ((the-as (function process-focusable int process-focusable) (find-parent-method predator 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 167 of type predator
diff --git a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc
index 798c2353a6..8f413afb37 100644
--- a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc
+++ b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc
@@ -448,7 +448,6 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]"
   )
 
 ;; definition for method 7 of type wren
-;; WARN: Return type mismatch process-drawable vs wren.
 (defmethod relocate wren ((obj wren) (arg0 int))
   (dotimes (v1-0 2)
     (when (-> obj fly-curve v1-0)
@@ -457,7 +456,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]"
           )
       )
     )
-  (the-as wren ((the-as (function process-drawable int process-drawable) (find-parent-method wren 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type wren
diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc
index f3ff340c98..061753432c 100644
--- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc
@@ -418,7 +418,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type fort-missile-target
 (defmethod deactivate fort-missile-target ((obj fort-missile-target))
   (sound-stop (the-as sound-id (-> obj sound-id)))
-  ((the-as (function process-drawable none) (find-parent-method fort-missile-target 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -991,15 +991,11 @@ This commonly includes things such as:
   )
 
 ;; definition for method 7 of type fort-missile
-;; WARN: Return type mismatch process-drawable vs fort-missile.
 (defmethod relocate fort-missile ((obj fort-missile) (arg0 int))
   (if (nonzero? (-> obj part-doom))
       (&+! (-> obj part-doom) arg0)
       )
-  (the-as
-    fort-missile
-    ((the-as (function process-drawable int process-drawable) (find-parent-method fort-missile 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type fort-missile
diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc
index 52aff854c3..a0fe79165b 100644
--- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc
+++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc
@@ -380,7 +380,7 @@
 (defmethod deactivate fort-roboscreen ((obj fort-roboscreen))
   (disable *screen-filter*)
   (set-roboscreen-alpha! 0.0)
-  ((the-as (function process-drawable none) (find-parent-method fort-roboscreen 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc
index e5beed4f95..a45bde1a7c 100644
--- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc
+++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc
@@ -1068,7 +1068,6 @@
   )
 
 ;; definition for method 7 of type fort-robotank
-;; WARN: Return type mismatch process-drawable vs fort-robotank.
 (defmethod relocate fort-robotank ((obj fort-robotank) (arg0 int))
   (if (nonzero? (-> obj barrel-part))
       (&+! (-> obj barrel-part) arg0)
@@ -1117,10 +1116,7 @@
           )
       )
     )
-  (the-as
-    fort-robotank
-    ((the-as (function process-drawable int process-drawable) (find-parent-method fort-robotank 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type fort-robotank
diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc
index 7c4041e218..39ae9a0a31 100644
--- a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc
@@ -313,7 +313,7 @@ This commonly includes things such as:
 (defstate shutdown (elec-lock-gate)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as state (find-parent-method elec-lock-gate 22)) enter)))
+    (let ((t9-1 (-> (the-as state (find-parent-state)) enter)))
       (if t9-1
           ((the-as (function none) t9-1))
           )
diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc
index eb725e4874..a5ca6b9645 100644
--- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc
@@ -429,7 +429,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type fort-elec-belt-inst
 (defmethod deactivate fort-elec-belt-inst ((obj fort-elec-belt-inst))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method fort-elec-belt-inst 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -669,7 +669,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 3 of type fort-conveyor
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect fort-conveyor ((obj fort-conveyor))
   (when (not obj)
     (set! obj obj)
@@ -689,14 +688,12 @@ This commonly includes things such as:
               )
 
 ;; definition for method 22 of type fort-conveyor
-;; INFO: this function exists in multiple non-identical object files
 (defmethod get-art-group fort-conveyor ((obj fort-conveyor))
   "@returns The respective [[art-group]] for the [[conveyor]]"
   (art-group-get-by-name *level* "skel-fort-conveyor" (the-as (pointer uint32) #f))
   )
 
 ;; definition for method 23 of type fort-conveyor
-;; INFO: this function exists in multiple non-identical object files
 ;; WARN: Return type mismatch collide-shape-moving vs none.
 (defmethod reset-root! fort-conveyor ((obj fort-conveyor))
   "Re-initializes the `root` [[trsqv]]"
@@ -727,7 +724,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 24 of type fort-conveyor
-;; INFO: this function exists in multiple non-identical object files
 ;; WARN: Return type mismatch vector vs none.
 (defmethod init! fort-conveyor ((obj fort-conveyor))
   "Initializes defaults for things like the `speed` and `belt-radius`"
@@ -741,7 +737,6 @@ This commonly includes things such as:
   )
 
 ;; definition for method 25 of type fort-conveyor
-;; INFO: this function exists in multiple non-identical object files
 (defmethod set-and-get-ambient-sound! fort-conveyor ((obj fort-conveyor))
   "So long as [[actor-option::16]] is not set, fetch the [[ambient-sound]] for the [[conveyor]]
 and return it as well.  Otherwise, set it to `0`"
diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
index d42b5ed00d..d97da5f164 100644
--- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
@@ -209,7 +209,7 @@
       )
   (training-manager-method-24 obj)
   (training-manager-method-25 obj)
-  ((the-as (function process none) (find-parent-method training-manager 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc
index 63479c025a..f4f123bfbb 100644
--- a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc
+++ b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc
@@ -1796,22 +1796,18 @@
         (kill-and-free-particles (-> obj score-part s5-0))
         )
     )
-  ((the-as (function process none) (find-parent-method whack-a-metal 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type whack-a-metal
-;; WARN: Return type mismatch process-drawable vs whack-a-metal.
 (defmethod relocate whack-a-metal ((obj whack-a-metal) (arg0 int))
   (dotimes (v1-0 2)
     (if (nonzero? (-> obj score-part v1-0))
         (&+! (-> obj score-part v1-0) arg0)
         )
     )
-  (the-as
-    whack-a-metal
-    ((the-as (function process-drawable int process-drawable) (find-parent-method whack-a-metal 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 29 of type whack-a-metal
diff --git a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc
index a41de56c03..c424d85572 100644
--- a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc
@@ -390,17 +390,13 @@ This commonly includes things such as:
   )
 
 ;; definition for method 7 of type metalhead-spawner
-;; WARN: Return type mismatch process vs metalhead-spawner.
 (defmethod relocate metalhead-spawner ((obj metalhead-spawner) (arg0 int))
   (dotimes (v1-0 19)
     (if (nonzero? (-> obj path-tbl v1-0))
         (&+! (-> obj path-tbl v1-0) arg0)
         )
     )
-  (the-as
-    metalhead-spawner
-    ((the-as (function process int process) (find-parent-method metalhead-spawner 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type metalhead-spawner
diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc
index 1bc20fb259..df1ab97ccf 100644
--- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc
@@ -3519,7 +3519,7 @@ This commonly includes things such as:
         (task-arrow-spawn gp-0 self)
         )
       )
-    (let ((t9-5 (-> (the-as state (find-parent-method trans-plat 34)) enter)))
+    (let ((t9-5 (-> (the-as state (find-parent-state)) enter)))
       (if t9-5
           ((the-as (function none) t9-5))
           )
@@ -3529,7 +3529,7 @@ This commonly includes things such as:
     (while (-> self child)
       (deactivate (-> self child 0))
       )
-    (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) exit)))
+    (let ((t9-2 (-> (the-as state (find-parent-state)) exit)))
       (if t9-2
           (t9-2)
           )
@@ -3553,7 +3553,7 @@ This commonly includes things such as:
         0
         )
       )
-    (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) trans)))
+    (let ((t9-2 (-> (the-as state (find-parent-state)) trans)))
       (if t9-2
           (t9-2)
           )
diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc
index e6ad48f01b..ef817b2d2a 100644
--- a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc
+++ b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc
@@ -1908,15 +1908,11 @@
   )
 
 ;; definition for method 7 of type rhino
-;; WARN: Return type mismatch process-focusable vs rhino.
 (defmethod relocate rhino ((obj rhino) (arg0 int))
   (if (nonzero? (-> obj path-intro))
       (&+! (-> obj path-intro) arg0)
       )
-  (the-as
-    rhino
-    ((the-as (function process-focusable int process-focusable) (find-parent-method rhino 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type rhino
diff --git a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc
index 7d74ea9cbb..9bf5a1fe10 100644
--- a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc
+++ b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc
@@ -24,14 +24,11 @@
   )
 
 ;; definition for method 28 of type flying-spider-shot
-;; WARN: Return type mismatch sound-id vs none.
+;; WARN: Return type mismatch object vs none.
 (defmethod play-impact-sound flying-spider-shot ((obj flying-spider-shot) (arg0 projectile-options))
   (if (zero? arg0)
       (sound-play "fly-spider-shot")
-      ((the-as (function projectile projectile-options sound-id) (find-parent-method flying-spider-shot 28))
-       obj
-       arg0
-       )
+      (call-parent-method obj arg0)
       )
   (none)
   )
diff --git a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc
index b7730905ac..cfbb43c85c 100644
--- a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc
+++ b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc
@@ -1588,17 +1588,13 @@
   )
 
 ;; definition for method 7 of type mammoth
-;; WARN: Return type mismatch process-focusable vs mammoth.
 (defmethod relocate mammoth ((obj mammoth) (arg0 int))
   (dotimes (v1-0 4)
     (if (nonzero? (-> obj joint-ik v1-0))
         (&+! (-> obj joint-ik v1-0) arg0)
         )
     )
-  (the-as
-    mammoth
-    ((the-as (function process-focusable int process-focusable) (find-parent-method mammoth 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 114 of type mammoth
diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc
index 338dc5cdb9..a028ebeb3e 100644
--- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc
+++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc
@@ -448,7 +448,7 @@
 (defstate active (mantis)
   :virtual #t
   :trans (behavior ()
-    (let ((t9-1 (-> (the-as (state enemy) (find-parent-method mantis 32)) trans)))
+    (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) trans)))
       (if t9-1
           (t9-1)
           )
diff --git a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc
index 41ef5a12bb..ca990ac835 100644
--- a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc
@@ -1039,7 +1039,7 @@ This commonly includes things such as:
 (defmethod deactivate pal-rot-gun ((obj pal-rot-gun))
   (sound-stop (-> obj sound-id))
   (sound-stop (-> obj shot-sound-id))
-  ((the-as (function process-drawable none) (find-parent-method pal-rot-gun 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc
index 5d68ea76f5..cf1bb81e8d 100644
--- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc
+++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc
@@ -1466,15 +1466,11 @@
   )
 
 ;; definition for method 7 of type rapid-gunner
-;; WARN: Return type mismatch process-focusable vs rapid-gunner.
 (defmethod relocate rapid-gunner ((obj rapid-gunner) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
       )
-  (the-as
-    rapid-gunner
-    ((the-as (function process-focusable int process-focusable) (find-parent-method rapid-gunner 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type rapid-gunner
diff --git a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc
index 224ca8d3d5..e0894e51aa 100644
--- a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc
@@ -34,7 +34,7 @@
 ;; definition for method 29 of type sinking-plat
 ;; WARN: Return type mismatch int vs none.
 (defmethod rigid-body-object-method-29 sinking-plat ((obj sinking-plat) (arg0 float))
-  ((the-as (function rigid-body-platform float none) (find-parent-method sinking-plat 29)) obj arg0)
+  (call-parent-method obj arg0)
   (rigid-body-platform-method-56 obj (-> obj anchor-point))
   0
   (none)
diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc
index 34b68f5cfc..341e79cb30 100644
--- a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc
+++ b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc
@@ -436,7 +436,6 @@
   )
 
 ;; definition for method 3 of type ik-setup
-;; INFO: this function exists in multiple non-identical object files
 (defmethod inspect ik-setup ((obj ik-setup))
   (when (not obj)
     (set! obj obj)
@@ -2328,7 +2327,6 @@
   )
 
 ;; definition for method 7 of type hosehead
-;; WARN: Return type mismatch none vs hosehead.
 (defmethod relocate hosehead ((obj hosehead) (arg0 int))
   (if (nonzero? (-> obj head-joint-mod))
       (&+! (-> obj head-joint-mod) arg0)
@@ -2338,7 +2336,7 @@
         (&+! (-> obj joint-ik v1-4) arg0)
         )
     )
-  (the-as hosehead ((the-as (function process-drawable int none) (find-parent-method hosehead 7)) obj arg0))
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 115 of type hosehead
diff --git a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc
index 1b2607288a..80d2d893c2 100644
--- a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc
+++ b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc
@@ -1279,7 +1279,7 @@
 ;; definition for method 140 of type pal-gun-turret
 (defmethod fire-turret! pal-gun-turret ((obj pal-gun-turret) (arg0 symbol))
   "@overrides Calls [[sew-gunturret::140]] but also customizes the turret flash via [[set-palcab-turret-flash!]]"
-  ((the-as (function sew-gunturret symbol none) (find-parent-method pal-gun-turret 140)) obj arg0)
+  (call-parent-method obj arg0)
   (set-palcab-turret-flash! 1.0)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc
index 7410ab1b01..a1758d050c 100644
--- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc
+++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc
@@ -153,7 +153,7 @@
 ;; definition for method 10 of type sew-elevator
 (defmethod deactivate sew-elevator ((obj sew-elevator))
   (sound-stop (-> obj sound-id))
-  ((the-as (function elevator none) (find-parent-method sew-elevator 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -361,15 +361,11 @@ For example for an elevator pre-compute the distance between the first and last
   )
 
 ;; definition for method 7 of type sew-valve
-;; WARN: Return type mismatch process-drawable vs sew-valve.
 (defmethod relocate sew-valve ((obj sew-valve) (arg0 int))
   (if (nonzero? (-> obj joint))
       (&+! (-> obj joint) arg0)
       )
-  (the-as
-    sew-valve
-    ((the-as (function process-drawable int process-drawable) (find-parent-method sew-valve 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type sew-valve
diff --git a/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc b/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc
index 6c704a0b12..d07da84c2c 100644
--- a/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc
+++ b/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc
@@ -805,15 +805,11 @@
   )
 
 ;; definition for method 7 of type vehicle-race-bike
-;; WARN: Return type mismatch process-drawable vs vehicle-race-bike.
 (defmethod relocate vehicle-race-bike ((obj vehicle-race-bike) (arg0 int))
   (if (nonzero? (-> obj steering-wheel))
       (&+! (-> obj steering-wheel) arg0)
       )
-  (the-as
-    vehicle-race-bike
-    ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-race-bike 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 86 of type vehicle-race-bike
diff --git a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc
index a21f4c0f6a..8651da847b 100644
--- a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc
@@ -1362,7 +1362,7 @@
 ;; definition for method 10 of type hoverboard-training-manager
 (defmethod deactivate hoverboard-training-manager ((obj hoverboard-training-manager))
   (send-event *traffic-manager* 'restore-default-settings)
-  ((the-as (function process none) (find-parent-method hoverboard-training-manager 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc
index 1713fa5026..d906a9ba4b 100644
--- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc
@@ -1045,7 +1045,7 @@ This commonly includes things such as:
   (if (< 40960.0 (-> arg0 impulse))
       (sound-play "rift-fall")
       )
-  ((the-as (function rigid-body-object rigid-body-impact none) (find-parent-method rift-rider 45)) obj arg0)
+  (call-parent-method obj arg0)
   (none)
   )
 
@@ -1116,7 +1116,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type rift-rider
 (defmethod deactivate rift-rider ((obj rift-rider))
   (sound-stop (-> obj sound-id))
-  ((the-as (function rigid-body-object none) (find-parent-method rift-rider 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -2161,7 +2161,7 @@ This commonly includes things such as:
       (send-event (handle->process (-> obj hud)) 'hide-and-die)
       )
   (kill-lightning obj)
-  ((the-as (function process-focusable none) (find-parent-method stad-samos 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc
index c80f77b801..f69cffe416 100644
--- a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc
@@ -427,15 +427,11 @@ This commonly includes things such as:
   )
 
 ;; definition for method 7 of type pitspikes
-;; WARN: Return type mismatch strip-hazard vs pitspikes.
 (defmethod relocate pitspikes ((obj pitspikes) (arg0 int))
   (if (nonzero? (-> obj spinner))
       (&+! (-> obj spinner) arg0)
       )
-  (the-as
-    pitspikes
-    ((the-as (function strip-hazard int strip-hazard) (find-parent-method pitspikes 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type pitspikes
diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc
index 30dee5b930..578441e748 100644
--- a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc
+++ b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc
@@ -343,7 +343,7 @@
   :enter (behavior ()
     (set! (-> self root trans quad) (-> self entity extra trans quad))
     (quaternion-copy! (-> self root quat) (-> self entity quat))
-    (let ((t9-2 (-> (the-as (state enemy) (find-parent-method tomb-beetle 27)) enter)))
+    (let ((t9-2 (-> (the-as (state enemy) (find-parent-state)) enter)))
       (if t9-2
           (t9-2)
           )
diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc
index 10bc23b626..937be1270f 100644
--- a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc
@@ -1791,7 +1791,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type tomb-plat-return
 (defmethod deactivate tomb-plat-return ((obj tomb-plat-return))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method tomb-plat-return 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
@@ -2158,7 +2158,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type tomb-sphinx
 (defmethod deactivate tomb-sphinx ((obj tomb-sphinx))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method tomb-sphinx 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc
index d7417e80fa..4cdc11c646 100644
--- a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc
+++ b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc
@@ -676,7 +676,7 @@ This commonly includes things such as:
       )
     )
   :trans (behavior ()
-    (let ((t9-1 (-> (the-as (state basebutton) (find-parent-method tomb-beetle-button 30)) trans)))
+    (let ((t9-1 (-> (the-as (state basebutton) (find-parent-state)) trans)))
       (if t9-1
           (t9-1)
           )
diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc
index d0ad8d4f2d..b5bf942395 100644
--- a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc
+++ b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc
@@ -1274,12 +1274,11 @@ This commonly includes things such as:
   (if (nonzero? (-> obj skid-part))
       (kill-and-free-particles (-> obj warning-spark-part))
       )
-  ((the-as (function process-drawable none) (find-parent-method widow-bomb 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type widow-bomb
-;; WARN: Return type mismatch process-drawable vs widow-bomb.
 (defmethod relocate widow-bomb ((obj widow-bomb) (arg0 int))
   (if (nonzero? (-> obj explode-part))
       (&+! (-> obj explode-part) arg0)
@@ -1299,10 +1298,7 @@ This commonly includes things such as:
   (if (nonzero? (-> obj spin-jm))
       (&+! (-> obj spin-jm) arg0)
       )
-  (the-as
-    widow-bomb
-    ((the-as (function process-drawable int process-drawable) (find-parent-method widow-bomb 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for function widow-bomb-reaction
@@ -1694,20 +1690,16 @@ This commonly includes things such as:
   (if (nonzero? (-> obj explode-part))
       (kill-and-free-particles (-> obj explode-part))
       )
-  ((the-as (function process-drawable none) (find-parent-method tomb-boss-pillar 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
 ;; definition for method 7 of type tomb-boss-pillar
-;; WARN: Return type mismatch process-drawable vs tomb-boss-pillar.
 (defmethod relocate tomb-boss-pillar ((obj tomb-boss-pillar) (arg0 int))
   (if (nonzero? (-> obj explode-part))
       (&+! (-> obj explode-part) arg0)
       )
-  (the-as
-    tomb-boss-pillar
-    ((the-as (function process-drawable int process-drawable) (find-parent-method tomb-boss-pillar 7)) obj arg0)
-    )
+  (call-parent-method obj arg0)
   )
 
 ;; definition for method 11 of type tomb-boss-pillar
diff --git a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc
index 66535f76fa..9a09c97284 100644
--- a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc
+++ b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc
@@ -509,7 +509,7 @@
 (defstate stare (jellyfish)
   :virtual #t
   :enter (behavior ()
-    (let ((t9-1 (-> (the-as (state enemy) (find-parent-method jellyfish 35)) enter)))
+    (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) enter)))
       (if t9-1
           (t9-1)
           )
@@ -1296,7 +1296,7 @@
 ;; definition for method 10 of type jellyfish
 (defmethod deactivate jellyfish ((obj jellyfish))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method jellyfish 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc
index 29c51870cf..0025dec958 100644
--- a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc
@@ -983,7 +983,7 @@ This commonly includes things such as:
 ;; definition for method 29 of type under-buoy-plat
 ;; WARN: Return type mismatch int vs none.
 (defmethod rigid-body-object-method-29 under-buoy-plat ((obj under-buoy-plat) (arg0 float))
-  ((the-as (function rigid-body-object float none) (find-parent-method under-buoy-plat 29)) obj arg0)
+  (call-parent-method obj arg0)
   (rigid-body-platform-method-56 obj (-> obj orig-trans))
   0
   (none)
@@ -1775,7 +1775,7 @@ This commonly includes things such as:
 ;; definition for method 10 of type under-lift
 (defmethod deactivate under-lift ((obj under-lift))
   (sound-stop (-> obj sound-id))
-  ((the-as (function process-drawable none) (find-parent-method under-lift 10)) obj)
+  (call-parent-method obj)
   (none)
   )
 
diff --git a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc
index a7f4129785..121975a4d1 100644
--- a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc
+++ b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc
@@ -2353,7 +2353,7 @@
         )
       )
     )
-  ((the-as (function process-drawable none) (find-parent-method under-shoot-block 10)) obj)
+  (call-parent-method obj)
   (none)
   )