diff --git a/src/database/map/get.rs b/src/database/map/get.rs
index 3ee2a194..24649175 100644
--- a/src/database/map/get.rs
+++ b/src/database/map/get.rs
@@ -38,7 +38,7 @@ where
 /// Fetch a value from the database into cache, returning a reference-handle
 /// asynchronously. The key is serialized into a user-supplied Writer.
 #[implement(super::Map)]
-#[tracing::instrument(skip(self, buf), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, buf), level = "trace")]
 pub fn bqry<K, B>(&self, key: &K, buf: &mut B) -> impl Future<Output = Result<Handle<'_>>> + Send
 where
 	K: Serialize + ?Sized + Debug,
diff --git a/src/database/map/insert.rs b/src/database/map/insert.rs
index b8b08b34..9bebe7cf 100644
--- a/src/database/map/insert.rs
+++ b/src/database/map/insert.rs
@@ -149,6 +149,7 @@ where
 /// - Key is serialized to supplied buffer
 /// - Val is raw
 #[implement(super::Map)]
+#[tracing::instrument(skip(self, val, buf), level = "trace")]
 pub fn bput_raw<K, V, Bk>(&self, key: K, val: V, mut buf: Bk)
 where
 	K: Serialize + Debug,
diff --git a/src/database/map/keys.rs b/src/database/map/keys.rs
index 2396494c..9c4d66e4 100644
--- a/src/database/map/keys.rs
+++ b/src/database/map/keys.rs
@@ -5,7 +5,6 @@ use serde::Deserialize;
 use crate::{keyval, keyval::Key, stream};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn keys<'a, K>(&'a self) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/keys_from.rs b/src/database/map/keys_from.rs
index 4eb3b12e..630bf3fb 100644
--- a/src/database/map/keys_from.rs
+++ b/src/database/map/keys_from.rs
@@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize};
 use crate::{keyval, keyval::Key, ser, stream};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn keys_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -18,7 +17,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn keys_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -28,7 +27,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn keys_raw_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -39,7 +37,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
 pub fn raw_keys_from<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
diff --git a/src/database/map/keys_prefix.rs b/src/database/map/keys_prefix.rs
index 0ff755f3..df214af4 100644
--- a/src/database/map/keys_prefix.rs
+++ b/src/database/map/keys_prefix.rs
@@ -11,7 +11,6 @@ use serde::{Deserialize, Serialize};
 use crate::{keyval, keyval::Key, ser};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn keys_prefix<'a, K, P>(&'a self, prefix: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -22,7 +21,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn keys_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -33,7 +32,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn keys_raw_prefix<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -44,7 +42,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn raw_keys_prefix<'a, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
diff --git a/src/database/map/remove.rs b/src/database/map/remove.rs
index 42eaa477..949817a0 100644
--- a/src/database/map/remove.rs
+++ b/src/database/map/remove.rs
@@ -25,7 +25,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self, buf), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, buf), level = "trace")]
 pub fn bdel<K, B>(&self, key: K, buf: &mut B)
 where
 	K: Serialize + Debug,
diff --git a/src/database/map/rev_keys.rs b/src/database/map/rev_keys.rs
index 449ccfff..e10a199c 100644
--- a/src/database/map/rev_keys.rs
+++ b/src/database/map/rev_keys.rs
@@ -5,7 +5,6 @@ use serde::Deserialize;
 use crate::{keyval, keyval::Key, stream};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_keys<'a, K>(&'a self) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/rev_keys_from.rs b/src/database/map/rev_keys_from.rs
