diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index ce85f6369b..f6159f1057 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -5288,16 +5288,16 @@ void Guest::Update()
         PeepFlags &= ~PEEP_FLAGS_ANIMATION_FROZEN;
     }
 
-    auto* guest = As<Guest>();
-    if (guest != nullptr)
+    if (!PreviousRide.IsNull())
     {
-        if (!guest->PreviousRide.IsNull())
-            if (++guest->PreviousRideTimeOut >= 720)
-                guest->PreviousRide = RideId::GetNull();
-
-        GuestUpdateThoughts(guest);
+        if (++PreviousRideTimeOut >= 720)
+        {
+            PreviousRide = RideId::GetNull();
+        }
     }
 
+    GuestUpdateThoughts(this);
+
     // Walking speed logic
     uint32_t stepsToTake = Energy;
     if (stepsToTake < 95 && State == PeepState::Queuing)
@@ -5319,10 +5319,7 @@ void Guest::Update()
     StepProgress = carryCheck;
     if (carryCheck <= 255)
     {
-        if (guest != nullptr)
-        {
-            guest->UpdateEasterEggInteractions();
-        }
+        UpdateEasterEggInteractions();
     }
     else
     {
@@ -5342,25 +5339,8 @@ void Guest::Update()
                 UpdatePicked();
                 break;
             default:
-            {
-                if (guest != nullptr)
-                {
-                    guest->UpdateGuest();
-                }
-                else
-                {
-                    auto* staff = As<Staff>();
-                    if (staff != nullptr)
-                    {
-                        staff->UpdateStaff(stepsToTake);
-                    }
-                    else
-                    {
-                        assert(false);
-                    }
-                }
+                UpdateGuest();
                 break;
-            }
         }
     }
 }
diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp
index b6933c6221..ea0adaac78 100644
--- a/src/openrct2/entity/Staff.cpp
+++ b/src/openrct2/entity/Staff.cpp
@@ -1706,11 +1706,6 @@ void Staff::Update()
         PeepFlags &= ~PEEP_FLAGS_ANIMATION_FROZEN;
     }
 
-    auto* guest = As<Guest>();
-    if (guest != nullptr)
-    {
-    }
-
     // Walking speed logic
     uint32_t stepsToTake = Energy;
     if (stepsToTake < 95 && State == PeepState::Queuing)
@@ -1732,10 +1727,7 @@ void Staff::Update()
     StepProgress = carryCheck;
     if (carryCheck <= 255)
     {
-        if (guest != nullptr)
-        {
-            guest->UpdateEasterEggInteractions();
-        }
+        // No-op: Keep replay working for now, can be eliminate with a replay update.
     }
     else
     {
@@ -1755,25 +1747,8 @@ void Staff::Update()
                 UpdatePicked();
                 break;
             default:
-            {
-                if (guest != nullptr)
-                {
-                    guest->UpdateGuest();
-                }
-                else
-                {
-                    auto* staff = As<Staff>();
-                    if (staff != nullptr)
-                    {
-                        staff->UpdateStaff(stepsToTake);
-                    }
-                    else
-                    {
-                        assert(false);
-                    }
-                }
+                UpdateStaff(stepsToTake);
                 break;
-            }
         }
     }
 }