diff --git a/src/circuit.rs b/src/circuit.rs
index 9d68fa7c..c1ca503f 100644
--- a/src/circuit.rs
+++ b/src/circuit.rs
@@ -198,11 +198,11 @@ impl plonk::Circuit<pallas::Base> for Circuit {
 
         // Instance column used for public inputs
         let primary = meta.instance_column();
-        meta.enable_equality(primary.into());
+        meta.enable_equality(primary);
 
         // Permutation over all advice columns.
         for advice in advices.iter() {
-            meta.enable_equality((*advice).into());
+            meta.enable_equality(*advice);
         }
 
         // Poseidon requires four advice columns, while ECC incomplete addition requires
diff --git a/src/circuit/gadget/ecc/chip/add.rs b/src/circuit/gadget/ecc/chip/add.rs
index 489c10e9..330fc35c 100644
--- a/src/circuit/gadget/ecc/chip/add.rs
+++ b/src/circuit/gadget/ecc/chip/add.rs
@@ -47,10 +47,10 @@ impl Config {
         gamma: Column<Advice>,
         delta: Column<Advice>,
     ) -> Self {
-        meta.enable_equality(x_p.into());
-        meta.enable_equality(y_p.into());
-        meta.enable_equality(x_qr.into());
-        meta.enable_equality(y_qr.into());
+        meta.enable_equality(x_p);
+        meta.enable_equality(y_p);
+        meta.enable_equality(x_qr);
+        meta.enable_equality(y_qr);
 
         let config = Self {
             q_add: meta.selector(),
diff --git a/src/circuit/gadget/ecc/chip/add_incomplete.rs b/src/circuit/gadget/ecc/chip/add_incomplete.rs
index 470563d6..5030d3e6 100644
--- a/src/circuit/gadget/ecc/chip/add_incomplete.rs
+++ b/src/circuit/gadget/ecc/chip/add_incomplete.rs
@@ -31,10 +31,10 @@ impl Config {
         x_qr: Column<Advice>,
         y_qr: Column<Advice>,
     ) -> Self {
-        meta.enable_equality(x_p.into());
-        meta.enable_equality(y_p.into());
-        meta.enable_equality(x_qr.into());
-        meta.enable_equality(y_qr.into());
+        meta.enable_equality(x_p);
+        meta.enable_equality(y_p);
+        meta.enable_equality(x_qr);
+        meta.enable_equality(y_qr);
 
         let config = Self {
             q_add_incomplete: meta.selector(),
diff --git a/src/circuit/gadget/ecc/chip/mul/complete.rs b/src/circuit/gadget/ecc/chip/mul/complete.rs
index 3b040b23..2bf10e84 100644
--- a/src/circuit/gadget/ecc/chip/mul/complete.rs
+++ b/src/circuit/gadget/ecc/chip/mul/complete.rs
@@ -26,7 +26,7 @@ impl Config {
         z_complete: Column<Advice>,
         add_config: add::Config,
     ) -> Self {
-        meta.enable_equality(z_complete.into());
+        meta.enable_equality(z_complete);
 
         let config = Self {
             q_mul_decompose_var: meta.selector(),
diff --git a/src/circuit/gadget/ecc/chip/mul/incomplete.rs b/src/circuit/gadget/ecc/chip/mul/incomplete.rs
index 6c3bfff8..76834fbb 100644
--- a/src/circuit/gadget/ecc/chip/mul/incomplete.rs
+++ b/src/circuit/gadget/ecc/chip/mul/incomplete.rs
@@ -38,8 +38,8 @@ impl<const NUM_BITS: usize> Config<NUM_BITS> {
         lambda1: Column<Advice>,
         lambda2: Column<Advice>,
     ) -> Self {
-        meta.enable_equality(z.into());
-        meta.enable_equality(lambda1.into());
+        meta.enable_equality(z);
+        meta.enable_equality(lambda1);
 
         let config = Self {
             q_mul: (meta.selector(), meta.selector(), meta.selector()),
diff --git a/src/circuit/gadget/ecc/chip/mul/overflow.rs b/src/circuit/gadget/ecc/chip/mul/overflow.rs
index 30ab00ee..9709f347 100644
--- a/src/circuit/gadget/ecc/chip/mul/overflow.rs
+++ b/src/circuit/gadget/ecc/chip/mul/overflow.rs
@@ -32,7 +32,7 @@ impl Config {
         advices: [Column<Advice>; 3],
     ) -> Self {
         for advice in advices.iter() {
-            meta.enable_equality((*advice).into());
+            meta.enable_equality(*advice);
         }
 
         let config = Self {
diff --git a/src/circuit/gadget/ecc/chip/mul_fixed.rs b/src/circuit/gadget/ecc/chip/mul_fixed.rs
index b5e47338..e5542fa9 100644
--- a/src/circuit/gadget/ecc/chip/mul_fixed.rs
+++ b/src/circuit/gadget/ecc/chip/mul_fixed.rs
@@ -110,8 +110,8 @@ impl Config {
         add_config: add::Config,
         add_incomplete_config: add_incomplete::Config,
     ) -> Self {
-        meta.enable_equality(window.into());
-        meta.enable_equality(u.into());
+        meta.enable_equality(window);
+        meta.enable_equality(u);
 
         let q_running_sum = meta.selector();
         let running_sum_config = RunningSumConfig::configure(meta, q_running_sum, window);
diff --git a/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs b/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs
index 99eefe39..fff7b9db 100644
--- a/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs
+++ b/src/circuit/gadget/ecc/chip/mul_fixed/base_field_elem.rs
@@ -34,7 +34,7 @@ impl Config {
         super_config: super::Config,
     ) -> Self {
         for advice in canon_advices.iter() {
-            meta.enable_equality((*advice).into());
+            meta.enable_equality(*advice);
         }
 
         let config = Self {
diff --git a/src/circuit/gadget/poseidon/pow5.rs b/src/circuit/gadget/poseidon/pow5.rs
index 3eba900d..930e5247 100644
--- a/src/circuit/gadget/poseidon/pow5.rs
+++ b/src/circuit/gadget/poseidon/pow5.rs
@@ -4,7 +4,7 @@ use std::iter;
 use halo2::{
     arithmetic::FieldExt,
     circuit::{AssignedCell, Cell, Chip, Layouter, Region},
-    plonk::{Advice, Column, ConstraintSystem, Error, Expression, Fixed, Selector},
+    plonk::{Advice, Any, Column, ConstraintSystem, Error, Expression, Fixed, Selector},
     poly::Rotation,
 };
 
@@ -75,8 +75,8 @@ impl<F: FieldExt, const WIDTH: usize, const RATE: usize> Pow5Chip<F, WIDTH, RATE
         // rounds, so we use rc_b as "scratch space" for fixed values (enabling potential
         // layouter optimisations).
         for column in iter::empty()
-            .chain(state.iter().cloned().map(|c| c.into()))
-            .chain(rc_b.iter().cloned().map(|c| c.into()))
+            .chain(state.iter().cloned().map(Column::<Any>::from))
+            .chain(rc_b.iter().cloned().map(Column::<Any>::from))
         {
             meta.enable_equality(column);
         }
diff --git a/src/circuit/gadget/sinsemilla/chip.rs b/src/circuit/gadget/sinsemilla/chip.rs
index f2a7ff1e..ba80a570 100644
--- a/src/circuit/gadget/sinsemilla/chip.rs
+++ b/src/circuit/gadget/sinsemilla/chip.rs
@@ -121,7 +121,7 @@ impl SinsemillaChip {
     ) -> <Self as Chip<pallas::Base>>::Config {
         // Enable equality on all advice columns
         for advice in advices.iter() {
-            meta.enable_equality((*advice).into())
+            meta.enable_equality(*advice);
         }
 
         let config = SinsemillaConfig {
diff --git a/src/circuit/gadget/sinsemilla/commit_ivk.rs b/src/circuit/gadget/sinsemilla/commit_ivk.rs
index 16a8c905..dc98b453 100644
--- a/src/circuit/gadget/sinsemilla/commit_ivk.rs
+++ b/src/circuit/gadget/sinsemilla/commit_ivk.rs
@@ -687,7 +687,7 @@ mod tests {
                 meta.enable_constant(constants);
 
                 for advice in advices.iter() {
-                    meta.enable_equality((*advice).into());
+                    meta.enable_equality(*advice);
                 }
 
                 let table_idx = meta.lookup_table_column();
diff --git a/src/circuit/gadget/sinsemilla/note_commit.rs b/src/circuit/gadget/sinsemilla/note_commit.rs
index 9efbd4cc..d81b65d6 100644
--- a/src/circuit/gadget/sinsemilla/note_commit.rs
+++ b/src/circuit/gadget/sinsemilla/note_commit.rs
@@ -1522,7 +1522,7 @@ mod tests {
                 meta.enable_constant(constants);
 
                 for advice in advices.iter() {
-                    meta.enable_equality((*advice).into());
+                    meta.enable_equality(*advice);
                 }
 
                 let table_idx = meta.lookup_table_column();
diff --git a/src/circuit/gadget/utilities/cond_swap.rs b/src/circuit/gadget/utilities/cond_swap.rs
index 003d9ab8..d77acb44 100644
--- a/src/circuit/gadget/utilities/cond_swap.rs
+++ b/src/circuit/gadget/utilities/cond_swap.rs
@@ -143,7 +143,7 @@ impl<F: FieldExt> CondSwapChip<F> {
     ) -> CondSwapConfig {
         let a = advices[0];
         // Only column a is used in an equality constraint directly by this chip.
-        meta.enable_equality(a.into());
+        meta.enable_equality(a);
 
         let q_swap = meta.selector();
 
diff --git a/src/circuit/gadget/utilities/decompose_running_sum.rs b/src/circuit/gadget/utilities/decompose_running_sum.rs
index b9bc6f8a..a7ccfd70 100644
--- a/src/circuit/gadget/utilities/decompose_running_sum.rs
+++ b/src/circuit/gadget/utilities/decompose_running_sum.rs
@@ -70,7 +70,7 @@ impl<F: FieldExt + PrimeFieldBits, const WINDOW_NUM_BITS: usize>
     ) -> Self {
         assert!(WINDOW_NUM_BITS <= 3);
 
-        meta.enable_equality(z.into());
+        meta.enable_equality(z);
 
         let config = Self {
             q_range_check,
diff --git a/src/circuit/gadget/utilities/lookup_range_check.rs b/src/circuit/gadget/utilities/lookup_range_check.rs
index 04596ff5..2d4a99df 100644
--- a/src/circuit/gadget/utilities/lookup_range_check.rs
+++ b/src/circuit/gadget/utilities/lookup_range_check.rs
@@ -50,7 +50,7 @@ impl<F: FieldExt + PrimeFieldBits, const K: usize> LookupRangeCheckConfig<F, K>
         running_sum: Column<Advice>,
         table_idx: TableColumn,
     ) -> Self {
-        meta.enable_equality(running_sum.into());
+        meta.enable_equality(running_sum);
 
         let q_lookup = meta.complex_selector();
         let q_running = meta.complex_selector();