diff --git a/crates/bindings-macro/src/lib.rs b/crates/bindings-macro/src/lib.rs
index 2a4aec8810..f7ad6cb94a 100644
--- a/crates/bindings-macro/src/lib.rs
+++ b/crates/bindings-macro/src/lib.rs
@@ -198,6 +198,7 @@ impl syn::parse::Parse for MacroInput {
                 // Extract stuff in parens.
                 let in_parens;
                 syn::parenthesized!(in_parens in input);
+                let in_parens = &in_parens;
 
                 // Parse `btree` or `hash`.
                 let ty: IndexType = in_parens.parse()?;
@@ -206,11 +207,11 @@ impl syn::parse::Parse for MacroInput {
                 // Also find plain identifiers that become field names to index.
                 let mut name = None;
                 let mut field_names = Vec::new();
-                comma_then_comma_delimited(input, || {
-                    match_tok!(match input {
+                comma_then_comma_delimited(in_parens, || {
+                    match_tok!(match in_parens {
                         (tok, _) @ (kw::name, Token![=]) => {
                             check_duplicate(&name, tok.span)?;
-                            let v = input.parse::<syn::LitStr>()?;
+                            let v = in_parens.parse::<syn::LitStr>()?;
                             name = Some(v.value())
                         }
                         ident @ Ident => field_names.push(ident),
diff --git a/modules/benchmarks/src/lib.rs b/modules/benchmarks/src/lib.rs
index dac5bf9ddb..9e46fcf217 100644
--- a/modules/benchmarks/src/lib.rs
+++ b/modules/benchmarks/src/lib.rs
@@ -134,7 +134,7 @@ pub fn find_unique_location(id: u64) {
 }
 
 #[spacetimedb(table)]
-#[spacetimedb(index(btree), name = "id", id)]
+#[spacetimedb(index(btree, name = "id", id))]
 pub struct NonuniqueLocation {
     id: u64,
     x: u64,
diff --git a/modules/rust-wasm-test/.cargo/config.toml b/modules/rust-wasm-test/.cargo/config.toml
index 435ed755ec..f4e8c002fc 100644
--- a/modules/rust-wasm-test/.cargo/config.toml
+++ b/modules/rust-wasm-test/.cargo/config.toml
@@ -1,2 +1,2 @@
 [build]
-target = "wasm32-unknown-unknown"
\ No newline at end of file
+target = "wasm32-unknown-unknown"
diff --git a/modules/rust-wasm-test/src/lib.rs b/modules/rust-wasm-test/src/lib.rs
index c3c2290642..da02730909 100644
--- a/modules/rust-wasm-test/src/lib.rs
+++ b/modules/rust-wasm-test/src/lib.rs
@@ -5,7 +5,7 @@ use spacetimedb::{
 use spacetimedb_lib::bsatn;
 
 #[spacetimedb(table)]
-#[spacetimedb(index(btree), name = "foo", x)]
+#[spacetimedb(index(btree, name = "foo", x))]
 pub struct TestA {
     pub x: u32,
     pub y: u32,
diff --git a/test/tests/filtering.sh b/test/tests/filtering.sh
index 89cdb94b9d..314d3d6bf7 100644
--- a/test/tests/filtering.sh
+++ b/test/tests/filtering.sh
@@ -67,7 +67,7 @@ pub fn find_person_by_nick(nick: String) {
 }
 
 #[spacetimedb(table)]
-#[spacetimedb(index(btree), name = "by_id", id)]
+#[spacetimedb(index(btree, name = "by_id", id))]
 pub struct NonuniquePerson {
     id: i32,
     name: String,
@@ -137,7 +137,7 @@ fn find_identified_person(id_number: u64) {
 
 // Ensure that indices on non-unique columns behave as we expect.
 #[spacetimedb(table)]
-#[spacetimedb(index(btree), name="person_surname", surname)]
+#[spacetimedb(index(btree, name="person_surname", surname))]
 struct IndexedPerson {
     #[unique]
     id: i32,