client-tracker-announcer.go | 2 +-
 cmd/torrent2/main.go        | 2 +-
 internal/indexed/funcs.go   | 1 +

diff --git a/client-tracker-announcer.go b/client-tracker-announcer.go
index d4f300969251069a77e758d7e8e73700d7be9a87..cb38863fdf4b5d8d6f4e93a5ff781a2e55df1651 100644
--- a/client-tracker-announcer.go
+++ b/client-tracker-announcer.go
@@ -341,7 +341,7 @@ 	end.When = now.Add(1)
 	var last g.Option[torrentTrackerAnnouncerKey]
 again:
 	for {
-		for r := range indexed.FirstInRange(me.overdueIndex, start, end).Iter() {
+		for r := range indexed.FirstInRange(me.overdueIndex, start, end).Iter {
 			// Check we're making progress.
 			if last.Ok {
 				if last.Value.Compare(r.torrentTrackerAnnouncerKey) == 0 {
diff --git a/cmd/torrent2/main.go b/cmd/torrent2/main.go
index ff26dea588af7a737a02fc460104d5d159104a7c..528850cff898ed1d5ae4934ac61ced1a77ece73f 100644
--- a/cmd/torrent2/main.go
+++ b/cmd/torrent2/main.go
@@ -80,7 +80,7 @@ 					for _, f := range files {
 						numPieces := int((f.Length + info.PieceLength - 1) / info.PieceLength)
 						endIndex := pieceIndex + numPieces
 						hash := "no v2 pieces root"
-						for a := range f.PiecesRoot.Iter() {
+						for a := range f.PiecesRoot.Iter {
 							hash = a.HexString()
 						}
 						fmt.Printf(
diff --git a/internal/indexed/funcs.go b/internal/indexed/funcs.go
index 1464e3f4a7660fe9bb26c1b414d8c4c15684488e..09153347b38937c34cff9d2f5db8a4d8c06978ca 100644
--- a/internal/indexed/funcs.go
+++ b/internal/indexed/funcs.go
@@ -14,6 +14,7 @@ // nowhere else.
 func IterClusteredWhere[R any](t relation[R], gte R, where func(r R) bool) Iter[R] {
 	return func(yield func(R) bool) {
 		first := true
+		// TODO: This function is allocating..
 		checkFirst := func(r g.Option[R]) {
 			if !first {
 				return