diff --git a/packages/keyed/dev/entries.tsx b/packages/keyed/dev/entries.tsx
index 48b1c7e9f..7aaf53a88 100644
--- a/packages/keyed/dev/entries.tsx
+++ b/packages/keyed/dev/entries.tsx
@@ -1,6 +1,6 @@
 // changes to this file might be applicable to similar files - grep 95DB7339-BB2A-4F06-A34A-25DDF8BF7AF7
 
-import { createStore, produce } from "solid-js/store";
+import { createStore } from "solid-js/store";
 import { createEffect } from "solid-js";
 import { Entries } from "../src/index.js";
 import { TransitionGroup } from "solid-transition-group";
diff --git a/packages/keyed/src/index.ts b/packages/keyed/src/index.ts
index 8be5e01a7..32b38b27d 100644
--- a/packages/keyed/src/index.ts
+++ b/packages/keyed/src/index.ts
@@ -189,14 +189,8 @@ export function Entries<K extends string | number, V>(props: {
   const mapFn = props.children;
   return createMemo(
     mapArray(
-      () => props.of && Object.keys(props.of),
-      mapFn.length < 3
-        ? key =>
-            (mapFn as (key: string, v: Accessor<V>) => JSX.Element)(
-              key,
-              () => props.of![key as never],
-            )
-        : (key, i) => mapFn(key as never, () => props.of![key as never], i),
+      () => props.of && (Object.keys(props.of) as never[]),
+      (key, i) => mapFn(key, () => props.of![key], i),
       "fallback" in props ? { fallback: () => props.fallback } : undefined,
     ),
   ) as unknown as JSX.Element;
@@ -227,13 +221,7 @@ export function MapEntries<K, V>(props: {
   return createMemo(
     mapArray(
       () => props.of && Array.from(props.of.keys()),
-      mapFn.length < 3
-        ? key =>
-            (mapFn as (key: K, v: Accessor<V>) => JSX.Element)(
-              key,
-              () => (props.of as Map<K, V>).get(key)!,
-            )
-        : (key, i) => mapFn(key, () => (props.of as Map<K, V>).get(key)!, i),
+      (key, i) => mapFn(key, () => (props.of as Map<K, V>).get(key)!, i),
       "fallback" in props ? { fallback: () => props.fallback } : undefined,
     ),
   ) as unknown as JSX.Element;