diff --git a/src/simd/generic.rs b/src/simd/generic.rs
index 1772659..a25d08f 100644
--- a/src/simd/generic.rs
+++ b/src/simd/generic.rs
@@ -111,9 +111,9 @@ where
 /// - `impl_SIMDInit_Int!`
 ///     - called in the `simd_i*.rs` files
 ///     - called in the `simd_u*.rs` files
-/// - `impl_SIMDInit_FloatIgnoreNaN!`
-///     - see the `simd_f*_return_nan.rs` files
 /// - `impl_SIMDInit_FloatReturnNaN!`
+///     - see the `simd_f*_return_nan.rs` files
+/// - `impl_SIMDInit_FloatIgnoreNaN!`
 ///     - see the `simd_f*_ignore_nan.rs` files
 ///
 /// The current (default) implementation is for the Int case - see `impl_SIMDInit_Int!`
@@ -250,7 +250,7 @@ pub(crate) use impl_SIMDInit_FloatReturnNaN; // Now classic paths Just Work™
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
-    all(target_arch = "aarch64", feature = "float"), // is stable for f64
+    target_arch = "aarch64", // is stable for f64
     feature = "nightly_simd"
 ))]
 macro_rules! impl_SIMDInit_FloatIgnoreNaN {
@@ -326,7 +326,7 @@ macro_rules! impl_SIMDInit_FloatIgnoreNaN {
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
-    all(target_arch = "aarch64", feature = "float"), // is stable for f64
+    target_arch = "aarch64", // is stable for f64
     feature = "nightly_simd"
 ))]
 pub(crate) use impl_SIMDInit_FloatIgnoreNaN; // Now classic paths Just Work™
diff --git a/src/simd/simd_i16.rs b/src/simd/simd_i16.rs
index 070cc1a..0d6244b 100644
--- a/src/simd/simd_i16.rs
+++ b/src/simd/simd_i16.rs
@@ -2,21 +2,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -33,7 +33,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
@@ -41,7 +41,7 @@ use super::super::dtype_strategy::Int;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 const MAX_INDEX: usize = i16::MAX as usize;
 
diff --git a/src/simd/simd_i32.rs b/src/simd/simd_i32.rs
index 9f4a583..3adc5eb 100644
--- a/src/simd/simd_i32.rs
+++ b/src/simd/simd_i32.rs
@@ -2,21 +2,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -33,7 +33,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
@@ -41,7 +41,7 @@ use super::super::dtype_strategy::Int;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 const MAX_INDEX: usize = i32::MAX as usize;
 
diff --git a/src/simd/simd_i64.rs b/src/simd/simd_i64.rs
index 51ce33a..a872905 100644
--- a/src/simd/simd_i64.rs
+++ b/src/simd/simd_i64.rs
@@ -6,14 +6,14 @@ use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int};
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -28,7 +28,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
diff --git a/src/simd/simd_i8.rs b/src/simd/simd_i8.rs
index e39bcb4..d260213 100644
--- a/src/simd/simd_i8.rs
+++ b/src/simd/simd_i8.rs
@@ -2,21 +2,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -33,7 +33,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
@@ -41,7 +41,7 @@ use super::super::dtype_strategy::Int;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 const MAX_INDEX: usize = i8::MAX as usize;
 
diff --git a/src/simd/simd_u16.rs b/src/simd/simd_u16.rs
index c7e11c2..6109755 100644
--- a/src/simd/simd_u16.rs
+++ b/src/simd/simd_u16.rs
@@ -14,21 +14,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -45,7 +45,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
diff --git a/src/simd/simd_u32.rs b/src/simd/simd_u32.rs
index bfed002..0a26263 100644
--- a/src/simd/simd_u32.rs
+++ b/src/simd/simd_u32.rs
@@ -14,21 +14,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -45,7 +45,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
diff --git a/src/simd/simd_u64.rs b/src/simd/simd_u64.rs
index dad4f0f..82133e2 100644
--- a/src/simd/simd_u64.rs
+++ b/src/simd/simd_u64.rs
@@ -19,14 +19,14 @@ use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int};
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -41,7 +41,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;
 
diff --git a/src/simd/simd_u8.rs b/src/simd/simd_u8.rs
index 38a6f07..11c2ad8 100644
--- a/src/simd/simd_u8.rs
+++ b/src/simd/simd_u8.rs
@@ -14,21 +14,21 @@
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::config::SIMDInstructionSet;
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::generic::{impl_SIMDArgMinMax, impl_SIMDInit_Int, SIMDArgMinMax, SIMDInit, SIMDOps};
 #[cfg(any(
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use crate::SCALAR;
 #[cfg(target_arch = "aarch64")]
@@ -45,7 +45,7 @@ use std::arch::x86_64::*;
     target_arch = "x86",
     target_arch = "x86_64",
     target_arch = "aarch64",
-    feature = "nightly_simd"
+    all(target_arch = "arm", feature = "nightly_simd"),
 ))]
 use super::super::dtype_strategy::Int;