index b142718c..c1c6f3da 100644
--- a/src/database/map/rev_keys_from.rs
+++ b/src/database/map/rev_keys_from.rs
@@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize};
 use crate::{keyval, keyval::Key, ser, stream};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_keys_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -18,7 +17,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn rev_keys_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -28,7 +27,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_keys_raw_from<'a, K, P>(&'a self, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -39,7 +37,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
 pub fn rev_raw_keys_from<P>(&self, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
diff --git a/src/database/map/rev_keys_prefix.rs b/src/database/map/rev_keys_prefix.rs
index 5297cecf..957b974e 100644
--- a/src/database/map/rev_keys_prefix.rs
+++ b/src/database/map/rev_keys_prefix.rs
@@ -11,7 +11,6 @@ use serde::{Deserialize, Serialize};
 use crate::{keyval, keyval::Key, ser};
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_keys_prefix<'a, K, P>(&'a self, prefix: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -22,7 +21,7 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn rev_keys_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -33,7 +32,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_keys_raw_prefix<'a, K, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -44,7 +42,6 @@ where
 }
 
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_raw_keys_prefix<'a, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
diff --git a/src/database/map/rev_stream.rs b/src/database/map/rev_stream.rs
index de22fd5c..f4be69fd 100644
--- a/src/database/map/rev_stream.rs
+++ b/src/database/map/rev_stream.rs
@@ -8,7 +8,6 @@ use crate::{keyval, keyval::KeyVal, stream};
 ///
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_stream<'a, K, V>(&'a self) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/rev_stream_from.rs b/src/database/map/rev_stream_from.rs
index 78318a7f..7ef25ee0 100644
--- a/src/database/map/rev_stream_from.rs
+++ b/src/database/map/rev_stream_from.rs
@@ -11,7 +11,6 @@ use crate::{keyval, keyval::KeyVal, ser, stream};
 /// - Query is serialized
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_stream_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -27,7 +26,7 @@ where
 /// - Query is serialized
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn rev_stream_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -41,7 +40,6 @@ where
 /// - Query is raw
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_stream_raw_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -57,7 +55,7 @@ where
 /// - Query is raw
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
 pub fn rev_raw_stream_from<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
diff --git a/src/database/map/rev_stream_prefix.rs b/src/database/map/rev_stream_prefix.rs
index 601c3298..286cedca 100644
--- a/src/database/map/rev_stream_prefix.rs
+++ b/src/database/map/rev_stream_prefix.rs
@@ -15,7 +15,6 @@ use crate::{keyval, keyval::KeyVal, ser};
 /// - Query is serialized
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_stream_prefix<'a, K, V, P>(&'a self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -31,7 +30,7 @@ where
 /// - Query is serialized
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn rev_stream_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -46,7 +45,6 @@ where
 /// - Query is raw
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_stream_raw_prefix<'a, K, V, P>(
 	&'a self, prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
@@ -64,7 +62,6 @@ where
 /// - Query is raw
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_raw_stream_prefix<'a, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
diff --git a/src/database/map/stream.rs b/src/database/map/stream.rs
index dfbea072..143b0d0c 100644
--- a/src/database/map/stream.rs
+++ b/src/database/map/stream.rs
@@ -8,7 +8,6 @@ use crate::{keyval, keyval::KeyVal, stream};
 ///
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn stream<'a, K, V>(&'a self) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	K: Deserialize<'a> + Send,
diff --git a/src/database/map/stream_from.rs b/src/database/map/stream_from.rs
index 0d3bb1e1..fe89afe1 100644
--- a/src/database/map/stream_from.rs
+++ b/src/database/map/stream_from.rs
@@ -11,7 +11,6 @@ use crate::{keyval, keyval::KeyVal, ser, stream};
 /// - Query is serialized
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn stream_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -27,7 +26,7 @@ where
 /// - Query is serialized
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn stream_from_raw<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -41,7 +40,6 @@ where
 /// - Query is raw
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn stream_raw_from<'a, K, V, P>(&'a self, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -57,7 +55,7 @@ where
 /// - Query is raw
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
 pub fn raw_stream_from<P>(&self, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
diff --git a/src/database/map/stream_prefix.rs b/src/database/map/stream_prefix.rs
index cab3dd09..ca4cfeaa 100644
--- a/src/database/map/stream_prefix.rs
+++ b/src/database/map/stream_prefix.rs
@@ -15,7 +15,6 @@ use crate::{keyval, keyval::KeyVal, ser};
 /// - Query is serialized
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn stream_prefix<'a, K, V, P>(&'a self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -31,7 +30,7 @@ where
 /// - Query is serialized
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
+#[tracing::instrument(skip(self), level = "trace")]
 pub fn stream_prefix_raw<P>(&self, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -46,7 +45,6 @@ where
 /// - Query is raw
 /// - Result is deserialized
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn stream_raw_prefix<'a, K, V, P>(
 	&'a self, prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
@@ -64,7 +62,6 @@ where
 /// - Query is raw
 /// - Result is raw
 #[implement(super::Map)]
-#[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn raw_stream_prefix<'a, P>(&'a self, prefix: &'a P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,