diff --git a/include/boost/unordered/detail/foa.hpp b/include/boost/unordered/detail/foa.hpp
index cfbdcf57..db09234a 100644
--- a/include/boost/unordered/detail/foa.hpp
+++ b/include/boost/unordered/detail/foa.hpp
@@ -1970,7 +1970,8 @@ private:
       p,hash_for(key_from(*p)),arrays_,num_destroyed,
       std::integral_constant< /* std::move_if_noexcept semantics */
         bool,
-        std::is_nothrow_move_constructible<storage_type>::value||
+        std::is_nothrow_move_constructible<init_type>::value||
+        std::is_same<storage_type,value_type*>::value||
         !std::is_copy_constructible<storage_type>::value>{});
   }
 
diff --git a/include/boost/unordered/unordered_flat_map.hpp b/include/boost/unordered/unordered_flat_map.hpp
index 71f9d914..2e43453d 100644
--- a/include/boost/unordered/unordered_flat_map.hpp
+++ b/include/boost/unordered/unordered_flat_map.hpp
@@ -43,8 +43,7 @@ namespace boost {
         using moved_type = std::pair<raw_key_type&&, raw_mapped_type&&>;
         using value_type = std::pair<Key const, T>;
 
-        using emplace_type = value_type;
-        using storage_type = std::pair<Key const, T>;
+        using storage_type = value_type;
 
         template <class K, class V>
         static raw_key_type const& extract(std::pair<K, V> const& kv)
diff --git a/include/boost/unordered/unordered_flat_set.hpp b/include/boost/unordered/unordered_flat_set.hpp
index 8c0f2caf..343a8675 100644
--- a/include/boost/unordered/unordered_flat_set.hpp
+++ b/include/boost/unordered/unordered_flat_set.hpp
@@ -37,7 +37,6 @@ namespace boost {
         using init_type = Key;
         using value_type = Key;
 
-        using emplace_type = value_type;
         using storage_type = Key;
 
         static Key const& extract(value_type const& key) { return key; }
diff --git a/include/boost/unordered/unordered_node_map.hpp b/include/boost/unordered/unordered_node_map.hpp
index fd570c76..cb3e995f 100644
--- a/include/boost/unordered/unordered_node_map.hpp
+++ b/include/boost/unordered/unordered_node_map.hpp
@@ -44,7 +44,6 @@ namespace boost {
         using moved_type = std::pair<Key const, T>*;
         using value_type = std::pair<Key const, T>;
 
-        using emplace_type = value_type;
         using storage_type = value_type*;
 
         template <class K, class V>