diff --git a/Makefile b/Makefile
index 667195103..2979461a0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ VG_TEST_ARGS = --track-origins=yes --leak-check=full --show-reachable=yes --erro
 endif
 
 ifeq ($(DEVELOPER),1)
-DEV_CFLAGS=-DCCAN_TAL_DEBUG=1 -DCCAN_TAKE_DEBUG=1
+DEV_CFLAGS=-DCCAN_TAKE_DEBUG=1
 else
 DEV_CFLAGS=
 endif
diff --git a/common/memleak.c b/common/memleak.c
index d3284d0b0..f7a37a4e2 100644
--- a/common/memleak.c
+++ b/common/memleak.c
@@ -58,11 +58,6 @@ void *notleak_(const void *ptr, bool plus_children)
 	return cast_const(void *, ptr);
 }
 
-/* This only works if all objects have tal_len() */
-#ifndef CCAN_TAL_DEBUG
-#error CCAN_TAL_DEBUG must be set
-#endif
-
 static size_t hash_ptr(const void *elem, void *unused UNNEEDED)
 {
 	static struct siphash_seed seed;
@@ -96,8 +91,7 @@ static void children_into_htable(const void *exclude1, const void *exclude2,
 				continue;
 
 			/* ccan/io allocates pollfd array. */
-			if (streq(name,
-				  "ccan/ccan/io/poll.c:40:struct pollfd[]"))
+			if (streq(name, "struct pollfd[]") && !tal_parent(i))
 				continue;
 
 			/* Don't add tmpctx. */