diff --git a/ecc/bls12-377/multiexp_affine.go b/ecc/bls12-377/multiexp_affine.go
index 0711888e0f..10f68ca4de 100644
--- a/ecc/bls12-377/multiexp_affine.go
+++ b/ecc/bls12-377/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bls12-378/multiexp_affine.go b/ecc/bls12-378/multiexp_affine.go
index 53459815f6..54d8c71a50 100644
--- a/ecc/bls12-378/multiexp_affine.go
+++ b/ecc/bls12-378/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bls12-381/multiexp_affine.go b/ecc/bls12-381/multiexp_affine.go
index 3b3fa855fd..1b71b7ab45 100644
--- a/ecc/bls12-381/multiexp_affine.go
+++ b/ecc/bls12-381/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bls24-315/multiexp_affine.go b/ecc/bls24-315/multiexp_affine.go
index ebe85c7510..2938a409e7 100644
--- a/ecc/bls24-315/multiexp_affine.go
+++ b/ecc/bls24-315/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bls24-317/multiexp_affine.go b/ecc/bls24-317/multiexp_affine.go
index ffae06cc21..47b693fbd9 100644
--- a/ecc/bls24-317/multiexp_affine.go
+++ b/ecc/bls24-317/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bn254/multiexp_affine.go b/ecc/bn254/multiexp_affine.go
index 5b1b7ecbdf..6c66595bce 100644
--- a/ecc/bn254/multiexp_affine.go
+++ b/ecc/bn254/multiexp_affine.go
@@ -60,10 +60,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -388,10 +387,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bw6-633/multiexp_affine.go b/ecc/bw6-633/multiexp_affine.go
index 459d7cdc7e..aaba66f9f1 100644
--- a/ecc/bw6-633/multiexp_affine.go
+++ b/ecc/bw6-633/multiexp_affine.go
@@ -59,10 +59,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -327,10 +326,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bw6-756/multiexp_affine.go b/ecc/bw6-756/multiexp_affine.go
index a3dcf88cbb..dd1b9723ac 100644
--- a/ecc/bw6-756/multiexp_affine.go
+++ b/ecc/bw6-756/multiexp_affine.go
@@ -59,10 +59,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -327,10 +326,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/bw6-761/multiexp_affine.go b/ecc/bw6-761/multiexp_affine.go
index 09fe09a9dc..fd68dd7f50 100644
--- a/ecc/bw6-761/multiexp_affine.go
+++ b/ecc/bw6-761/multiexp_affine.go
@@ -59,10 +59,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
@@ -327,10 +326,9 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G2Affine used with the batch affine additions
 	// 1 in g2JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G2Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/ecc/secp256k1/multiexp_affine.go b/ecc/secp256k1/multiexp_affine.go
index 83da182a00..e865e90e13 100644
--- a/ecc/secp256k1/multiexp_affine.go
+++ b/ecc/secp256k1/multiexp_affine.go
@@ -59,10 +59,9 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
 	// note that we have 2 sets of buckets
 	// 1 in G1Affine used with the batch affine additions
 	// 1 in g1JacExtended used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in G1Affine coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}
 
diff --git a/internal/generator/ecc/template/multiexp_affine.go.tmpl b/internal/generator/ecc/template/multiexp_affine.go.tmpl
index 07aada3885..9f206a86d4 100644
--- a/internal/generator/ecc/template/multiexp_affine.go.tmpl
+++ b/internal/generator/ecc/template/multiexp_affine.go.tmpl
@@ -61,10 +61,9 @@ func processChunk{{ $.UPointName }}BatchAffine[BJE ib{{ $.TJacobianExtended }},B
 	// note that we have 2 sets of buckets
 	// 1 in {{ $.TAffine }} used with the batch affine additions
 	// 1 in {{ $.TJacobianExtended }} used in case the queue of conflicting points
-	var buckets B
+	var buckets B // in {{ $.TAffine }} coordinates, infinity point is represented as (0,0), no need to init
 	var bucketsJE BJE
 	for i := 0; i < len(buckets); i++ {
-		buckets[i].setInfinity()
 		bucketsJE[i].setInfinity()
 	}