diff --git a/Penumbra.GameData/Enums/FullEquipType.cs b/Penumbra.GameData/Enums/FullEquipType.cs
index d2054a7b..7db76496 100644
--- a/Penumbra.GameData/Enums/FullEquipType.cs
+++ b/Penumbra.GameData/Enums/FullEquipType.cs
@@ -403,6 +403,9 @@ public static class FullEquipTypeExtensions
             _                        => string.Empty,
         };
 
+    public static bool IsOffhandType(this FullEquipType type)
+        => type.OffhandTypeSuffix().Length > 0;
+
     public static readonly IReadOnlyList<FullEquipType> WeaponTypes
         = Enum.GetValues<FullEquipType>().Where(v => v.IsWeapon()).ToArray();
 
diff --git a/Penumbra/Interop/PathResolving/DrawObjectState.cs b/Penumbra/Interop/PathResolving/DrawObjectState.cs
index 8273aed3..88e600b8 100644
--- a/Penumbra/Interop/PathResolving/DrawObjectState.cs
+++ b/Penumbra/Interop/PathResolving/DrawObjectState.cs
@@ -132,15 +132,15 @@ public class DrawObjectState : IDisposable, IReadOnlyDictionary<nint, (nint, boo
     /// EnableDraw is what creates DrawObjects for gameObjects,
     /// so we always keep track of the current GameObject to be able to link it to the DrawObject.
     /// </summary>
-    private delegate void EnableDrawDelegate(nint gameObject, nint b, nint c, nint d);
+    private delegate void EnableDrawDelegate(nint gameObject);
 
     [Signature(Sigs.EnableDraw, DetourName = nameof(EnableDrawDetour))]
     private readonly Hook<EnableDrawDelegate> _enableDrawHook = null!;
 
-    private void EnableDrawDetour(nint gameObject, nint b, nint c, nint d)
+    private void EnableDrawDetour(nint gameObject)
     {
         _lastGameObject.Value!.Enqueue(gameObject);
-        _enableDrawHook.Original.Invoke(gameObject, b, c, d);
+        _enableDrawHook.Original.Invoke(gameObject);
         _lastGameObject.Value!.TryDequeue(out _);
     }
 }