diff --git a/build-helper.rs b/build-helper.rs
index 617e3ea..9dffaf8 100644
--- a/build-helper.rs
+++ b/build-helper.rs
@@ -86,7 +86,7 @@ impl Default for LoreVergen {
             warning = revision_info.warning;
         }
 
-        LoreVergen {
+        Self {
             lore_library_version_name: format!("{package_version}+{lib_version}"),
             warning,
         }
diff --git a/lore-aws/src/clients.rs b/lore-aws/src/clients.rs
index 3f1bdc9..ea5405d 100644
--- a/lore-aws/src/clients.rs
+++ b/lore-aws/src/clients.rs
@@ -73,7 +73,7 @@ pub struct TaskQueueSettings {
 
 impl Default for TaskQueueSettings {
     fn default() -> Self {
-        TaskQueueSettings {
+        Self {
             quota_per_second: default_quota_per_second(),
             concurrency_limit: default_concurrency_limit(),
             submission_limit: default_submission_limit(),
@@ -251,7 +251,7 @@ pub struct WantsTables {
 }
 
 impl AwsClientBuilder<WantsTables> {
-    pub fn ensure_table(mut self, table_name: impl Into<String>) -> AwsClientBuilder<WantsTables> {
+    pub fn ensure_table(mut self, table_name: impl Into<String>) -> Self {
         self.0.tables.push(table_name.into());
 
         self
@@ -294,7 +294,7 @@ pub struct WantsBuckets {
 }
 
 impl AwsClientBuilder<WantsBuckets> {
-    pub fn ensure_bucket(mut self, bucket: impl Into<String>) -> AwsClientBuilder<WantsBuckets> {
+    pub fn ensure_bucket(mut self, bucket: impl Into<String>) -> Self {
         self.0.buckets.push(bucket.into());
 
         self
diff --git a/lore-aws/src/store/immutable_store.rs b/lore-aws/src/store/immutable_store.rs
index 9fcd6ff..0971d44 100644
--- a/lore-aws/src/store/immutable_store.rs
+++ b/lore-aws/src/store/immutable_store.rs
@@ -75,7 +75,7 @@ struct FragmentsEntry {
 
 impl From<&FragmentsEntry> for Address {
     fn from(value: &FragmentsEntry) -> Self {
-        Address {
+        Self {
             hash: value.hash,
             context: Context::from(&value.repository_context[size_of::<Context>()..]),
         }
@@ -233,14 +233,14 @@ enum FragmentsQuery {
 impl DynamoDbQuery for FragmentsQuery {
     fn key_condition_expression(&self) -> &str {
         match self {
-            FragmentsQuery::Repository(_, _) => "#pk = :hash and begins_with(#sk, :repository)",
-            FragmentsQuery::Hash(_) | FragmentsQuery::HashCount(_) => "#pk = :hash",
+            Self::Repository(_, _) => "#pk = :hash and begins_with(#sk, :repository)",
+            Self::Hash(_) | Self::HashCount(_) => "#pk = :hash",
         }
     }
 
     fn expression_attribute_names(&self) -> HashMap<String, String> {
         match self {
-            FragmentsQuery::Repository(_, _) => HashMap::from([
+            Self::Repository(_, _) => HashMap::from([
                 (
                     "#pk".to_string(),
                     FRAGMENTS_DYNAMO_PARTITION_KEY_ATTRIBUTE.to_string(),
@@ -250,7 +250,7 @@ impl DynamoDbQuery for FragmentsQuery {
                     FRAGMENTS_DYNAMO_SORT_KEY_ATTRIBUTE.to_string(),
                 ),
             ]),
-            FragmentsQuery::Hash(_) | FragmentsQuery::HashCount(_) => HashMap::from([(
+            Self::Hash(_) | Self::HashCount(_) => HashMap::from([(
                 "#pk".to_string(),
                 FRAGMENTS_DYNAMO_PARTITION_KEY_ATTRIBUTE.to_string(),
             )]),
@@ -259,7 +259,7 @@ impl DynamoDbQuery for FragmentsQuery {
 
     fn expression_attribute_values(&self) -> HashMap<String, AttributeValue> {
         match self {
-            FragmentsQuery::Repository(hash, repository) => HashMap::from([
+            Self::Repository(hash, repository) => HashMap::from([
                 (
                     ":hash".to_string(),
                     AttributeValue::B(Blob::new(hash.data())),
@@ -269,7 +269,7 @@ impl DynamoDbQuery for FragmentsQuery {
                     AttributeValue::B(Blob::new(repository.data())),
                 ),
             ]),
-            FragmentsQuery::Hash(hash) | FragmentsQuery::HashCount(hash) => HashMap::from([(
+            Self::Hash(hash) | Self::HashCount(hash) => HashMap::from([(
                 ":hash".to_string(),
                 AttributeValue::B(Blob::new(hash.data())),
             )]),
@@ -278,20 +278,20 @@ impl DynamoDbQuery for FragmentsQuery {
 
     fn limit(&self) -> Option<i32> {
         match self {
-            FragmentsQuery::Repository(_, _) | FragmentsQuery::Hash(_) => Some(1),
-            FragmentsQuery::HashCount(_) => None,
+            Self::Repository(_, _) | Self::Hash(_) => Some(1),
+            Self::HashCount(_) => None,
         }
     }
 
     fn select(&self) -> Option<Select> {
         match self {
-            FragmentsQuery::Repository(_, _) | FragmentsQuery::Hash(_) => None,
-            FragmentsQuery::HashCount(_) => Some(Select::Count),
+            Self::Repository(_, _) | Self::Hash(_) => None,
+            Self::HashCount(_) => Some(Select::Count),
         }
     }
 
     fn consistent_read(&self) -> bool {
-        matches!(self, FragmentsQuery::HashCount(_))
+        matches!(self, Self::HashCount(_))
     }
 }
 
diff --git a/lore-aws/src/store/lock_store.rs b/lore-aws/src/store/lock_store.rs
index 068801b..dfa39b0 100644
--- a/lore-aws/src/store/lock_store.rs
+++ b/lore-aws/src/store/lock_store.rs
@@ -139,30 +139,26 @@ impl std::fmt::Debug for LockKey {
 impl DynamoDbQuery for LockQuery {
     fn index_name(&self) -> Option<String> {
         match self {
-            LockQuery::Owner(_)
-            | LockQuery::OwnerRepository(_, _)
-            | LockQuery::OwnerRepositoryBranch(_, _, _) => Some(OWNER_REPO_BRANCH_GSI.to_string()),
-            LockQuery::Repository(_) | LockQuery::RepositoryBranch(_, _) => {
-                Some(REPO_BRANCH_GSI.to_string())
-            }
-            LockQuery::RepositoryBranchDescription(_, _, _) => {
-                Some(REPO_BRANCH_DESC_GSI.to_string())
+            Self::Owner(_) | Self::OwnerRepository(_, _) | Self::OwnerRepositoryBranch(_, _, _) => {
+                Some(OWNER_REPO_BRANCH_GSI.to_string())
             }
+            Self::Repository(_) | Self::RepositoryBranch(_, _) => Some(REPO_BRANCH_GSI.to_string()),
+            Self::RepositoryBranchDescription(_, _, _) => Some(REPO_BRANCH_DESC_GSI.to_string()),
             _ => None,
         }
     }
 
     fn key_condition_expression(&self) -> &str {
         match self {
-            LockQuery::Hash(_) => "#pk = :hash",
-            LockQuery::HashRepository(_, _) => "#pk = :hash and begins_with(#sk, :repo)",
-            LockQuery::HashRepositoryBranch(_, _, _) => "#pk = :hash and #sk = :repoBranch",
-            LockQuery::Owner(_) => "#pk = :owner",
-            LockQuery::OwnerRepository(_, _) => "#pk = :owner and begins_with(#sk, :repo)",
-            LockQuery::OwnerRepositoryBranch(_, _, _) => "#pk = :owner and #sk = :repoBranch",
-            LockQuery::Repository(_) => "#pk = :repo",
-            LockQuery::RepositoryBranch(_, _) => "#pk = :repo and #sk = :branch",
-            LockQuery::RepositoryBranchDescription(_, _, _) => {
+            Self::Hash(_) => "#pk = :hash",
+            Self::HashRepository(_, _) => "#pk = :hash and begins_with(#sk, :repo)",
+            Self::HashRepositoryBranch(_, _, _) => "#pk = :hash and #sk = :repoBranch",
+            Self::Owner(_) => "#pk = :owner",
+            Self::OwnerRepository(_, _) => "#pk = :owner and begins_with(#sk, :repo)",
+            Self::OwnerRepositoryBranch(_, _, _) => "#pk = :owner and #sk = :repoBranch",
+            Self::Repository(_) => "#pk = :repo",
+            Self::RepositoryBranch(_, _) => "#pk = :repo and #sk = :branch",
+            Self::RepositoryBranchDescription(_, _, _) => {
                 "#pk = :repoBranch and #sk = :description"
             }
         }
@@ -170,26 +166,22 @@ impl DynamoDbQuery for LockQuery {
 
     fn expression_attribute_names(&self) -> HashMap<String, String> {
         match self {
-            LockQuery::Hash(_) => HashMap::from([("#pk".to_string(), HASH_KEY.to_string())]),
-            LockQuery::HashRepository(_, _) | LockQuery::HashRepositoryBranch(_, _, _) => {
-                HashMap::from([
-                    ("#pk".to_string(), HASH_KEY.to_string()),
-                    ("#sk".to_string(), REPO_BRANCH_KEY.to_string()),
-                ])
-            }
-            LockQuery::Owner(_) => HashMap::from([("#pk".to_string(), OWNER_KEY.to_string())]),
-            LockQuery::OwnerRepository(_, _) | LockQuery::OwnerRepositoryBranch(_, _, _) => {
-                HashMap::from([
-                    ("#pk".to_string(), OWNER_KEY.to_string()),
-                    ("#sk".to_string(), REPO_BRANCH_KEY.to_string()),
-                ])
-            }
-            LockQuery::Repository(_) => HashMap::from([("#pk".to_string(), REPO_KEY.to_string())]),
-            LockQuery::RepositoryBranch(_, _) => HashMap::from([
+            Self::Hash(_) => HashMap::from([("#pk".to_string(), HASH_KEY.to_string())]),
+            Self::HashRepository(_, _) | Self::HashRepositoryBranch(_, _, _) => HashMap::from([
+                ("#pk".to_string(), HASH_KEY.to_string()),
+                ("#sk".to_string(), REPO_BRANCH_KEY.to_string()),
+            ]),
+            Self::Owner(_) => HashMap::from([("#pk".to_string(), OWNER_KEY.to_string())]),
+            Self::OwnerRepository(_, _) | Self::OwnerRepositoryBranch(_, _, _) => HashMap::from([
+                ("#pk".to_string(), OWNER_KEY.to_string()),
+                ("#sk".to_string(), REPO_BRANCH_KEY.to_string()),
+            ]),
+            Self::Repository(_) => HashMap::from([("#pk".to_string(), REPO_KEY.to_string())]),
+            Self::RepositoryBranch(_, _) => HashMap::from([
                 ("#pk".to_string(), REPO_KEY.to_string()),
                 ("#sk".to_string(), BRANCH_KEY.to_string()),
             ]),
-            LockQuery::RepositoryBranchDescription(_, _, _) => HashMap::from([
+            Self::RepositoryBranchDescription(_, _, _) => HashMap::from([
                 ("#pk".to_string(), REPO_BRANCH_KEY.to_string()),
                 ("#sk".to_string(), DESC_KEY.to_string()),
             ]),
@@ -198,11 +190,11 @@ impl DynamoDbQuery for LockQuery {
 
     fn expression_attribute_values(&self) -> HashMap<String, AttributeValue> {
         match self {
-            LockQuery::Hash(hash) => HashMap::from([(
+            Self::Hash(hash) => HashMap::from([(
                 ":hash".to_string(),
                 AttributeValue::B(Blob::new(hash.as_bytes())),
             )]),
-            LockQuery::HashRepository(hash, repository) => HashMap::from([
+            Self::HashRepository(hash, repository) => HashMap::from([
                 (
                     ":hash".to_string(),
                     AttributeValue::B(Blob::new(hash.as_bytes())),
@@ -212,7 +204,7 @@ impl DynamoDbQuery for LockQuery {
                     AttributeValue::B(Blob::new(repository.as_bytes())),
                 ),
             ]),
-            LockQuery::HashRepositoryBranch(hash, repository, branch) => HashMap::from([
+            Self::HashRepositoryBranch(hash, repository, branch) => HashMap::from([
                 (
                     ":hash".to_string(),
                     AttributeValue::B(Blob::new(hash.as_bytes())),
@@ -229,17 +221,17 @@ impl DynamoDbQuery for LockQuery {
                     )),
                 ),
             ]),
-            LockQuery::Owner(owner) => {
+            Self::Owner(owner) => {
                 HashMap::from([(":owner".to_string(), AttributeValue::S(owner.clone()))])
             }
-            LockQuery::OwnerRepository(owner, repository) => HashMap::from([
+            Self::OwnerRepository(owner, repository) => HashMap::from([
                 (":owner".to_string(), AttributeValue::S(owner.clone())),
                 (
                     ":repo".to_string(),
                     AttributeValue::B(Blob::new(repository.as_bytes())),
                 ),
             ]),
-            LockQuery::OwnerRepositoryBranch(owner, repository, branch) => HashMap::from([
+            Self::OwnerRepositoryBranch(owner, repository, branch) => HashMap::from([
                 (":owner".to_string(), AttributeValue::S(owner.clone())),
                 (
                     ":repoBranch".to_string(),
@@ -253,11 +245,11 @@ impl DynamoDbQuery for LockQuery {
                     )),
                 ),
             ]),
-            LockQuery::Repository(repository) => HashMap::from([(
+            Self::Repository(repository) => HashMap::from([(
                 ":repo".to_string(),
                 AttributeValue::B(Blob::new(repository.as_bytes())),
             )]),
-            LockQuery::RepositoryBranch(repository, branch) => HashMap::from([
+            Self::RepositoryBranch(repository, branch) => HashMap::from([
                 (
                     ":repo".to_string(),
                     AttributeValue::B(Blob::new(repository.as_bytes())),
@@ -267,25 +259,23 @@ impl DynamoDbQuery for LockQuery {
                     AttributeValue::B(Blob::new(branch.as_bytes())),
                 ),
             ]),
-            LockQuery::RepositoryBranchDescription(repository, branch, description) => {
-                HashMap::from([
-                    (
-                        ":repoBranch".to_string(),
-                        AttributeValue::B(Blob::new(
-                            repository
-                                .data()
-                                .iter()
-                                .chain(branch.data().iter())
-                                .copied()
-                                .collect::<Vec<u8>>(),
-                        )),
-                    ),
-                    (
-                        ":description".to_string(),
-                        AttributeValue::S(description.clone()),
-                    ),
-                ])
-            }
+            Self::RepositoryBranchDescription(repository, branch, description) => HashMap::from([
+                (
+                    ":repoBranch".to_string(),
+                    AttributeValue::B(Blob::new(
+                        repository
+                            .data()
+                            .iter()
+                            .chain(branch.data().iter())
+                            .copied()
+                            .collect::<Vec<u8>>(),
+                    )),
+                ),
+                (
+                    ":description".to_string(),
+                    AttributeValue::S(description.clone()),
+                ),
+            ]),
         }
     }
 }
diff --git a/lore-base/src/fs/lock.rs b/lore-base/src/fs/lock.rs
index aac6b62..57832e2 100644
--- a/lore-base/src/fs/lock.rs
+++ b/lore-base/src/fs/lock.rs
@@ -16,7 +16,7 @@ pub struct FSLock {
 }
 
 impl FSLock {
-    pub fn acquire_file_lock(path: impl AsRef<Path>) -> std::io::Result<FSLock> {
+    pub fn acquire_file_lock(path: impl AsRef<Path>) -> std::io::Result<Self> {
         let mut path = path.as_ref().to_path_buf();
         let mut file_name = path
             .file_name()
@@ -33,12 +33,12 @@ impl FSLock {
         })
     }
 
-    pub fn acquire_directory_lock(path: impl AsRef<Path>) -> std::io::Result<FSLock> {
+    pub fn acquire_directory_lock(path: impl AsRef<Path>) -> std::io::Result<Self> {
         let path = path.as_ref().canonicalize()?.join("lock");
         Self::acquire_exact_path(&path)
     }
 
-    fn acquire_exact_path(path: impl AsRef<Path> + Copy) -> std::io::Result<FSLock> {
+    fn acquire_exact_path(path: impl AsRef<Path> + Copy) -> std::io::Result<Self> {
         let mut retry = 2;
         let file = loop {
             let file = OpenOptions::new()
diff --git a/lore-base/src/runtime.rs b/lore-base/src/runtime.rs
index 59ad743..40f65f9 100644
--- a/lore-base/src/runtime.rs
+++ b/lore-base/src/runtime.rs
@@ -545,7 +545,7 @@ pub struct TokioSettings {
 
 impl Default for TokioSettings {
     fn default() -> Self {
-        TokioSettings {
+        Self {
             max_blocking_threads: default_blocking_threads(),
             thread_keep_alive_seconds: default_thread_keep_alive(),
             worker_threads: None,
diff --git a/lore-base/src/types/fragment_flags.rs b/lore-base/src/types/fragment_flags.rs
index 19a28ec..1c3461e 100644
--- a/lore-base/src/types/fragment_flags.rs
+++ b/lore-base/src/types/fragment_flags.rs
@@ -52,7 +52,7 @@ impl From<FragmentFlags> for u32 {
 
 impl From<u32> for FragmentFlags {
     fn from(value: u32) -> Self {
-        FragmentFlags::from_bits_truncate(value)
+        Self::from_bits_truncate(value)
     }
 }
 
@@ -65,7 +65,7 @@ impl std::cmp::PartialEq<FragmentFlags> for u32 {
 impl std::ops::BitAnd<FragmentFlags> for u32 {
     type Output = Self;
 
-    fn bitand(self, rhs: FragmentFlags) -> u32 {
+    fn bitand(self, rhs: FragmentFlags) -> Self {
         self & rhs.bits()
     }
 }
@@ -79,7 +79,7 @@ impl std::ops::BitAndAssign<FragmentFlags> for u32 {
 impl std::ops::BitOr<FragmentFlags> for u32 {
     type Output = Self;
 
-    fn bitor(self, rhs: FragmentFlags) -> u32 {
+    fn bitor(self, rhs: FragmentFlags) -> Self {
         self | rhs.bits()
     }
 }
diff --git a/lore-base/src/types/mod.rs b/lore-base/src/types/mod.rs
index a6fbbc6..3301b42 100644
--- a/lore-base/src/types/mod.rs
+++ b/lore-base/src/types/mod.rs
@@ -339,7 +339,7 @@ pub fn validate_fragment_response(fragment: &Fragment) -> Result<(), &'static st
 
 impl From<Hash> for Bytes {
     fn from(hash: Hash) -> Self {
-        Bytes::from_owner(hash.data)
+        Self::from_owner(hash.data)
     }
 }
 
@@ -357,7 +357,7 @@ impl From<Hash> for [u8; 32] {
 
 impl From<[u8; 32]> for Hash {
     fn from(data: [u8; 32]) -> Self {
-        Hash { data }
+        Self { data }
     }
 }
 
@@ -375,25 +375,25 @@ impl From<&Bytes> for Hash {
 
 impl From<&[u8]> for Hash {
     fn from(bytes: &[u8]) -> Self {
-        Hash::read_from_prefix(bytes).unwrap_or_default().0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
-impl From<&[u8; size_of::<Hash>()]> for Hash {
-    fn from(bytes: &[u8; size_of::<Hash>()]) -> Self {
-        Hash::read_from_bytes(bytes).unwrap_or_default()
+impl From<&[u8; size_of::<Self>()]> for Hash {
+    fn from(bytes: &[u8; size_of::<Self>()]) -> Self {
+        Self::read_from_bytes(bytes).unwrap_or_default()
     }
 }
 
 impl From<[u8; 16]> for Context {
     fn from(data: [u8; 16]) -> Self {
-        Context { data }
+        Self { data }
     }
 }
 
 impl From<Context> for Bytes {
     fn from(context: Context) -> Self {
-        Bytes::from_owner(context.data)
+        Self::from_owner(context.data)
     }
 }
 
@@ -411,7 +411,7 @@ impl From<&Bytes> for Context {
 
 impl From<&[u8]> for Context {
     fn from(bytes: &[u8]) -> Self {
-        Context::read_from_prefix(bytes).unwrap_or_default().0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
@@ -421,9 +421,9 @@ impl AsRef<[u8]> for Context {
     }
 }
 
-impl From<&[u8; size_of::<Context>()]> for Context {
-    fn from(bytes: &[u8; size_of::<Context>()]) -> Self {
-        Context::read_from_bytes(bytes).unwrap_or_default()
+impl From<&[u8; size_of::<Self>()]> for Context {
+    fn from(bytes: &[u8; size_of::<Self>()]) -> Self {
+        Self::read_from_bytes(bytes).unwrap_or_default()
     }
 }
 
@@ -441,13 +441,13 @@ impl From<uuid::Uuid> for Context {
 
 impl From<&Context> for uuid::Uuid {
     fn from(context: &Context) -> Self {
-        uuid::Uuid::from_bytes(context.data)
+        Self::from_bytes(context.data)
     }
 }
 
 impl From<Context> for uuid::Uuid {
     fn from(context: Context) -> Self {
-        uuid::Uuid::from_bytes(context.data)
+        Self::from_bytes(context.data)
     }
 }
 
@@ -459,7 +459,7 @@ impl From<Context> for [u8; 16] {
 
 impl From<Partition> for Bytes {
     fn from(partition: Partition) -> Self {
-        Bytes::from_owner(partition.data)
+        Self::from_owner(partition.data)
     }
 }
 
@@ -471,7 +471,7 @@ impl From<Bytes> for Partition {
 
 impl From<&[u8]> for Partition {
     fn from(bytes: &[u8]) -> Self {
-        Partition::read_from_prefix(bytes).unwrap_or_default().0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
@@ -495,7 +495,7 @@ impl From<uuid::Uuid> for Partition {
 
 impl From<Partition> for uuid::Uuid {
     fn from(partition: Partition) -> Self {
-        uuid::Uuid::from_bytes(partition.into())
+        Self::from_bytes(partition.into())
     }
 }
 
@@ -507,13 +507,13 @@ impl From<Partition> for [u8; 16] {
 
 impl From<[u8; 16]> for Partition {
     fn from(data: [u8; 16]) -> Self {
-        Partition { data }
+        Self { data }
     }
 }
 
-impl From<&[u8; size_of::<Partition>()]> for Partition {
-    fn from(bytes: &[u8; size_of::<Partition>()]) -> Self {
-        Partition::read_from_bytes(bytes).unwrap_or_default()
+impl From<&[u8; size_of::<Self>()]> for Partition {
+    fn from(bytes: &[u8; size_of::<Self>()]) -> Self {
+        Self::read_from_bytes(bytes).unwrap_or_default()
     }
 }
 
@@ -525,13 +525,13 @@ impl From<&Bytes> for Partition {
 
 impl From<Context> for Partition {
     fn from(context: Context) -> Self {
-        Partition { data: context.data }
+        Self { data: context.data }
     }
 }
 
 impl From<Partition> for Context {
     fn from(partition: Partition) -> Self {
-        Context {
+        Self {
             data: partition.data,
         }
     }
@@ -539,7 +539,7 @@ impl From<Partition> for Context {
 
 impl From<Address> for Bytes {
     fn from(address: Address) -> Self {
-        Bytes::from_owner(address)
+        Self::from_owner(address)
     }
 }
 
@@ -557,7 +557,7 @@ impl From<&Bytes> for Address {
 
 impl From<&[u8]> for Address {
     fn from(bytes: &[u8]) -> Self {
-        Address::read_from_prefix(bytes).unwrap_or_default().0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
@@ -569,7 +569,7 @@ impl AsRef<[u8]> for Address {
 
 impl From<Fragment> for Bytes {
     fn from(fragment: Fragment) -> Self {
-        Bytes::from_owner(fragment)
+        Self::from_owner(fragment)
     }
 }
 
@@ -587,7 +587,7 @@ impl From<&Bytes> for Fragment {
 
 impl From<&[u8]> for Fragment {
     fn from(bytes: &[u8]) -> Self {
-        Fragment::read_from_prefix(bytes).unwrap_or_default().0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
@@ -599,7 +599,7 @@ impl AsRef<[u8]> for Fragment {
 
 impl From<FragmentReference> for Bytes {
     fn from(reference: FragmentReference) -> Self {
-        Bytes::from_owner(reference)
+        Self::from_owner(reference)
     }
 }
 
@@ -617,9 +617,7 @@ impl From<&Bytes> for FragmentReference {
 
 impl From<&[u8]> for FragmentReference {
     fn from(bytes: &[u8]) -> Self {
-        FragmentReference::read_from_prefix(bytes)
-            .unwrap_or_default()
-            .0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
@@ -689,7 +687,7 @@ impl Address {
     }
 
     pub fn zero_context_hash(hash: Hash) -> Self {
-        Address {
+        Self {
             context: Context::default(),
             hash,
         }
@@ -713,7 +711,7 @@ impl Partition {
 impl Hash {
     pub fn hash_buffer(buffer: &[u8]) -> Self {
         let hash = blake3::hash(buffer);
-        Hash {
+        Self {
             data: *hash.as_bytes(),
         }
     }
@@ -731,7 +729,7 @@ impl Hash {
     }
 
     pub fn from_u64(value: u64) -> Self {
-        let mut hash = Hash::default();
+        let mut hash = Self::default();
         hash.data[..std::mem::size_of::<u64>()].copy_from_slice(u64::to_le_bytes(value).as_slice());
         hash
     }
@@ -741,7 +739,7 @@ impl Hash {
     }
 
     pub fn from_context(value: Context) -> Self {
-        let mut hash = Hash::default();
+        let mut hash = Self::default();
         hash.data[..16].copy_from_slice(value.data().as_slice());
         hash
     }
@@ -846,7 +844,7 @@ impl FromStr for Hash {
     type Err = hex::FromHexError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        from_hex::<Hash>(s)
+        from_hex::<Self>(s)
     }
 }
 
@@ -854,7 +852,7 @@ impl FromStr for Context {
     type Err = hex::FromHexError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        from_hex::<Context>(s)
+        from_hex::<Self>(s)
     }
 }
 
@@ -862,7 +860,7 @@ impl FromStr for Partition {
     type Err = hex::FromHexError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        from_hex::<Partition>(s)
+        from_hex::<Self>(s)
     }
 }
 
@@ -872,12 +870,12 @@ impl FromStr for Address {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let parts: Vec<&str> = s.split('-').collect();
         match parts.len() {
-            0 => Ok(Address::default()),
-            1 => Ok(Address {
+            0 => Ok(Self::default()),
+            1 => Ok(Self {
                 hash: Hash::from_str(parts[0])?,
                 context: Context::default(),
             }),
-            2 => Ok(Address {
+            2 => Ok(Self {
                 hash: Hash::from_str(parts[0])?,
                 context: Context::from_str(parts[1])?,
             }),
@@ -1022,13 +1020,13 @@ impl From<Address> for AddressNotFound {
             buf[32..].copy_from_slice(address.context.data());
             buf
         };
-        AddressNotFound { address: bytes }
+        Self { address: bytes }
     }
 }
 
 impl From<Hash> for PayloadNotFound {
     fn from(hash: Hash) -> Self {
-        PayloadNotFound { hash: *hash.data() }
+        Self { hash: *hash.data() }
     }
 }
 
diff --git a/lore-base/src/types/store_types.rs b/lore-base/src/types/store_types.rs
index 02aae8f..f342dcb 100644
--- a/lore-base/src/types/store_types.rs
+++ b/lore-base/src/types/store_types.rs
@@ -25,13 +25,13 @@ impl TryFrom<u8> for KeyType {
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
-            0 => Ok(KeyType::Untyped),
-            1 => Ok(KeyType::BranchMetadata),
-            2 => Ok(KeyType::BranchId),
-            3 => Ok(KeyType::BranchLatestPointer),
-            4 => Ok(KeyType::RepositoryMetadata),
-            5 => Ok(KeyType::RepositoryId),
-            6 => Ok(KeyType::Instance),
+            0 => Ok(Self::Untyped),
+            1 => Ok(Self::BranchMetadata),
+            2 => Ok(Self::BranchId),
+            3 => Ok(Self::BranchLatestPointer),
+            4 => Ok(Self::RepositoryMetadata),
+            5 => Ok(Self::RepositoryId),
+            6 => Ok(Self::Instance),
             other => Err(other),
         }
     }
@@ -44,6 +44,6 @@ impl TryFrom<u32> for KeyType {
         if value > u8::MAX as u32 {
             return Err(value);
         }
-        KeyType::try_from(value as u8).map_err(|_unknown| value)
+        Self::try_from(value as u8).map_err(|_unknown| value)
     }
 }
diff --git a/lore-base/src/types/typed_bytes.rs b/lore-base/src/types/typed_bytes.rs
index f9d1e23..65cb0dc 100644
--- a/lore-base/src/types/typed_bytes.rs
+++ b/lore-base/src/types/typed_bytes.rs
@@ -30,7 +30,7 @@ impl TypedBytes for bytes::Bytes {
     where
         T: zerocopy::IntoBytes + zerocopy::Immutable,
     {
-        bytes::Bytes::from_static(slice.as_bytes())
+        Self::from_static(slice.as_bytes())
     }
 
     fn count<T>(&self) -> usize
@@ -124,14 +124,14 @@ impl TypedBytesMut for bytes::BytesMut {
     where
         T: zerocopy::IntoBytes,
     {
-        bytes::BytesMut::zeroed(count * std::mem::size_of::<T>())
+        Self::zeroed(count * std::mem::size_of::<T>())
     }
 
     fn with_count_capacity<T>(count: usize) -> bytes::BytesMut
     where
         T: zerocopy::IntoBytes,
     {
-        bytes::BytesMut::with_capacity(count * std::mem::size_of::<T>())
+        Self::with_capacity(count * std::mem::size_of::<T>())
     }
 
     fn count<T>(&self) -> usize
diff --git a/lore-base/src/types/verify_types.rs b/lore-base/src/types/verify_types.rs
index e2b9cec..221d8de 100644
--- a/lore-base/src/types/verify_types.rs
+++ b/lore-base/src/types/verify_types.rs
@@ -17,16 +17,16 @@ pub enum HealResult {
 impl From<u8> for HealResult {
     fn from(value: u8) -> Self {
         match value {
-            0 => HealResult::NotAttempted,
-            1 => HealResult::Healed,
-            _ => HealResult::Failed,
+            0 => Self::NotAttempted,
+            1 => Self::Healed,
+            _ => Self::Failed,
         }
     }
 }
 
 impl From<i32> for HealResult {
     fn from(value: i32) -> Self {
-        HealResult::from(value as u8)
+        Self::from(value as u8)
     }
 }
 
diff --git a/lore-chaos-client/src/chaos/runner.rs b/lore-chaos-client/src/chaos/runner.rs
index 5de4382..4b34818 100644
--- a/lore-chaos-client/src/chaos/runner.rs
+++ b/lore-chaos-client/src/chaos/runner.rs
@@ -24,11 +24,7 @@ pub struct ChaosRunner {
 }
 
 impl ChaosRunner {
-    pub fn new(
-        config: RunnerConfig,
-        probability: ProbabilityEngine,
-        urc: LoreInterface,
-    ) -> ChaosRunner {
+    pub fn new(config: RunnerConfig, probability: ProbabilityEngine, urc: LoreInterface) -> Self {
         let config = Rc::new(config);
         let probability = Rc::new(RefCell::new(probability));
         let picker: Box<dyn Picker> = if let Some(replay_file) = config.replay_operations.as_ref() {
diff --git a/lore-chaos-client/src/lore/interface.rs b/lore-chaos-client/src/lore/interface.rs
index f7983a1..13a0fe1 100644
--- a/lore-chaos-client/src/lore/interface.rs
+++ b/lore-chaos-client/src/lore/interface.rs
@@ -43,7 +43,7 @@ pub struct LoreInterface {
 }
 
 impl LoreInterface {
-    pub fn new(repo_path: LoreString, offline: bool) -> LoreInterface {
+    pub fn new(repo_path: LoreString, offline: bool) -> Self {
         Self {
             global_args: LoreGlobalArgs {
                 repository_path: repo_path.clone(),
diff --git a/lore-chaos-client/src/lore/state.rs b/lore-chaos-client/src/lore/state.rs
index 31ad0b2..e0cea11 100644
--- a/lore-chaos-client/src/lore/state.rs
+++ b/lore-chaos-client/src/lore/state.rs
@@ -20,7 +20,7 @@ pub struct BranchState {
 
 impl Default for LoreState {
     fn default() -> Self {
-        LoreState {
+        Self {
             branches: vec![BranchState {
                 name: "main".to_string(),
                 files: Vec::new(),
diff --git a/lore-chaos-client/src/operations.rs b/lore-chaos-client/src/operations.rs
index 8bd9ca6..8a7ed65 100644
--- a/lore-chaos-client/src/operations.rs
+++ b/lore-chaos-client/src/operations.rs
@@ -18,17 +18,16 @@ pub enum RepoOperationKind {
 }
 
 impl RepoOperationKind {
-    pub const ALL: &'static [RepoOperationKind] = &[
-        RepoOperationKind::Commit,
-        RepoOperationKind::GoToBranch,
-        RepoOperationKind::CreateBranch,
-        RepoOperationKind::Merge,
-        RepoOperationKind::Status,
-        RepoOperationKind::BranchInfo,
+    pub const ALL: &'static [Self] = &[
+        Self::Commit,
+        Self::GoToBranch,
+        Self::CreateBranch,
+        Self::Merge,
+        Self::Status,
+        Self::BranchInfo,
     ];
 
-    pub const ALL_READ_ONLY: &'static [RepoOperationKind] =
-        &[RepoOperationKind::Status, RepoOperationKind::BranchInfo];
+    pub const ALL_READ_ONLY: &'static [Self] = &[Self::Status, Self::BranchInfo];
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -73,11 +72,7 @@ pub enum FileMergeOperationKind {
 }
 
 impl FileMergeOperationKind {
-    pub const ALL: &'static [FileMergeOperationKind] = &[
-        FileMergeOperationKind::Mine,
-        FileMergeOperationKind::Theirs,
-        FileMergeOperationKind::New,
-    ];
+    pub const ALL: &'static [Self] = &[Self::Mine, Self::Theirs, Self::New];
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -90,9 +85,9 @@ pub enum FileMergeOperation {
 impl FileMergeOperation {
     pub fn from_kind(kind: FileMergeOperationKind, contents: impl FnOnce() -> String) -> Self {
         match kind {
-            FileMergeOperationKind::Mine => FileMergeOperation::Mine,
-            FileMergeOperationKind::Theirs => FileMergeOperation::Theirs,
-            FileMergeOperationKind::New => FileMergeOperation::New(contents()),
+            FileMergeOperationKind::Mine => Self::Mine,
+            FileMergeOperationKind::Theirs => Self::Theirs,
+            FileMergeOperationKind::New => Self::New(contents()),
         }
     }
 }
diff --git a/lore-chaos-client/src/probability.rs b/lore-chaos-client/src/probability.rs
index d95d5cf..137604b 100644
--- a/lore-chaos-client/src/probability.rs
+++ b/lore-chaos-client/src/probability.rs
@@ -34,7 +34,7 @@ pub enum ProbabilityType {
 }
 
 impl ProbabilityEngine {
-    pub fn new(weights: ProbabilityWeighting, seed: Option<u64>) -> ProbabilityEngine {
+    pub fn new(weights: ProbabilityWeighting, seed: Option<u64>) -> Self {
         info!("Probability using seed {seed:?}");
         let seed = seed.unwrap_or_else(|| rand::rng().random());
         let mut root_rng = StdRng::seed_from_u64(seed);
diff --git a/lore-chaos-client/src/probability/weighting.rs b/lore-chaos-client/src/probability/weighting.rs
index 1213b4d..edbfac6 100644
--- a/lore-chaos-client/src/probability/weighting.rs
+++ b/lore-chaos-client/src/probability/weighting.rs
@@ -13,11 +13,11 @@ pub struct Weighting<T: Clone> {
 }
 
 impl<T: Clone> Weighting<T> {
-    pub fn new(weighted_values: Vec<(f32, T)>) -> Weighting<T> {
+    pub fn new(weighted_values: Vec<(f32, T)>) -> Self {
         let weights: Vec<f32> = weighted_values.iter().map(|&(weight, _)| weight).collect();
         let values = weighted_values.into_iter().map(|(_, t)| t).collect();
         let table = WeightedAliasIndex::new(weights).unwrap();
-        Weighting { values, table }
+        Self { values, table }
     }
 
     pub fn generate(&mut self, rng: &mut impl Rng) -> T {
@@ -46,8 +46,8 @@ impl ProbabilityWeighting {
 }
 
 impl Default for ProbabilityWeighting {
-    fn default() -> ProbabilityWeighting {
-        ProbabilityWeighting {
+    fn default() -> Self {
+        Self {
             repo_operation: RepoOperationWeighting::new(
                 RepoOperationKind::ALL
                     .iter()
@@ -75,7 +75,7 @@ pub struct FileOperationWeights {
 }
 
 impl Default for FileOperationWeights {
-    fn default() -> FileOperationWeights {
+    fn default() -> Self {
         Self {
             proportion_to_modify: 0.25,
             // Deletes are currently defaulted to off because tracking them across merges is difficult.
diff --git a/lore-client/src/cli/config.rs b/lore-client/src/cli/config.rs
index 9f5da43..87291a1 100644
--- a/lore-client/src/cli/config.rs
+++ b/lore-client/src/cli/config.rs
@@ -35,7 +35,7 @@ pub struct CliConfig {
 
 impl Default for CliConfig {
     fn default() -> Self {
-        CliConfig {
+        Self {
             json: false,
             log_level: LoreLogLevel::default(),
             pager: DEFAULT_PAGER.to_string(),
@@ -54,7 +54,7 @@ struct CliUserConfig {
 
 impl Default for CliUserConfig {
     fn default() -> Self {
-        CliUserConfig {
+        Self {
             pager: DEFAULT_PAGER.to_string(),
         }
     }
diff --git a/lore-client/src/cli/pager.rs b/lore-client/src/cli/pager.rs
index 26e142f..252118d 100644
--- a/lore-client/src/cli/pager.rs
+++ b/lore-client/src/cli/pager.rs
@@ -40,7 +40,7 @@ impl Default for Pager {
 
 impl Pager {
     pub fn new() -> Self {
-        let pager = Pager {
+        let pager = Self {
             process: PagerProcess::new().map(|pd| Arc::new(Mutex::new(pd))),
         };
         #[cfg(debug_assertions)]
@@ -80,7 +80,7 @@ impl PagerProcess {
             .and_then(|mut cmd| cmd.stdin(Stdio::piped()).spawn().ok())
         };
 
-        child.map(|child| PagerProcess { child })
+        child.map(|child| Self { child })
     }
 
     fn stdin(&self) -> std::io::Result<&ChildStdin> {
diff --git a/lore-client/src/cli/progress_bar.rs b/lore-client/src/cli/progress_bar.rs
index f2901be..d08e7a1 100644
--- a/lore-client/src/cli/progress_bar.rs
+++ b/lore-client/src/cli/progress_bar.rs
@@ -61,7 +61,7 @@ pub struct ProgressBarOptions {
 
 impl Default for ProgressBarOptions {
     fn default() -> Self {
-        ProgressBarOptions {
+        Self {
             units: None,
             max_len: 20,
             fg_color: CommonStyles::PROGRESS_FG,
@@ -90,11 +90,11 @@ impl ProgressBar {
     /// `Drop` does not signal stop, so dropping the temporary does not stop
     /// the render thread.
     fn new_non_owner(data: Arc<Mutex<ProgressBarData>>) -> Self {
-        ProgressBar { data, owner: false }
+        Self { data, owner: false }
     }
 
     pub fn new_spinner(message: impl Into<String>) -> Self {
-        let pb = ProgressBar {
+        let pb = Self {
             data: Arc::new(Mutex::new(ProgressBarData {
                 progress: 0,
                 max_progress: 0,
@@ -116,7 +116,7 @@ impl ProgressBar {
     }
 
     pub fn new_with_options(max_progress: u64, options: ProgressBarOptions) -> Self {
-        let pb = ProgressBar {
+        let pb = Self {
             data: Arc::new(Mutex::new(ProgressBarData {
                 progress: 0,
                 max_progress,
@@ -278,13 +278,13 @@ impl Drop for ProgressBarSuspendToken {
 
 impl WeakProgressBar {
     fn new(pb: &ProgressBar) -> Self {
-        WeakProgressBar {
+        Self {
             data: Arc::downgrade(&pb.data),
         }
     }
 
     const fn empty() -> Self {
-        WeakProgressBar { data: Weak::new() }
+        Self { data: Weak::new() }
     }
 
     fn upgrade(&self) -> Option<ProgressBar> {
diff --git a/lore-error-set/src/internal.rs b/lore-error-set/src/internal.rs
index 57b56d9..4974afb 100644
--- a/lore-error-set/src/internal.rs
+++ b/lore-error-set/src/internal.rs
@@ -107,7 +107,7 @@ impl From<Internal> for Traced<Internal> {
         let caller = std::panic::Location::caller();
         let mut trace = Trace::new();
         trace.push(Location::new(caller.file(), caller.line(), caller.column()));
-        Traced::new(internal, trace)
+        Self::new(internal, trace)
     }
 }
 
diff --git a/lore-hashicorp/src/consul/client.rs b/lore-hashicorp/src/consul/client.rs
index 438b5d8..2f3ada4 100644
--- a/lore-hashicorp/src/consul/client.rs
+++ b/lore-hashicorp/src/consul/client.rs
@@ -16,7 +16,7 @@ pub struct RsConsul(Consul);
 
 impl From<rs_consul::Consul> for RsConsul {
     fn from(value: rs_consul::Consul) -> Self {
-        RsConsul(value)
+        Self(value)
     }
 }
 
diff --git a/lore-macro/src/lore_instrument.rs b/lore-macro/src/lore_instrument.rs
index f45b959..9596494 100644
--- a/lore-macro/src/lore_instrument.rs
+++ b/lore-macro/src/lore_instrument.rs
@@ -13,7 +13,7 @@ struct LoreInstrumentArgs {
 impl Parse for LoreInstrumentArgs {
     fn parse(input: ParseStream<'_>) -> syn::Result<Self> {
         if input.is_empty() {
-            return Ok(LoreInstrumentArgs { state_path: None });
+            return Ok(Self { state_path: None });
         }
 
         let ident: syn::Ident = input.parse()?;
@@ -23,7 +23,7 @@ impl Parse for LoreInstrumentArgs {
         let _eq: syn::Token![=] = input.parse()?;
         let lit: syn::LitStr = input.parse()?;
         let path: syn::Path = lit.parse()?;
-        Ok(LoreInstrumentArgs {
+        Ok(Self {
             state_path: Some(path),
         })
     }
diff --git a/lore-proto/src/convert.rs b/lore-proto/src/convert.rs
index 3ae5454..80cb138 100644
--- a/lore-proto/src/convert.rs
+++ b/lore-proto/src/convert.rs
@@ -12,7 +12,7 @@ use lore_base::types::LockResource;
 
 impl From<Address> for crate::model::Address {
     fn from(address: Address) -> Self {
-        crate::model::Address {
+        Self {
             hash: address.hash.into(),
             context: address.context.into(),
         }
@@ -21,7 +21,7 @@ impl From<Address> for crate::model::Address {
 
 impl From<&Address> for crate::model::Address {
     fn from(address: &Address) -> Self {
-        crate::model::Address {
+        Self {
             hash: address.hash.into(),
             context: address.context.into(),
         }
@@ -30,7 +30,7 @@ impl From<&Address> for crate::model::Address {
 
 impl From<crate::model::Address> for Address {
     fn from(address: crate::model::Address) -> Self {
-        Address {
+        Self {
             hash: Hash::from(address.hash),
             context: Context::from(address.context),
         }
@@ -39,7 +39,7 @@ impl From<crate::model::Address> for Address {
 
 impl From<&crate::model::Address> for Address {
     fn from(address: &crate::model::Address) -> Self {
-        Address {
+        Self {
             hash: address.hash.as_ref().into(),
             context: address.context.as_ref().into(),
         }
@@ -48,7 +48,7 @@ impl From<&crate::model::Address> for Address {
 
 impl From<Fragment> for crate::model::Fragment {
     fn from(fragment: Fragment) -> Self {
-        crate::model::Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -58,7 +58,7 @@ impl From<Fragment> for crate::model::Fragment {
 
 impl From<&Fragment> for crate::model::Fragment {
     fn from(fragment: &Fragment) -> Self {
-        crate::model::Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -68,7 +68,7 @@ impl From<&Fragment> for crate::model::Fragment {
 
 impl From<crate::model::Fragment> for Fragment {
     fn from(fragment: crate::model::Fragment) -> Self {
-        Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -78,7 +78,7 @@ impl From<crate::model::Fragment> for Fragment {
 
 impl From<&crate::model::Fragment> for Fragment {
     fn from(fragment: &crate::model::Fragment) -> Self {
-        Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -90,7 +90,7 @@ impl From<&crate::model::Fragment> for Fragment {
 
 impl From<&BranchPoint> for crate::model::BranchPoint {
     fn from(point: &BranchPoint) -> Self {
-        crate::model::BranchPoint {
+        Self {
             branch: point.branch.into(),
             revision: point.revision.into(),
         }
@@ -99,7 +99,7 @@ impl From<&BranchPoint> for crate::model::BranchPoint {
 
 impl From<crate::model::BranchPoint> for BranchPoint {
     fn from(point: crate::model::BranchPoint) -> Self {
-        BranchPoint {
+        Self {
             branch: point.branch.into(),
             revision: point.revision.into(),
         }
@@ -122,7 +122,7 @@ impl From<BranchMetadata> for crate::model::Branch {
             .map(|parent| parent.branch.clone())
             .or(Some(Context::default().into()));
 
-        crate::model::Branch {
+        Self {
             id: metadata.id.into(),
             name: metadata.name,
             category: metadata.category,
@@ -149,7 +149,7 @@ impl From<crate::model::Branch> for BranchMetadata {
                 revision: branch_point.into(),
             });
         }
-        BranchMetadata {
+        Self {
             id: metadata.id.into(),
             name: metadata.name.clone(),
             category: metadata.category.clone(),
@@ -165,7 +165,7 @@ impl From<crate::model::Branch> for BranchMetadata {
 
 impl From<&BranchPoint> for crate::lore::model::v1::BranchPoint {
     fn from(point: &BranchPoint) -> Self {
-        crate::lore::model::v1::BranchPoint {
+        Self {
             branch_id: point.branch.into(),
             revision_signature: point.revision.into(),
         }
@@ -174,7 +174,7 @@ impl From<&BranchPoint> for crate::lore::model::v1::BranchPoint {
 
 impl From<crate::lore::model::v1::BranchPoint> for BranchPoint {
     fn from(point: crate::lore::model::v1::BranchPoint) -> Self {
-        BranchPoint {
+        Self {
             branch: point.branch_id.into(),
             revision: point.revision_signature.into(),
         }
@@ -183,7 +183,7 @@ impl From<crate::lore::model::v1::BranchPoint> for BranchPoint {
 
 impl From<Address> for crate::lore::model::v1::Address {
     fn from(address: Address) -> Self {
-        crate::lore::model::v1::Address {
+        Self {
             hash: address.hash.into(),
             context: address.context.into(),
         }
@@ -192,7 +192,7 @@ impl From<Address> for crate::lore::model::v1::Address {
 
 impl From<&Address> for crate::lore::model::v1::Address {
     fn from(address: &Address) -> Self {
-        crate::lore::model::v1::Address {
+        Self {
             hash: address.hash.into(),
             context: address.context.into(),
         }
@@ -201,7 +201,7 @@ impl From<&Address> for crate::lore::model::v1::Address {
 
 impl From<crate::lore::model::v1::Address> for Address {
     fn from(address: crate::lore::model::v1::Address) -> Self {
-        Address {
+        Self {
             hash: Hash::from(address.hash),
             context: Context::from(address.context),
         }
@@ -210,7 +210,7 @@ impl From<crate::lore::model::v1::Address> for Address {
 
 impl From<&crate::lore::model::v1::Address> for Address {
     fn from(address: &crate::lore::model::v1::Address) -> Self {
-        Address {
+        Self {
             hash: address.hash.as_ref().into(),
             context: address.context.as_ref().into(),
         }
@@ -219,7 +219,7 @@ impl From<&crate::lore::model::v1::Address> for Address {
 
 impl From<Fragment> for crate::lore::model::v1::Fragment {
     fn from(fragment: Fragment) -> Self {
-        crate::lore::model::v1::Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -229,7 +229,7 @@ impl From<Fragment> for crate::lore::model::v1::Fragment {
 
 impl From<&Fragment> for crate::lore::model::v1::Fragment {
     fn from(fragment: &Fragment) -> Self {
-        crate::lore::model::v1::Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -239,7 +239,7 @@ impl From<&Fragment> for crate::lore::model::v1::Fragment {
 
 impl From<crate::lore::model::v1::Fragment> for Fragment {
     fn from(fragment: crate::lore::model::v1::Fragment) -> Self {
-        Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -249,7 +249,7 @@ impl From<crate::lore::model::v1::Fragment> for Fragment {
 
 impl From<&crate::lore::model::v1::Fragment> for Fragment {
     fn from(fragment: &crate::lore::model::v1::Fragment) -> Self {
-        Fragment {
+        Self {
             flags: fragment.flags,
             size_payload: fragment.size_payload,
             size_content: fragment.size_content,
@@ -261,7 +261,7 @@ impl From<&crate::lore::model::v1::Fragment> for Fragment {
 
 impl From<LockData> for crate::lock::Lock {
     fn from(lock: LockData) -> Self {
-        crate::lock::Lock {
+        Self {
             resource: Some(crate::lock::Resource {
                 branch: lock.resource.branch.into(),
                 hash: lock.resource.hash.into(),
@@ -278,7 +278,7 @@ impl From<LockData> for crate::lock::Lock {
 
 impl From<&LockData> for crate::lock::Lock {
     fn from(lock: &LockData) -> Self {
-        crate::lock::Lock {
+        Self {
             resource: Some(crate::lock::Resource {
                 branch: lock.resource.branch.into(),
                 hash: lock.resource.hash.into(),
@@ -296,7 +296,7 @@ impl From<&LockData> for crate::lock::Lock {
 impl From<crate::lock::Lock> for LockData {
     fn from(lock: crate::lock::Lock) -> Self {
         let resource = lock.resource.unwrap_or_default();
-        LockData {
+        Self {
             resource: LockResource {
                 branch: resource.branch.into(),
                 hash: resource.hash.into(),
@@ -322,7 +322,7 @@ impl From<&crate::lock::Lock> for LockData {
                 description: resource.description.clone(),
             })
             .unwrap_or_default();
-        LockData {
+        Self {
             resource,
             owner: lock.owner.clone(),
             locked_at: lock
@@ -335,7 +335,7 @@ impl From<&crate::lock::Lock> for LockData {
 
 impl From<LockResource> for crate::lock::Resource {
     fn from(resource: LockResource) -> Self {
-        crate::lock::Resource {
+        Self {
             branch: resource.branch.into(),
             hash: resource.hash.into(),
             description: resource.description,
@@ -345,7 +345,7 @@ impl From<LockResource> for crate::lock::Resource {
 
 impl From<&LockResource> for crate::lock::Resource {
     fn from(resource: &LockResource) -> Self {
-        crate::lock::Resource {
+        Self {
             branch: resource.branch.into(),
             hash: resource.hash.into(),
             description: resource.description.clone(),
@@ -355,7 +355,7 @@ impl From<&LockResource> for crate::lock::Resource {
 
 impl From<crate::lock::Resource> for LockResource {
     fn from(resource: crate::lock::Resource) -> Self {
-        LockResource {
+        Self {
             branch: resource.branch.into(),
             hash: resource.hash.into(),
             description: resource.description,
@@ -365,7 +365,7 @@ impl From<crate::lock::Resource> for LockResource {
 
 impl From<&crate::lock::Resource> for LockResource {
     fn from(resource: &crate::lock::Resource) -> Self {
-        LockResource {
+        Self {
             branch: BranchId::from(resource.branch.as_ref()),
             hash: Hash::from(resource.hash.as_ref()),
             description: resource.description.clone(),
diff --git a/lore-revision/src/anchor.rs b/lore-revision/src/anchor.rs
index 5307dbd..ec0000f 100644
--- a/lore-revision/src/anchor.rs
+++ b/lore-revision/src/anchor.rs
@@ -26,8 +26,8 @@ pub enum AnchorError {
 impl EventError for AnchorError {
     fn translated(&self) -> LoreError {
         match self {
-            AnchorError::InvalidArguments(_) => LoreError::InvalidArguments,
-            AnchorError::WriteRequired(_) | AnchorError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::WriteRequired(_) | Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore-revision/src/auth/login.rs b/lore-revision/src/auth/login.rs
index ec76fe2..de9782f 100644
--- a/lore-revision/src/auth/login.rs
+++ b/lore-revision/src/auth/login.rs
@@ -50,10 +50,10 @@ pub enum LoginError {
 impl EventError for LoginError {
     fn translated(&self) -> LoreError {
         match self {
-            LoginError::Disconnected(_) => LoreError::Connection,
-            LoginError::SlowDown(_) => LoreError::SlowDown,
-            LoginError::Oversized(_) => LoreError::Oversized,
-            LoginError::NotFound(_) => LoreError::NotFound,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::NotFound(_) => LoreError::NotFound,
             _ => LoreError::Internal,
         }
     }
@@ -80,10 +80,10 @@ pub enum InteractiveLoginError {
 impl EventError for InteractiveLoginError {
     fn translated(&self) -> LoreError {
         match self {
-            InteractiveLoginError::Disconnected(_) => LoreError::Connection,
-            InteractiveLoginError::SlowDown(_) => LoreError::SlowDown,
-            InteractiveLoginError::Oversized(_) => LoreError::Oversized,
-            InteractiveLoginError::NotFound(_) => LoreError::NotFound,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::NotFound(_) => LoreError::NotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/branch.rs b/lore-revision/src/branch.rs
index 8562947..ddeed79 100644
--- a/lore-revision/src/branch.rs
+++ b/lore-revision/src/branch.rs
@@ -338,22 +338,22 @@ pub enum BranchError {
 impl EventError for BranchError {
     fn translated(&self) -> LoreError {
         match self {
-            BranchError::Disconnected(_) => LoreError::Connection,
-            BranchError::SlowDown(_) => LoreError::SlowDown,
-            BranchError::Oversized(_) => LoreError::Oversized,
-            BranchError::FileNotFound(_) => LoreError::FileNotFound,
-            BranchError::NotFound(_)
-            | BranchError::BranchNotFound(_)
-            | BranchError::RevisionNotFound(_)
-            | BranchError::LayerNotFound(_)
-            | BranchError::LinkNotFound(_)
-            | BranchError::NodeNotFound(_) => LoreError::NotFound,
-            BranchError::AddressNotFound(_) => LoreError::AddressNotFound,
-            BranchError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            BranchError::InvalidPath(_)
-            | BranchError::InvalidArguments(_)
-            | BranchError::Divergent(_) => LoreError::InvalidArguments,
-            BranchError::BranchAlreadyExists(_) => LoreError::AlreadyExists,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::RevisionNotFound(_)
+            | Self::LayerNotFound(_)
+            | Self::LinkNotFound(_)
+            | Self::NodeNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) | Self::Divergent(_) => {
+                LoreError::InvalidArguments
+            }
+            Self::BranchAlreadyExists(_) => LoreError::AlreadyExists,
             _ => LoreError::Internal,
         }
     }
@@ -2278,7 +2278,7 @@ pub struct RevisionListItem {
 
 impl From<&RevisionListItem> for lore_proto::Revision {
     fn from(revision: &RevisionListItem) -> Self {
-        let mut proto_revision = lore_proto::Revision {
+        let mut proto_revision = Self {
             id: revision.revision.into(),
             commit_message: String::default(),
             timestamp: 0,
diff --git a/lore-revision/src/branch/create.rs b/lore-revision/src/branch/create.rs
index 2dbabcc..fa7b26f 100644
--- a/lore-revision/src/branch/create.rs
+++ b/lore-revision/src/branch/create.rs
@@ -71,20 +71,18 @@ pub enum CreateError {
 impl EventError for CreateError {
     fn translated(&self) -> LoreError {
         match self {
-            CreateError::Disconnected(_) => LoreError::Connection,
-            CreateError::SlowDown(_) => LoreError::SlowDown,
-            CreateError::Oversized(_) => LoreError::Oversized,
-            CreateError::FileNotFound(_) => LoreError::FileNotFound,
-            CreateError::NotFound(_)
-            | CreateError::BranchNotFound(_)
-            | CreateError::RevisionNotFound(_)
-            | CreateError::LayerNotFound(_) => LoreError::NotFound,
-            CreateError::AddressNotFound(_) => LoreError::AddressNotFound,
-            CreateError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            CreateError::InvalidPath(_) | CreateError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
-            }
-            CreateError::BranchAlreadyExists(_) => LoreError::AlreadyExists,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::RevisionNotFound(_)
+            | Self::LayerNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::BranchAlreadyExists(_) => LoreError::AlreadyExists,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/branch/info.rs b/lore-revision/src/branch/info.rs
index ff5a367..36b3be6 100644
--- a/lore-revision/src/branch/info.rs
+++ b/lore-revision/src/branch/info.rs
@@ -72,7 +72,7 @@ pub enum InfoError {
 impl EventError for InfoError {
     fn translated(&self) -> LoreError {
         match self {
-            InfoError::NotFound(_) => LoreError::NotFound,
+            Self::NotFound(_) => LoreError::NotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/branch/merge.rs b/lore-revision/src/branch/merge.rs
index 9e2a6e7..35ef51b 100644
--- a/lore-revision/src/branch/merge.rs
+++ b/lore-revision/src/branch/merge.rs
@@ -351,19 +351,17 @@ pub enum MergeError {
 impl EventError for MergeError {
     fn translated(&self) -> LoreError {
         match self {
-            MergeError::Disconnected(_) => LoreError::Connection,
-            MergeError::SlowDown(_) => LoreError::SlowDown,
-            MergeError::Oversized(_) => LoreError::Oversized,
-            MergeError::FileNotFound(_) => LoreError::FileNotFound,
-            MergeError::NotFound(_)
-            | MergeError::BranchNotFound(_)
-            | MergeError::LayerNotFound(_)
-            | MergeError::RevisionNotFound(_) => LoreError::NotFound,
-            MergeError::AddressNotFound(_) => LoreError::AddressNotFound,
-            MergeError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            MergeError::InvalidPath(_) | MergeError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
-            }
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::LayerNotFound(_)
+            | Self::RevisionNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/branch/push.rs b/lore-revision/src/branch/push.rs
index 5148f8a..0625490 100644
--- a/lore-revision/src/branch/push.rs
+++ b/lore-revision/src/branch/push.rs
@@ -256,18 +256,16 @@ pub struct PushOptions {
 impl EventError for PushError {
     fn translated(&self) -> LoreError {
         match self {
-            PushError::Disconnected(_) => LoreError::Connection,
-            PushError::SlowDown(_) => LoreError::SlowDown,
-            PushError::Oversized(_) => LoreError::Oversized,
-            PushError::FileNotFound(_) => LoreError::FileNotFound,
-            PushError::NotFound(_)
-            | PushError::LayerNotFound(_)
-            | PushError::RevisionNotFound(_) => LoreError::NotFound,
-            PushError::AddressNotFound(_) => LoreError::AddressNotFound,
-            PushError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            PushError::InvalidPath(_) | PushError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_) | Self::LayerNotFound(_) | Self::RevisionNotFound(_) => {
+                LoreError::NotFound
             }
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/branch/reset.rs b/lore-revision/src/branch/reset.rs
index 604ab50..f5ba42f 100644
--- a/lore-revision/src/branch/reset.rs
+++ b/lore-revision/src/branch/reset.rs
@@ -74,18 +74,16 @@ pub enum ResetError {
 impl EventError for ResetError {
     fn translated(&self) -> LoreError {
         match self {
-            ResetError::Disconnected(_) => LoreError::Connection,
-            ResetError::SlowDown(_) => LoreError::SlowDown,
-            ResetError::Oversized(_) => LoreError::Oversized,
-            ResetError::FileNotFound(_) => LoreError::FileNotFound,
-            ResetError::NotFound(_)
-            | ResetError::BranchNotFound(_)
-            | ResetError::RevisionNotFound(_) => LoreError::NotFound,
-            ResetError::AddressNotFound(_) => LoreError::AddressNotFound,
-            ResetError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            ResetError::InvalidPath(_) | ResetError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_) | Self::BranchNotFound(_) | Self::RevisionNotFound(_) => {
+                LoreError::NotFound
             }
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/change.rs b/lore-revision/src/change.rs
index d127441..c85d60d 100644
--- a/lore-revision/src/change.rs
+++ b/lore-revision/src/change.rs
@@ -30,25 +30,25 @@ pub enum FileAction {
 impl FileAction {
     pub fn as_string_short(self) -> &'static str {
         match self {
-            FileAction::Add => "A",
-            FileAction::Delete => "D",
-            FileAction::Move => "V",
-            FileAction::Copy => "C",
-            FileAction::Keep => "M",
+            Self::Add => "A",
+            Self::Delete => "D",
+            Self::Move => "V",
+            Self::Copy => "C",
+            Self::Keep => "M",
         }
     }
 
     pub fn from_node_flags(flags: u16) -> Self {
         if flags & NodeFlags::StagedDelete == NodeFlags::StagedDelete {
-            FileAction::Delete
+            Self::Delete
         } else if flags & NodeFlags::StagedAdd == NodeFlags::StagedAdd {
-            FileAction::Add
+            Self::Add
         } else if flags & NodeFlags::StagedMove == NodeFlags::StagedMove {
-            FileAction::Move
+            Self::Move
         } else if flags & NodeFlags::StagedCopy == NodeFlags::StagedCopy {
-            FileAction::Copy
+            Self::Copy
         } else {
-            FileAction::Keep
+            Self::Keep
         }
     }
 }
@@ -86,35 +86,35 @@ bitflagsops!(Flags, u16);
 
 impl Flags {
     pub fn is_stage(&self) -> bool {
-        self.contains(Flags::Staged)
+        self.contains(Self::Staged)
     }
 
     pub fn is_dirty(&self) -> bool {
-        self.contains(Flags::Dirty)
+        self.contains(Self::Dirty)
     }
 
     pub fn is_merge(&self) -> bool {
-        self.contains(Flags::Merge)
+        self.contains(Self::Merge)
     }
 
     pub fn is_conflict(&self) -> bool {
-        self.contains(Flags::Conflict)
+        self.contains(Self::Conflict)
     }
 
     pub fn is_conflict_automerged(&self) -> bool {
-        self.contains(Flags::ConflictAutomerged)
+        self.contains(Self::ConflictAutomerged)
     }
 
     pub fn is_conflict_mine(&self) -> bool {
-        self.contains(Flags::ConflictMine)
+        self.contains(Self::ConflictMine)
     }
 
     pub fn is_conflict_theirs(&self) -> bool {
-        self.contains(Flags::ConflictTheirs)
+        self.contains(Self::ConflictTheirs)
     }
 
     pub fn is_conflict_unresolved(&self) -> bool {
-        self.contains(Flags::Conflict) && !self.contains(Flags::ConflictResolved)
+        self.contains(Self::Conflict) && !self.contains(Self::ConflictResolved)
     }
 }
 
@@ -129,7 +129,7 @@ pub struct NodeChangeState {
 
 impl NodeChangeState {
     pub fn invalid(&self) -> Self {
-        NodeChangeState {
+        Self {
             repository: self.repository.clone(),
             state: self.state.clone(),
             node: INVALID_NODE,
@@ -140,7 +140,7 @@ impl NodeChangeState {
 
     /// Create a `NodeChangeState` for a child node, inheriting repository and state from parent.
     pub fn from_child(&self, child_id: NodeID, child_node: &Node) -> Self {
-        NodeChangeState {
+        Self {
             repository: self.repository.clone(),
             state: self.state.clone(),
             node: child_id,
@@ -158,7 +158,7 @@ impl NodeChangeState {
         else {
             return self.invalid();
         };
-        NodeChangeState {
+        Self {
             repository: self.repository.clone(),
             state: self.state.clone(),
             node: node_id,
diff --git a/lore-revision/src/cluster/peer.rs b/lore-revision/src/cluster/peer.rs
index 7d9ed41..7491952 100644
--- a/lore-revision/src/cluster/peer.rs
+++ b/lore-revision/src/cluster/peer.rs
@@ -14,8 +14,8 @@ pub enum Locality {
 impl Locality {
     pub fn as_str(&self) -> &'static str {
         match self {
-            Locality::SameRegion => "SameRegion",
-            Locality::OtherRegion => "OtherRegion",
+            Self::SameRegion => "SameRegion",
+            Self::OtherRegion => "OtherRegion",
         }
     }
 }
diff --git a/lore-revision/src/commit.rs b/lore-revision/src/commit.rs
index ac888f0..9ec16a3 100644
--- a/lore-revision/src/commit.rs
+++ b/lore-revision/src/commit.rs
@@ -2381,7 +2381,7 @@ struct NodeHashData {
 
 impl NodeHashData {
     fn from_node(node: &Node) -> Self {
-        NodeHashData {
+        Self {
             name_hash: node.name_hash,
             mode: node.mode as u32,
             address: node.address,
diff --git a/lore-revision/src/dependency/mod.rs b/lore-revision/src/dependency/mod.rs
index 82ad6aa..581750e 100644
--- a/lore-revision/src/dependency/mod.rs
+++ b/lore-revision/src/dependency/mod.rs
@@ -101,8 +101,8 @@ pub enum DependencyError {
 impl EventError for DependencyError {
     fn translated(&self) -> crate::interface::LoreError {
         match self {
-            DependencyError::FileNotFound(_) => crate::interface::LoreError::NotFound,
-            DependencyError::Disconnected(_) => crate::interface::LoreError::Connection,
+            Self::FileNotFound(_) => crate::interface::LoreError::NotFound,
+            Self::Disconnected(_) => crate::interface::LoreError::Connection,
             _ => crate::interface::LoreError::Internal,
         }
     }
@@ -542,7 +542,7 @@ impl DependencyData {
             });
         }
 
-        Ok(DependencyData { entries })
+        Ok(Self { entries })
     }
 
     /// Returns the exact byte count that [`serialize`](Self::serialize) will
diff --git a/lore-revision/src/errors/mod.rs b/lore-revision/src/errors/mod.rs
index e3112b1..9189113 100644
--- a/lore-revision/src/errors/mod.rs
+++ b/lore-revision/src/errors/mod.rs
@@ -13,8 +13,8 @@ pub enum UnhandledError {
 impl EventError for UnhandledError {
     fn translated(&self) -> LoreError {
         match self {
-            UnhandledError::InvalidArguments(_) => LoreError::InvalidArguments,
-            UnhandledError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore-revision/src/event.rs b/lore-revision/src/event.rs
index 7e1fe05..9e54a53 100644
--- a/lore-revision/src/event.rs
+++ b/lore-revision/src/event.rs
@@ -404,7 +404,7 @@ impl LoreMetadataEventData {
             MetadataType::Binary => return Err(MetadataError::internal("metadata type mismatch")),
         };
 
-        Ok(LoreMetadataEventData { key, value })
+        Ok(Self { key, value })
     }
 }
 
diff --git a/lore-revision/src/file/diff.rs b/lore-revision/src/file/diff.rs
index cebdac5..ab7dc70 100644
--- a/lore-revision/src/file/diff.rs
+++ b/lore-revision/src/file/diff.rs
@@ -88,11 +88,9 @@ pub enum DiffError {
 impl EventError for DiffError {
     fn translated(&self) -> LoreError {
         match self {
-            DiffError::InvalidArguments(_) | DiffError::InvalidPath(_) => {
-                LoreError::InvalidArguments
-            }
-            DiffError::RevisionNotFound(_) | DiffError::NotFound(_) => LoreError::NotFound,
-            DiffError::FileNotFound(_) => LoreError::FileNotFound,
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::RevisionNotFound(_) | Self::NotFound(_) => LoreError::NotFound,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
             _ => LoreError::Internal,
         }
     }
@@ -906,11 +904,11 @@ impl DiffContent {
     /// An absent side (file missing on this revision / `/dev/null`). Treated as
     /// empty text, never binary.
     fn empty() -> Self {
-        DiffContent::Text(String::new())
+        Self::Text(String::new())
     }
 
     fn is_binary(&self) -> bool {
-        matches!(self, DiffContent::Binary)
+        matches!(self, Self::Binary)
     }
 
     /// The decoded text for a text side; `""` for binary. Callers short-circuit
@@ -918,8 +916,8 @@ impl DiffContent {
     /// in practice.
     fn text(&self) -> &str {
         match self {
-            DiffContent::Text(s) => s,
-            DiffContent::Binary => "",
+            Self::Text(s) => s,
+            Self::Binary => "",
         }
     }
 }
diff --git a/lore-revision/src/file/history.rs b/lore-revision/src/file/history.rs
index e11effc..8b3729e 100644
--- a/lore-revision/src/file/history.rs
+++ b/lore-revision/src/file/history.rs
@@ -78,7 +78,7 @@ impl LoreFileHistoryEventData {
             file_action = FileAction::Copy;
         }
 
-        LoreFileHistoryEventData {
+        Self {
             path: path.into(),
             repository: repository.id,
             revision: state.revision(),
@@ -142,13 +142,11 @@ pub enum FileHistoryError {
 impl EventError for FileHistoryError {
     fn translated(&self) -> LoreError {
         match self {
-            FileHistoryError::InvalidArguments(_) | FileHistoryError::InvalidPath(_) => {
-                LoreError::InvalidArguments
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::RevisionNotFound(_) | Self::BranchNotFound(_) | Self::NotFound(_) => {
+                LoreError::NotFound
             }
-            FileHistoryError::FileNotFound(_) => LoreError::FileNotFound,
-            FileHistoryError::RevisionNotFound(_)
-            | FileHistoryError::BranchNotFound(_)
-            | FileHistoryError::NotFound(_) => LoreError::NotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/file/info.rs b/lore-revision/src/file/info.rs
index 00789b5..328d418 100644
--- a/lore-revision/src/file/info.rs
+++ b/lore-revision/src/file/info.rs
@@ -91,11 +91,9 @@ pub enum InfoError {
 impl EventError for InfoError {
     fn translated(&self) -> LoreError {
         match self {
-            InfoError::InvalidArguments(_) | InfoError::InvalidPath(_) => {
-                LoreError::InvalidArguments
-            }
-            InfoError::RevisionNotFound(_) | InfoError::NotFound(_) => LoreError::NotFound,
-            InfoError::FileNotFound(_) => LoreError::FileNotFound,
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::RevisionNotFound(_) | Self::NotFound(_) => LoreError::NotFound,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/file/obliterate.rs b/lore-revision/src/file/obliterate.rs
index c408986..3ffc1ca 100644
--- a/lore-revision/src/file/obliterate.rs
+++ b/lore-revision/src/file/obliterate.rs
@@ -87,10 +87,10 @@ pub enum ObliterateError {
 impl EventError for ObliterateError {
     fn translated(&self) -> LoreError {
         match self {
-            ObliterateError::InvalidArguments(_)
-            | ObliterateError::InvalidPath(_)
-            | ObliterateError::InvalidAddress(_) => LoreError::InvalidArguments,
-            ObliterateError::FileNotFound(_) => LoreError::FileNotFound,
+            Self::InvalidArguments(_) | Self::InvalidPath(_) | Self::InvalidAddress(_) => {
+                LoreError::InvalidArguments
+            }
+            Self::FileNotFound(_) => LoreError::FileNotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/file/reset.rs b/lore-revision/src/file/reset.rs
index 82541e0..225cf4b 100644
--- a/lore-revision/src/file/reset.rs
+++ b/lore-revision/src/file/reset.rs
@@ -155,12 +155,10 @@ pub enum ResetError {
 impl EventError for ResetError {
     fn translated(&self) -> LoreError {
         match self {
-            ResetError::InvalidArguments(_) | ResetError::InvalidPath(_) => {
-                LoreError::InvalidArguments
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::RevisionNotFound(_) | Self::BranchNotFound(_) | Self::NotFound(_) => {
+                LoreError::NotFound
             }
-            ResetError::RevisionNotFound(_)
-            | ResetError::BranchNotFound(_)
-            | ResetError::NotFound(_) => LoreError::NotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/file/unstage.rs b/lore-revision/src/file/unstage.rs
index 67aa291..faf0b8c 100644
--- a/lore-revision/src/file/unstage.rs
+++ b/lore-revision/src/file/unstage.rs
@@ -164,9 +164,7 @@ pub enum UnstageError {
 impl EventError for UnstageError {
     fn translated(&self) -> LoreError {
         match self {
-            UnstageError::InvalidArguments(_) | UnstageError::InvalidPath(_) => {
-                LoreError::InvalidArguments
-            }
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/file/write.rs b/lore-revision/src/file/write.rs
index 0f676a7..d405c73 100644
--- a/lore-revision/src/file/write.rs
+++ b/lore-revision/src/file/write.rs
@@ -86,11 +86,11 @@ pub enum WriteError {
 impl EventError for WriteError {
     fn translated(&self) -> LoreError {
         match self {
-            WriteError::InvalidArguments(_)
-            | WriteError::InvalidPath(_)
-            | WriteError::InvalidAddress(_) => LoreError::InvalidArguments,
-            WriteError::RevisionNotFound(_) | WriteError::NotFound(_) => LoreError::NotFound,
-            WriteError::FileNotFound(_) => LoreError::FileNotFound,
+            Self::InvalidArguments(_) | Self::InvalidPath(_) | Self::InvalidAddress(_) => {
+                LoreError::InvalidArguments
+            }
+            Self::RevisionNotFound(_) | Self::NotFound(_) => LoreError::NotFound,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/fs/filesystem_provider.rs b/lore-revision/src/fs/filesystem_provider.rs
index fd38757..da56e3e 100644
--- a/lore-revision/src/fs/filesystem_provider.rs
+++ b/lore-revision/src/fs/filesystem_provider.rs
@@ -30,7 +30,7 @@ pub enum FsError {}
 
 impl From<std::io::Error> for FsError {
     fn from(value: std::io::Error) -> Self {
-        FsError::internal(value.to_string())
+        Self::internal(value.to_string())
     }
 }
 
@@ -311,7 +311,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         filter_mode: FilterMode,
     ) -> Result<(Vec<NodeChange>, FilesystemDiffStats), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.changes_from_filesystem_to_state(
                     repository_from,
                     state_from,
@@ -329,7 +329,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
 
     async fn file_info(&self, path: FilesystemPath<'_>) -> Result<FileInfo, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.file_info(path).await,
+            Self::Os(this) => this.file_info(path).await,
         }
     }
 
@@ -340,7 +340,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         force_full_check: bool,
     ) -> Result<FileModifiedCheck, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.is_file_modified(repository, node_change, force_full_check)
                     .await
             }
@@ -354,9 +354,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         node_hint: Option<&Node>,
     ) -> Result<Hash, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
-                this.file_hash(repository, path, node_hint).await
-            }
+            Self::Os(this) => this.file_hash(repository, path, node_hint).await,
         }
     }
 
@@ -368,7 +366,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         known_disk_file_size: u64,
     ) -> Result<bool, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.file_compare(repository, address, path, known_disk_file_size)
                     .await
             }
@@ -377,19 +375,19 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
 
     async fn make_executable(&self, path: FilesystemPath<'_>) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.make_executable(path).await,
+            Self::Os(this) => this.make_executable(path).await,
         }
     }
 
     async fn create_dir_all(&self, path: FilesystemPath<'_>) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.create_dir_all(path).await,
+            Self::Os(this) => this.create_dir_all(path).await,
         }
     }
 
     async fn create_file(&self, path: FilesystemPath<'_>) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.create_file(path).await,
+            Self::Os(this) => this.create_file(path).await,
         }
     }
 
@@ -399,19 +397,19 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         to: FilesystemPath<'_>,
     ) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.unify_case_rename(from, to).await,
+            Self::Os(this) => this.unify_case_rename(from, to).await,
         }
     }
 
     async fn remove(&self, path: FilesystemPath<'_>) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.remove(path).await,
+            Self::Os(this) => this.remove(path).await,
         }
     }
 
     async fn remove_recursive(&self, path: FilesystemPath<'_>) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.remove_recursive(path).await,
+            Self::Os(this) => this.remove_recursive(path).await,
         }
     }
 
@@ -422,7 +420,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         path: FilesystemPath<'_>,
     ) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.set_file_to_immutable_store_contents(repository, node, path)
                     .await
             }
@@ -435,7 +433,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         destination_path: impl AsRef<Path> + Send,
     ) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.copy_to_scratch_file(source_path, destination_path)
                     .await
             }
@@ -451,7 +449,7 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
         mode: MergeTextMode<'_>,
     ) -> Result<bool, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => {
+            Self::Os(this) => {
                 this.merge3_text_by_path(base, mine, theirs, result, mode)
                     .await
             }
@@ -460,13 +458,13 @@ impl InstanceOperation for StaticDispatchInstanceOperation {
 
     async fn infer_is_diffable(&self, path: FilesystemPath<'_>) -> Result<bool, FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.infer_is_diffable(path).await,
+            Self::Os(this) => this.infer_is_diffable(path).await,
         }
     }
 
     async fn finalize(&self, changes_made: bool) -> Result<(), FsError> {
         match self {
-            StaticDispatchInstanceOperation::Os(this) => this.finalize(changes_made).await,
+            Self::Os(this) => this.finalize(changes_made).await,
         }
     }
 }
diff --git a/lore-revision/src/instance.rs b/lore-revision/src/instance.rs
index 7aea07e..8adddb7 100644
--- a/lore-revision/src/instance.rs
+++ b/lore-revision/src/instance.rs
@@ -532,7 +532,7 @@ pub enum InstanceError {
 impl EventError for InstanceError {
     fn translated(&self) -> LoreError {
         match self {
-            InstanceError::Disconnected(_) => LoreError::Connection,
+            Self::Disconnected(_) => LoreError::Connection,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/interface.rs b/lore-revision/src/interface.rs
index a180da8..d00aefd 100644
--- a/lore-revision/src/interface.rs
+++ b/lore-revision/src/interface.rs
@@ -127,7 +127,7 @@ impl LoreString {
             let buffer = std::alloc::alloc(layout);
             std::ptr::copy_nonoverlapping(source.as_ptr(), buffer, length);
             *buffer.add(length) = 0;
-            LoreString {
+            Self {
                 string: buffer as *const std::os::raw::c_char,
                 length,
             }
@@ -148,7 +148,7 @@ impl LoreString {
 
 impl Default for LoreString {
     fn default() -> Self {
-        LoreString {
+        Self {
             string: core::ptr::null(),
             length: 0usize,
         }
@@ -157,7 +157,7 @@ impl Default for LoreString {
 
 impl Clone for LoreString {
     fn clone(&self) -> Self {
-        LoreString::from_str(self.as_str())
+        Self::from_str(self.as_str())
     }
 
     fn clone_from(&mut self, source: &Self) {
@@ -231,81 +231,75 @@ impl<'a> From<&'a LoreString> for Option<&'a str> {
 
 impl From<String> for LoreString {
     fn from(value: String) -> Self {
-        LoreString::from_str(value.as_str())
+        Self::from_str(value.as_str())
     }
 }
 
 impl From<&String> for LoreString {
     fn from(value: &String) -> Self {
-        LoreString::from_str(value.as_str())
+        Self::from_str(value.as_str())
     }
 }
 
 impl From<&str> for LoreString {
     fn from(value: &str) -> Self {
-        LoreString::from_str(value)
+        Self::from_str(value)
     }
 }
 
 impl From<Option<String>> for LoreString {
     fn from(value: Option<String>) -> Self {
-        value
-            .as_deref()
-            .map(LoreString::from_str)
-            .unwrap_or_default()
+        value.as_deref().map(Self::from_str).unwrap_or_default()
     }
 }
 
 impl From<Option<&String>> for LoreString {
     fn from(value: Option<&String>) -> Self {
         value
-            .map(|value| LoreString::from_str(value.as_str()))
+            .map(|value| Self::from_str(value.as_str()))
             .unwrap_or_default()
     }
 }
 
 impl From<&Option<String>> for LoreString {
     fn from(value: &Option<String>) -> Self {
-        value
-            .as_deref()
-            .map(LoreString::from_str)
-            .unwrap_or_default()
+        value.as_deref().map(Self::from_str).unwrap_or_default()
     }
 }
 
 impl From<Option<&str>> for LoreString {
     fn from(value: Option<&str>) -> Self {
-        value.map(LoreString::from_str).unwrap_or_default()
+        value.map(Self::from_str).unwrap_or_default()
     }
 }
 
 impl From<&Path> for LoreString {
     fn from(value: &Path) -> Self {
-        LoreString::from_path(value)
+        Self::from_path(value)
     }
 }
 
 impl From<PathBuf> for LoreString {
     fn from(value: PathBuf) -> Self {
-        LoreString::from_path(value.as_path())
+        Self::from_path(value.as_path())
     }
 }
 
 impl From<&PathBuf> for LoreString {
     fn from(value: &PathBuf) -> Self {
-        LoreString::from_path(value.as_path())
+        Self::from_path(value.as_path())
     }
 }
 
 impl From<&RelativePath> for LoreString {
     fn from(value: &RelativePath) -> Self {
-        LoreString::from_str(value.as_str())
+        Self::from_str(value.as_str())
     }
 }
 
 impl From<RelativePath> for LoreString {
     fn from(value: RelativePath) -> Self {
-        LoreString::from_str(value.as_str())
+        Self::from_str(value.as_str())
     }
 }
 
@@ -324,7 +318,7 @@ impl<'de> Deserialize<'de> for LoreString {
         D: serde::Deserializer<'de>,
     {
         let value: String = Deserialize::deserialize(deserializer)?;
-        Ok(LoreString::from_str(&value))
+        Ok(Self::from_str(&value))
     }
 }
 
@@ -374,7 +368,7 @@ impl<T> LoreArray<T> {
 
     /// Moves the strings from the vec in the string array
     pub fn from_vec(vec: Vec<T>) -> Self {
-        let target = LoreArray::<T>::new(vec.len());
+        let target = Self::new(vec.len());
 
         // SAFETY: target is created to the same count as the vec and we're going to initialise
         // every element.
@@ -481,7 +475,7 @@ where
         D: serde::Deserializer<'de>,
     {
         let value: Vec<T> = Deserialize::deserialize(deserializer)?;
-        Ok(LoreArray::from_vec(value))
+        Ok(Self::from_vec(value))
     }
 }
 
@@ -824,7 +818,7 @@ impl Default for ExecutionContext {
     fn default() -> Self {
         execution_initialize();
 
-        ExecutionContext {
+        Self {
             globals: LoreGlobalArgs::default(),
             dispatcher: EventDispatcher::default(),
             log_level: LoreLogLevel::Error,
@@ -984,8 +978,8 @@ pub enum LoreBranchLocation {
 impl Display for LoreBranchLocation {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            LoreBranchLocation::Local => write!(f, "local"),
-            LoreBranchLocation::Remote => write!(f, "remote"),
+            Self::Local => write!(f, "local"),
+            Self::Remote => write!(f, "remote"),
         }
     }
 }
@@ -1002,7 +996,7 @@ pub struct LoreBranchPoint {
 
 impl From<&BranchPoint> for LoreBranchPoint {
     fn from(branch_point: &BranchPoint) -> Self {
-        LoreBranchPoint {
+        Self {
             branch: branch_point.branch,
             revision: branch_point.revision,
         }
@@ -1011,40 +1005,40 @@ impl From<&BranchPoint> for LoreBranchPoint {
 
 impl From<FileAction> for LoreFileAction {
     fn from(value: FileAction) -> Self {
-        LoreFileAction::from(value as u32)
+        Self::from(value as u32)
     }
 }
 
 impl From<u16> for LoreFileAction {
     fn from(value: u16) -> Self {
-        LoreFileAction::from(value as u32)
+        Self::from(value as u32)
     }
 }
 
 impl From<u32> for LoreFileAction {
     fn from(value: u32) -> Self {
         if value == FileAction::Add as u32 {
-            return LoreFileAction::Add;
+            return Self::Add;
         } else if value == FileAction::Delete as u32 {
-            return LoreFileAction::Delete;
+            return Self::Delete;
         } else if value == FileAction::Move as u32 {
-            return LoreFileAction::Move;
+            return Self::Move;
         } else if value == FileAction::Copy as u32 {
-            return LoreFileAction::Copy;
+            return Self::Copy;
         }
 
-        LoreFileAction::Keep
+        Self::Keep
     }
 }
 
 impl LoreFileAction {
     pub fn as_string_short(&self) -> &'static str {
         match self {
-            LoreFileAction::Add => "A",
-            LoreFileAction::Delete => "D",
-            LoreFileAction::Move => "V",
-            LoreFileAction::Copy => "C",
-            LoreFileAction::Keep => "M",
+            Self::Add => "A",
+            Self::Delete => "D",
+            Self::Move => "V",
+            Self::Copy => "C",
+            Self::Keep => "M",
         }
     }
 }
diff --git a/lore-revision/src/link.rs b/lore-revision/src/link.rs
index 76c43cc..4c5d297 100644
--- a/lore-revision/src/link.rs
+++ b/lore-revision/src/link.rs
@@ -102,21 +102,19 @@ pub enum LinkError {
 impl EventError for LinkError {
     fn translated(&self) -> LoreError {
         match self {
-            LinkError::Disconnected(_) => LoreError::Connection,
-            LinkError::SlowDown(_) => LoreError::SlowDown,
-            LinkError::Oversized(_) => LoreError::Oversized,
-            LinkError::FileNotFound(_) => LoreError::FileNotFound,
-            LinkError::NotFound(_)
-            | LinkError::LayerNotFound(_)
-            | LinkError::RevisionNotFound(_)
-            | LinkError::BranchNotFound(_)
-            | LinkError::LinkNotFound(_)
-            | LinkError::LinkPathNotFound(_) => LoreError::NotFound,
-            LinkError::AddressNotFound(_) => LoreError::AddressNotFound,
-            LinkError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            LinkError::InvalidPath(_) | LinkError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
-            }
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::LayerNotFound(_)
+            | Self::RevisionNotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::LinkNotFound(_)
+            | Self::LinkPathNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/metadata.rs b/lore-revision/src/metadata.rs
index 59a8f7c..d6bcdad 100644
--- a/lore-revision/src/metadata.rs
+++ b/lore-revision/src/metadata.rs
@@ -82,9 +82,9 @@ pub enum MetadataErrors {
 impl EventError for MetadataErrors {
     fn translated(&self) -> LoreError {
         match self {
-            MetadataErrors::FileNotFound(_) => LoreError::NotFound,
-            MetadataErrors::Oversized(_) => LoreError::Oversized,
-            MetadataErrors::Disconnected(_) => LoreError::Connection,
+            Self::FileNotFound(_) => LoreError::NotFound,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::Disconnected(_) => LoreError::Connection,
             _ => LoreError::Internal,
         }
     }
@@ -171,13 +171,13 @@ pub enum MetadataType {
 impl MetadataType {
     pub fn from(num: u32) -> Self {
         match num {
-            1 => MetadataType::Address,
-            2 => MetadataType::Boolean,
-            3 => MetadataType::Context,
-            4 => MetadataType::Hash,
-            5 => MetadataType::Numeric,
-            6 => MetadataType::String,
-            _ => MetadataType::Binary,
+            1 => Self::Address,
+            2 => Self::Boolean,
+            3 => Self::Context,
+            4 => Self::Hash,
+            5 => Self::Numeric,
+            6 => Self::String,
+            _ => Self::Binary,
         }
     }
 }
@@ -214,7 +214,7 @@ static DEFAULT_METADATA_CAPACITY: usize = if FRAGMENT_SIZE_THRESHOLD > 64 * 1024
 
 impl Clone for Metadata {
     fn clone(&self) -> Self {
-        Metadata::new_with_buffer(self.buffer.clone())
+        Self::new_with_buffer(self.buffer.clone())
     }
 
     fn clone_from(&mut self, source: &Self) {
@@ -257,7 +257,7 @@ impl Metadata {
         .await
         .forward::<MetadataError>("reading metadata")?;
 
-        let metadata = Metadata::new_with_buffer(BytesMut::from(buffer));
+        let metadata = Self::new_with_buffer(BytesMut::from(buffer));
         metadata.check_header()?;
 
         Ok(metadata)
diff --git a/lore-revision/src/metadata/branch.rs b/lore-revision/src/metadata/branch.rs
index d16417e..d2d1982 100644
--- a/lore-revision/src/metadata/branch.rs
+++ b/lore-revision/src/metadata/branch.rs
@@ -74,7 +74,7 @@ pub enum BranchMetadataError {
 impl EventError for BranchMetadataError {
     fn translated(&self) -> LoreError {
         match self {
-            BranchMetadataError::Disconnected(_) => LoreError::Connection,
+            Self::Disconnected(_) => LoreError::Connection,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/metadata/repository.rs b/lore-revision/src/metadata/repository.rs
index dfc7c33..22a0672 100644
--- a/lore-revision/src/metadata/repository.rs
+++ b/lore-revision/src/metadata/repository.rs
@@ -67,7 +67,7 @@ pub enum RepositoryMetadataError {
 impl EventError for RepositoryMetadataError {
     fn translated(&self) -> LoreError {
         match self {
-            RepositoryMetadataError::Disconnected(_) => LoreError::Connection,
+            Self::Disconnected(_) => LoreError::Connection,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/metadata/set.rs b/lore-revision/src/metadata/set.rs
index 02764ce..2132b86 100644
--- a/lore-revision/src/metadata/set.rs
+++ b/lore-revision/src/metadata/set.rs
@@ -51,8 +51,8 @@ pub enum SetError {
 impl event::EventError for SetError {
     fn translated(&self) -> crate::interface::LoreError {
         match self {
-            SetError::InvalidArguments(_) => crate::interface::LoreError::InvalidArguments,
-            SetError::Disconnected(_) => crate::interface::LoreError::Connection,
+            Self::InvalidArguments(_) => crate::interface::LoreError::InvalidArguments,
+            Self::Disconnected(_) => crate::interface::LoreError::Connection,
             _ => crate::interface::LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/nametable.rs b/lore-revision/src/nametable.rs
index f24a5e7..719e340 100644
--- a/lore-revision/src/nametable.rs
+++ b/lore-revision/src/nametable.rs
@@ -57,7 +57,7 @@ impl From<NameTableFlags> for u32 {
 impl BitAnd<NameTableFlags> for u32 {
     type Output = Self;
 
-    fn bitand(self, rhs: NameTableFlags) -> u32 {
+    fn bitand(self, rhs: NameTableFlags) -> Self {
         self & rhs.bits()
     }
 }
@@ -71,7 +71,7 @@ impl BitAndAssign<NameTableFlags> for u32 {
 impl BitOr<NameTableFlags> for u32 {
     type Output = Self;
 
-    fn bitor(self, rhs: NameTableFlags) -> u32 {
+    fn bitor(self, rhs: NameTableFlags) -> Self {
         self | rhs.bits()
     }
 }
@@ -133,7 +133,7 @@ impl Default for NameTable {
     fn default() -> Self {
         let entry_capacity = PRIME_TABLE[0];
         let data_capacity = FRAGMENT_SIZE_THRESHOLD;
-        NameTable {
+        Self {
             data: parking_lot::RwLock::new(NameTableData {
                 entry_buffer: BytesMut::zeroed_count::<NameTableEntry>(entry_capacity),
                 data_buffer: BytesMut::with_capacity(data_capacity),
@@ -146,7 +146,7 @@ impl NameTable {
     pub async fn deserialize(
         repository: Arc<RepositoryContext>,
         hash: Hash,
-    ) -> Result<NameTable, NameTableError> {
+    ) -> Result<Self, NameTableError> {
         let state = NameTableState::read_from_immutable(
             repository.clone(),
             Address::zero_context_hash(hash),
@@ -192,7 +192,7 @@ impl NameTable {
             .internal("reading name table data buffer")?,
         );
 
-        Ok(NameTable {
+        Ok(Self {
             data: parking_lot::RwLock::new(NameTableData {
                 entry_buffer,
                 data_buffer,
diff --git a/lore-revision/src/node.rs b/lore-revision/src/node.rs
index 1967e03..1481642 100644
--- a/lore-revision/src/node.rs
+++ b/lore-revision/src/node.rs
@@ -188,7 +188,7 @@ bitflagsops!(NodeFlags, u16);
 
 impl NodeFlags {
     pub fn is_directory(&self) -> bool {
-        !(self.contains(NodeFlags::File) || self.contains(NodeFlags::Link))
+        !(self.contains(Self::File) || self.contains(Self::Link))
     }
 }
 
@@ -1119,7 +1119,7 @@ unsafe impl Send for NodeNameLock {}
 
 impl NodeBlock {
     pub fn new(data: Box<NodeBlockData>) -> Self {
-        NodeBlock {
+        Self {
             data: Arc::new(RwLock::new(NodeBlockRuntimeData {
                 data,
                 name: BytesMut::new(),
@@ -1129,7 +1129,7 @@ impl NodeBlock {
     }
 
     pub fn new_with_name(data: Box<NodeBlockData>, name: BytesMut) -> Self {
-        NodeBlock {
+        Self {
             data: Arc::new(RwLock::new(NodeBlockRuntimeData { data, name })),
             name_deserialized: AtomicBool::new(true),
         }
@@ -1271,7 +1271,7 @@ impl NodeBlock {
         repository: Arc<RepositoryContext>,
         state: &State,
         address: Address,
-    ) -> Result<NodeBlock, StateError> {
+    ) -> Result<Self, StateError> {
         // Normal path, expect latest data format version
         if let Ok(mut block_data) =
             NodeBlockData::read_box_from_immutable(repository.clone(), address, true).await
@@ -1284,7 +1284,7 @@ impl NodeBlock {
             }
             block_data.flags &= !NodeBlockFlags::Dirty;
             block_data.flags &= !NodeBlockFlags::DeferRepackNametable;
-            Ok(NodeBlock::new(block_data))
+            Ok(Self::new(block_data))
         } else {
             Self::deserialize_other_version(repository, state, address).await
         }
@@ -1294,7 +1294,7 @@ impl NodeBlock {
         repository: Arc<RepositoryContext>,
         state: &State,
         address: Address,
-    ) -> Result<NodeBlock, StateError> {
+    ) -> Result<Self, StateError> {
         // Try load old data format
         if let Ok(block_data_v0) =
             NodeBlockDataV0::read_box_from_immutable(repository.clone(), address, true).await
@@ -1306,7 +1306,7 @@ impl NodeBlock {
             block_data.flags &= !NodeBlockFlags::Dirty;
             block_data.flags &= !NodeBlockFlags::DeferRepackNametable;
 
-            return Ok(NodeBlock::new_with_name(block_data, name));
+            return Ok(Self::new_with_name(block_data, name));
         };
 
         let block_data_v2 =
@@ -1324,7 +1324,7 @@ impl NodeBlock {
         block_data.flags &= !NodeBlockFlags::Dirty;
         block_data.flags &= !NodeBlockFlags::DeferRepackNametable;
 
-        Ok(NodeBlock::new(block_data))
+        Ok(Self::new(block_data))
     }
 
     pub async fn convert_block_v0(
@@ -1681,7 +1681,7 @@ impl NodeLink {
     }
 
     pub fn invalid() -> Self {
-        NodeLink {
+        Self {
             node: INVALID_NODE,
             ..Default::default()
         }
@@ -1728,7 +1728,7 @@ impl NodeDelta {
             change_flags |= change::Flags::Merge;
         }
 
-        NodeDelta {
+        Self {
             node,
             _unused: 0,
             action: change::FileAction::from_node_flags(node_flags) as u16,
@@ -1743,7 +1743,7 @@ impl NodeDelta {
                 change.to.node
             }
         };
-        NodeDelta {
+        Self {
             node,
             _unused: 0,
             action: change.action as u16,
@@ -1860,10 +1860,8 @@ impl NodeFileMetadataBlockData {
         repository: Arc<RepositoryContext>,
         address: Address,
         cache: bool,
-    ) -> Result<Box<NodeFileMetadataBlockData>, ImmutableError> {
-        match NodeFileMetadataBlockData::read_box_from_immutable(repository.clone(), address, cache)
-            .await
-        {
+    ) -> Result<Box<Self>, ImmutableError> {
+        match Self::read_box_from_immutable(repository.clone(), address, cache).await {
             Ok(block) => Ok(block),
             Err(original_err) if original_err.is_internal() => {
                 match NodeFileMetadataBlockDataV0::read_box_from_immutable(
@@ -1904,7 +1902,7 @@ impl Default for NodeFileMetadataBlock {
 
 impl NodeFileMetadataBlock {
     pub fn new(data: Box<NodeFileMetadataBlockData>) -> Self {
-        NodeFileMetadataBlock {
+        Self {
             data: RwLock::new(data),
         }
     }
diff --git a/lore-revision/src/notification.rs b/lore-revision/src/notification.rs
index 02e22b7..3dd3724 100644
--- a/lore-revision/src/notification.rs
+++ b/lore-revision/src/notification.rs
@@ -146,7 +146,7 @@ pub struct NotificationSubscription {
 
 impl NotificationSubscription {
     pub fn new(task: JoinHandle<()>, cancellation_token: CancellationToken) -> Self {
-        NotificationSubscription {
+        Self {
             task,
             cancellation_token,
         }
diff --git a/lore-revision/src/repository.rs b/lore-revision/src/repository.rs
index 743b13e..e533072 100644
--- a/lore-revision/src/repository.rs
+++ b/lore-revision/src/repository.rs
@@ -199,7 +199,7 @@ pub struct StoreConfig {
 
 impl StoreConfig {
     fn client_default() -> Self {
-        StoreConfig {
+        Self {
             max_capacity: Some(10 * 1024 * 1024),
             eviction_delay: Some(10),
             max_size: Some(10 * 1024 * 1024 * 1024),
@@ -209,7 +209,7 @@ impl StoreConfig {
     }
 
     pub fn global_default() -> Self {
-        StoreConfig {
+        Self {
             max_capacity: Some(10 * 1024 * 1024),
             eviction_delay: Some(10),
             max_size: Some(10 * 1024 * 1024 * 1024),
@@ -245,7 +245,7 @@ pub struct FileConfig {
 
 impl Default for FileConfig {
     fn default() -> Self {
-        FileConfig {
+        Self {
             direct_write: Some(false),
             direct_io: Some(false),
             flush_write: Some(false),
@@ -266,13 +266,13 @@ impl SharedStoreToUseConfig {
         global_config: &GlobalConfig,
         use_shared_store: u8,
         path: &LoreString,
-    ) -> Result<Option<SharedStoreToUseConfig>, PathError> {
+    ) -> Result<Option<Self>, PathError> {
         if global_config
             .use_shared_store_automatically
             .unwrap_or(false)
             || use_shared_store != 0
         {
-            Ok(Some(SharedStoreToUseConfig {
+            Ok(Some(Self {
                 use_shared_store: Some(true),
                 shared_store_path: if let Some(path_string) = Into::<Option<&str>>::into(path) {
                     Some(make_absolute(path_string)?.to_string_lossy().to_string())
@@ -299,7 +299,7 @@ pub struct RepositoryRuntimeSettings {
 
 impl Default for RepositoryRuntimeSettings {
     fn default() -> Self {
-        RepositoryRuntimeSettings {
+        Self {
             disable_upload: AtomicBool::new(true),
             disable_cache: AtomicBool::new(true),
             direct_file_write: AtomicBool::new(false),
@@ -310,7 +310,7 @@ impl Default for RepositoryRuntimeSettings {
 
 impl Clone for RepositoryRuntimeSettings {
     fn clone(&self) -> Self {
-        RepositoryRuntimeSettings {
+        Self {
             disable_upload: AtomicBool::new(self.disable_upload.load(Ordering::Relaxed)),
             disable_cache: AtomicBool::new(self.disable_cache.load(Ordering::Relaxed)),
             direct_file_write: AtomicBool::new(self.direct_file_write.load(Ordering::Relaxed)),
@@ -481,9 +481,9 @@ impl RemoteState {
     /// reflects "no remote configured" rather than a failure, so it becomes `Offline`.
     fn from_result(remote: Result<Arc<Connection>, ProtocolError>) -> Self {
         match remote {
-            Ok(conn) => RemoteState::Connected(conn),
-            Err(ProtocolError::NoRemote(_)) => RemoteState::Offline,
-            Err(err) => RemoteState::Failed(err),
+            Ok(conn) => Self::Connected(conn),
+            Err(ProtocolError::NoRemote(_)) => Self::Offline,
+            Err(err) => Self::Failed(err),
         }
     }
 }
@@ -528,7 +528,7 @@ impl RepositoryContext {
         format: RepositoryFormat,
     ) -> Self {
         let file_system = Self::default_filesystem(path.as_deref().unwrap_or(Path::new("")));
-        RepositoryContext {
+        Self {
             path,
             immutable_store,
             mutable_store,
@@ -737,7 +737,7 @@ impl RepositoryContext {
         mutable_store: Arc<dyn MutableStore>,
         id: RepositoryId,
     ) -> Self {
-        RepositoryContext {
+        Self {
             file_system: Self::default_filesystem(Path::new("")),
             path: None,
             immutable_store,
@@ -756,7 +756,7 @@ impl RepositoryContext {
     }
 
     pub fn to_server_context(&self, id: RepositoryId) -> Self {
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -778,7 +778,7 @@ impl RepositoryContext {
         immutable_store: Arc<dyn ImmutableStore>,
         mutable_store: Arc<dyn MutableStore>,
     ) -> Self {
-        RepositoryContext {
+        Self {
             file_system: Self::default_filesystem(Path::new("")),
             path: None,
             immutable_store,
@@ -797,7 +797,7 @@ impl RepositoryContext {
     }
 
     pub fn to_null_context(&self) -> Self {
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -829,7 +829,7 @@ impl RepositoryContext {
         filter: Arc<Filter>,
         remote: Result<Arc<Connection>, ProtocolError>,
     ) -> Self {
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -855,7 +855,7 @@ impl RepositoryContext {
             remote
         };
         let settings = self.settings.clone();
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -881,7 +881,7 @@ impl RepositoryContext {
             remote
         };
         let settings = self.settings.clone();
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -900,7 +900,7 @@ impl RepositoryContext {
     }
 
     pub fn to_filter_context(&self, filter: Arc<Filter>) -> Self {
-        RepositoryContext {
+        Self {
             path: self.path.clone(),
             immutable_store: self.immutable_store.clone(),
             mutable_store: self.mutable_store.clone(),
@@ -1075,24 +1075,23 @@ pub enum RepositoryError {
 impl EventError for RepositoryError {
     fn translated(&self) -> LoreError {
         match self {
-            RepositoryError::Disconnected(_) => LoreError::Connection,
-            RepositoryError::SlowDown(_) => LoreError::SlowDown,
-            RepositoryError::Oversized(_) => LoreError::Oversized,
-            RepositoryError::FileNotFound(_) => LoreError::FileNotFound,
-            RepositoryError::NotFound(_)
-            | RepositoryError::RepositoryNotFound(_)
-            | RepositoryError::BranchNotFound(_)
-            | RepositoryError::RevisionNotFound(_)
-            | RepositoryError::LayerNotFound(_)
-            | RepositoryError::LinkNotFound(_)
-            | RepositoryError::NodeNotFound(_) => LoreError::NotFound,
-            RepositoryError::AddressNotFound(_) => LoreError::AddressNotFound,
-            RepositoryError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            RepositoryError::InvalidPath(_) | RepositoryError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::RepositoryNotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::RevisionNotFound(_)
+            | Self::LayerNotFound(_)
+            | Self::LinkNotFound(_)
+            | Self::NodeNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::RepositoryAlreadyExists(_) | Self::BranchAlreadyExists(_) => {
+                LoreError::AlreadyExists
             }
-            RepositoryError::RepositoryAlreadyExists(_)
-            | RepositoryError::BranchAlreadyExists(_) => LoreError::AlreadyExists,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/repository/clone.rs b/lore-revision/src/repository/clone.rs
index b263c61..b5b8531 100644
--- a/lore-revision/src/repository/clone.rs
+++ b/lore-revision/src/repository/clone.rs
@@ -122,21 +122,19 @@ pub enum CloneError {
 impl EventError for CloneError {
     fn translated(&self) -> LoreError {
         match self {
-            CloneError::Disconnected(_) => LoreError::Connection,
-            CloneError::SlowDown(_) => LoreError::SlowDown,
-            CloneError::Oversized(_) => LoreError::Oversized,
-            CloneError::FileNotFound(_) => LoreError::FileNotFound,
-            CloneError::NotFound(_)
-            | CloneError::BranchNotFound(_)
-            | CloneError::RevisionNotFound(_)
-            | CloneError::LayerNotFound(_)
-            | CloneError::LinkNotFound(_)
-            | CloneError::NodeNotFound(_) => LoreError::NotFound,
-            CloneError::AddressNotFound(_) => LoreError::AddressNotFound,
-            CloneError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            CloneError::InvalidPath(_) | CloneError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
-            }
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_)
+            | Self::BranchNotFound(_)
+            | Self::RevisionNotFound(_)
+            | Self::LayerNotFound(_)
+            | Self::LinkNotFound(_)
+            | Self::NodeNotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
@@ -282,7 +280,7 @@ pub struct CloneStats {
 
 impl Default for CloneStats {
     fn default() -> Self {
-        CloneStats {
+        Self {
             discovery: DiscoveryStats::default(),
             complete: CloneCompleteStats::default(),
             file_inflight: Arc::new(Semaphore::new(CLONE_FILE_DISCOVERY)),
diff --git a/lore-revision/src/repository/create.rs b/lore-revision/src/repository/create.rs
index 7cf833e..d4473f2 100644
--- a/lore-revision/src/repository/create.rs
+++ b/lore-revision/src/repository/create.rs
@@ -92,12 +92,12 @@ pub enum CreateError {
 impl EventError for CreateError {
     fn translated(&self) -> LoreError {
         match self {
-            CreateError::Disconnected(_) => LoreError::Connection,
-            CreateError::SlowDown(_) => LoreError::SlowDown,
-            CreateError::Oversized(_) => LoreError::Oversized,
-            CreateError::NotFound(_) => LoreError::NotFound,
-            CreateError::RepositoryAlreadyExists(_) => LoreError::AlreadyExists,
-            CreateError::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::NotFound(_) => LoreError::NotFound,
+            Self::RepositoryAlreadyExists(_) => LoreError::AlreadyExists,
+            Self::InvalidPath(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/repository/status.rs b/lore-revision/src/repository/status.rs
index 00ade2b..9a1394b 100644
--- a/lore-revision/src/repository/status.rs
+++ b/lore-revision/src/repository/status.rs
@@ -114,7 +114,7 @@ impl LoreRepositoryStatusRevisionEventData {
         remote_authorized: bool,
         remote_branch_exist: bool,
     ) -> Self {
-        LoreRepositoryStatusRevisionEventData {
+        Self {
             repository,
             branch,
             branch_name: branch_name.into(),
@@ -196,7 +196,7 @@ impl LoreRepositoryStatusFileEventData {
         } else {
             LoreNodeType::Directory
         };
-        LoreRepositoryStatusFileEventData {
+        Self {
             path: LoreString::from(&change.path),
             size,
             action: LoreFileAction::from(change.action),
@@ -354,18 +354,16 @@ pub enum StatusError {
 impl EventError for StatusError {
     fn translated(&self) -> LoreError {
         match self {
-            StatusError::Disconnected(_) => LoreError::Connection,
-            StatusError::SlowDown(_) => LoreError::SlowDown,
-            StatusError::Oversized(_) => LoreError::Oversized,
-            StatusError::FileNotFound(_) => LoreError::FileNotFound,
-            StatusError::NotFound(_)
-            | StatusError::LayerNotFound(_)
-            | StatusError::RevisionNotFound(_) => LoreError::NotFound,
-            StatusError::AddressNotFound(_) => LoreError::AddressNotFound,
-            StatusError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            StatusError::InvalidArguments(_) | StatusError::InvalidPath(_) => {
-                LoreError::InvalidArguments
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_) | Self::LayerNotFound(_) | Self::RevisionNotFound(_) => {
+                LoreError::NotFound
             }
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidArguments(_) | Self::InvalidPath(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/revision.rs b/lore-revision/src/revision.rs
index 395e59b..59ad10a 100644
--- a/lore-revision/src/revision.rs
+++ b/lore-revision/src/revision.rs
@@ -81,7 +81,7 @@ pub struct RevisionMetadata {
 
 impl RevisionMetadata {
     pub fn from_metadata(metadata: Metadata) -> Self {
-        let mut revision_metadata = RevisionMetadata::default();
+        let mut revision_metadata = Self::default();
         let _ = metadata.walk(|key, value, _value_type| {
             let key = std::str::from_utf8(key).unwrap_or("<binary>");
             match key {
diff --git a/lore-revision/src/revision/bisect.rs b/lore-revision/src/revision/bisect.rs
index 57d21aa..fd95777 100644
--- a/lore-revision/src/revision/bisect.rs
+++ b/lore-revision/src/revision/bisect.rs
@@ -87,11 +87,11 @@ pub enum BisectError {
 impl EventError for BisectError {
     fn translated(&self) -> LoreError {
         match self {
-            BisectError::Disconnected(_) => LoreError::Connection,
-            BisectError::SlowDown(_) => LoreError::SlowDown,
-            BisectError::Oversized(_) => LoreError::Oversized,
-            BisectError::NotFound(_) => LoreError::NotFound,
-            BisectError::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::NotFound(_) => LoreError::NotFound,
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/revision/diff.rs b/lore-revision/src/revision/diff.rs
index d5cd43f..a951bac 100644
--- a/lore-revision/src/revision/diff.rs
+++ b/lore-revision/src/revision/diff.rs
@@ -42,7 +42,7 @@ pub struct LoreRevisionDiffFileEventData {
 
 impl LoreRevisionDiffFileEventData {
     pub fn from_node_change(change: &NodeChange, old_is_file: bool, new_is_file: bool) -> Self {
-        LoreRevisionDiffFileEventData {
+        Self {
             path: LoreString::from(&change.path),
             action: LoreFileAction::from(change.action),
             old_is_file: old_is_file.into(),
diff --git a/lore-revision/src/revision/history.rs b/lore-revision/src/revision/history.rs
index 81dd214..12b7449 100644
--- a/lore-revision/src/revision/history.rs
+++ b/lore-revision/src/revision/history.rs
@@ -32,7 +32,7 @@ pub struct LoreRevisionHistoryEventData {
 
 impl LoreRevisionHistoryEventData {
     pub fn new(repository: RepositoryId, branch: BranchId) -> Self {
-        LoreRevisionHistoryEventData { repository, branch }
+        Self { repository, branch }
     }
 }
 
@@ -52,7 +52,7 @@ pub struct LoreRevisionHistoryEntryEventData {
 
 impl LoreRevisionHistoryEntryEventData {
     pub fn new(state: Arc<State>) -> Self {
-        LoreRevisionHistoryEntryEventData {
+        Self {
             revision: state.revision(),
             revision_number: state.revision_number(),
             parent: [state.parent_self(), state.parent_other()],
diff --git a/lore-revision/src/revision/info.rs b/lore-revision/src/revision/info.rs
index 5bd7a90..46c41b1 100644
--- a/lore-revision/src/revision/info.rs
+++ b/lore-revision/src/revision/info.rs
@@ -45,7 +45,7 @@ pub struct LoreRevisionInfoEventData {
 
 impl LoreRevisionInfoEventData {
     pub fn new(repository: RepositoryId, state: Arc<State>) -> Self {
-        LoreRevisionInfoEventData {
+        Self {
             repository,
             revision: state.revision(),
             revision_number: state.revision_number(),
@@ -78,7 +78,7 @@ pub struct LoreRevisionInfoDeltaEventData {
 
 impl LoreRevisionInfoDeltaEventData {
     pub fn new(path: &str, delta: &NodeDelta, file: bool, size: u64) -> Self {
-        LoreRevisionInfoDeltaEventData {
+        Self {
             path: path.into(),
             size,
             action: LoreFileAction::from(delta.action),
diff --git a/lore-revision/src/revision/restore.rs b/lore-revision/src/revision/restore.rs
index 33b40f8..f54ef7a 100644
--- a/lore-revision/src/revision/restore.rs
+++ b/lore-revision/src/revision/restore.rs
@@ -187,18 +187,16 @@ pub enum RestoreError {
 impl EventError for RestoreError {
     fn translated(&self) -> LoreError {
         match self {
-            RestoreError::Disconnected(_) => LoreError::Connection,
-            RestoreError::SlowDown(_) => LoreError::SlowDown,
-            RestoreError::Oversized(_) => LoreError::Oversized,
-            RestoreError::FileNotFound(_) => LoreError::FileNotFound,
-            RestoreError::NotFound(_)
-            | RestoreError::LayerNotFound(_)
-            | RestoreError::RevisionNotFound(_) => LoreError::NotFound,
-            RestoreError::AddressNotFound(_) => LoreError::AddressNotFound,
-            RestoreError::PayloadNotFound(_) => LoreError::PayloadNotFound,
-            RestoreError::InvalidPath(_) | RestoreError::InvalidArguments(_) => {
-                LoreError::InvalidArguments
+            Self::Disconnected(_) => LoreError::Connection,
+            Self::SlowDown(_) => LoreError::SlowDown,
+            Self::Oversized(_) => LoreError::Oversized,
+            Self::FileNotFound(_) => LoreError::FileNotFound,
+            Self::NotFound(_) | Self::LayerNotFound(_) | Self::RevisionNotFound(_) => {
+                LoreError::NotFound
             }
+            Self::AddressNotFound(_) => LoreError::AddressNotFound,
+            Self::PayloadNotFound(_) => LoreError::PayloadNotFound,
+            Self::InvalidPath(_) | Self::InvalidArguments(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/revision/sync.rs b/lore-revision/src/revision/sync.rs
index 24c4195..7cba591 100644
--- a/lore-revision/src/revision/sync.rs
+++ b/lore-revision/src/revision/sync.rs
@@ -187,7 +187,7 @@ impl EventError for SyncError {
 
 impl From<FsError> for SyncError {
     fn from(value: FsError) -> Self {
-        SyncError::internal_with_context(value, "Failed during internal filesystem operation")
+        Self::internal_with_context(value, "Failed during internal filesystem operation")
     }
 }
 
diff --git a/lore-revision/src/shared_store.rs b/lore-revision/src/shared_store.rs
index 0678bc2..04ece14 100644
--- a/lore-revision/src/shared_store.rs
+++ b/lore-revision/src/shared_store.rs
@@ -51,7 +51,7 @@ pub enum SharedStoreError {
 impl EventError for SharedStoreError {
     fn translated(&self) -> LoreError {
         match self {
-            SharedStoreError::InvalidPath(_) => LoreError::InvalidArguments,
+            Self::InvalidPath(_) => LoreError::InvalidArguments,
             _ => LoreError::Internal,
         }
     }
diff --git a/lore-revision/src/state.rs b/lore-revision/src/state.rs
index 61f792d..f5ac004 100644
--- a/lore-revision/src/state.rs
+++ b/lore-revision/src/state.rs
@@ -493,7 +493,7 @@ struct StateRuntime {
 
 impl StateRuntime {
     pub fn new(signature: Hash, rehash_node_names: bool) -> Self {
-        StateRuntime {
+        Self {
             signature,
             tree: None,
             block_address: Bytes::default(),
@@ -537,7 +537,7 @@ impl State {
             .await
             .internal("Failed to deserialize anchor")?;
         Ok((
-            State::deserialize(repository.clone(), current_revision).await?,
+            Self::deserialize(repository.clone(), current_revision).await?,
             branch,
         ))
     }
@@ -552,7 +552,7 @@ impl State {
         let (current_revision, branch) = crate::instance::load_current_anchor(&repository)
             .await
             .internal("Failed to deserialize anchor")?;
-        let state_current = State::deserialize(repository.clone(), current_revision).await?;
+        let state_current = Self::deserialize(repository.clone(), current_revision).await?;
 
         let state_staged = match crate::instance::load_staged_revision(&repository)
             .await
@@ -560,7 +560,7 @@ impl State {
             .flatten()
         {
             Some(staged_revision) if staged_revision != current_revision => {
-                Some(State::deserialize(repository.clone(), staged_revision).await?)
+                Some(Self::deserialize(repository.clone(), staged_revision).await?)
             }
             _ => None,
         };
@@ -573,7 +573,7 @@ impl State {
         signature: Hash,
     ) -> Result<Arc<Self>, StateError> {
         if signature.is_zero() {
-            return Ok(Arc::new(State::new()));
+            return Ok(Arc::new(Self::new()));
         }
         let address = Address::zero_context_hash(signature);
         let options = read_options_from_repository(&repository);
@@ -605,7 +605,7 @@ impl State {
             let rehash_node_names = data.format < StateFormat::LowerCaseHash as u32;
             // Clean flags
             data.flags &= !StateFlags::Dirty;
-            Ok(Arc::new(State {
+            Ok(Arc::new(Self {
                 data: parking_lot::RwLock::new(data),
                 runtime: parking_lot::RwLock::new(StateRuntime::new(signature, rehash_node_names)),
                 unused: tokio::sync::Semaphore::new(1),
@@ -1996,7 +1996,7 @@ impl State {
         } else if node.is_link() {
             let link = node.linked_node();
             let linked_repository = Arc::new(repository.to_link_context(link.repository).await);
-            let link_state = State::deserialize(linked_repository.clone(), link.revision).await?;
+            let link_state = Self::deserialize(linked_repository.clone(), link.revision).await?;
             Box::pin(link_state.node_children(linked_repository.clone(), link.node)).await
         } else {
             Ok(vec![])
@@ -2419,7 +2419,7 @@ impl State {
                 if node.is_link() {
                     let link = node.linked_node();
                     repository = Arc::new(repository.to_link_context(link.repository).await);
-                    let link_state = State::deserialize(repository.clone(), link.revision).await?;
+                    let link_state = Self::deserialize(repository.clone(), link.revision).await?;
                     return Box::pin(link_state.find_relative_node_link(
                         repository,
                         link.node,
@@ -2491,7 +2491,7 @@ impl State {
             Ok(*block_reader.node(inode))
         } else {
             let repository = Arc::new(repository.to_link_context(node_link.repository).await);
-            let state = State::deserialize(repository.clone(), node_link.revision).await?;
+            let state = Self::deserialize(repository.clone(), node_link.revision).await?;
             let block = state.block(repository, iblock).await?;
             let block_reader = block.read();
             Ok(*block_reader.node(inode))
@@ -2597,7 +2597,7 @@ impl State {
             let signature = link.revision;
             let link_node = link.node;
             let linked_repository = Arc::new(repository.to_link_context(linked_repository).await);
-            let link_state = State::deserialize(linked_repository.clone(), signature)
+            let link_state = Self::deserialize(linked_repository.clone(), signature)
                 .await
                 .internal("Link error")?;
 
@@ -2669,7 +2669,7 @@ impl State {
             let signature = link.revision;
             let link_node = link.node;
             let linked_repository = Arc::new(repository.to_link_context(linked_repository).await);
-            let link_state = State::deserialize(linked_repository.clone(), signature)
+            let link_state = Self::deserialize(linked_repository.clone(), signature)
                 .await
                 .internal("Link error")?;
 
@@ -4455,7 +4455,7 @@ pub struct FilesystemDiffStats {
 }
 
 impl FilesystemDiffStats {
-    fn append(&mut self, stats: FilesystemDiffStats) {
+    fn append(&mut self, stats: Self) {
         self.file_add
             .fetch_add(stats.file_add.load(Ordering::Relaxed), Ordering::Relaxed);
         self.file_delete
diff --git a/lore-revision/src/state/sink.rs b/lore-revision/src/state/sink.rs
index f4250e8..4bf475d 100644
--- a/lore-revision/src/state/sink.rs
+++ b/lore-revision/src/state/sink.rs
@@ -37,11 +37,11 @@ pub enum OwnedChangeSink {
 impl OwnedChangeSink {
     pub async fn emit(&mut self, change: NodeChange) -> Result<(), StateError> {
         match self {
-            OwnedChangeSink::Vec(v) => {
+            Self::Vec(v) => {
                 v.push(change);
                 Ok(())
             }
-            OwnedChangeSink::Channel(tx) => tx
+            Self::Channel(tx) => tx
                 .send(Ok(change))
                 .await
                 .map_err(|_send_err| StateError::internal("Diff receiver dropped")),
@@ -50,8 +50,8 @@ impl OwnedChangeSink {
 
     pub fn as_sink(&mut self) -> ChangeSink<'_> {
         match self {
-            OwnedChangeSink::Vec(v) => ChangeSink::Vec(v),
-            OwnedChangeSink::Channel(tx) => ChangeSink::Channel(tx),
+            Self::Vec(v) => ChangeSink::Vec(v),
+            Self::Channel(tx) => ChangeSink::Channel(tx),
         }
     }
 }
diff --git a/lore-revision/src/store/composite.rs b/lore-revision/src/store/composite.rs
index 962ef92..4efa7f0 100644
--- a/lore-revision/src/store/composite.rs
+++ b/lore-revision/src/store/composite.rs
@@ -140,21 +140,21 @@ enum CompositeStoreHit<T> {
 impl<T> CompositeStoreHit<T> {
     fn inner(&self) -> &T {
         match self {
-            CompositeStoreHit::Local(v)
-            | CompositeStoreHit::Durable(v)
-            | CompositeStoreHit::Replica(v)
-            | CompositeStoreHit::Mixed(v)
-            | CompositeStoreHit::Miss(v) => v,
+            Self::Local(v)
+            | Self::Durable(v)
+            | Self::Replica(v)
+            | Self::Mixed(v)
+            | Self::Miss(v) => v,
         }
     }
 
     fn map<U, F: FnOnce(T) -> U>(self, op: F) -> CompositeStoreHit<U> {
         match self {
-            CompositeStoreHit::Local(v) => CompositeStoreHit::Local(op(v)),
-            CompositeStoreHit::Durable(v) => CompositeStoreHit::Durable(op(v)),
-            CompositeStoreHit::Replica(v) => CompositeStoreHit::Replica(op(v)),
-            CompositeStoreHit::Mixed(v) => CompositeStoreHit::Mixed(op(v)),
-            CompositeStoreHit::Miss(v) => CompositeStoreHit::Miss(op(v)),
+            Self::Local(v) => CompositeStoreHit::Local(op(v)),
+            Self::Durable(v) => CompositeStoreHit::Durable(op(v)),
+            Self::Replica(v) => CompositeStoreHit::Replica(op(v)),
+            Self::Mixed(v) => CompositeStoreHit::Mixed(op(v)),
+            Self::Miss(v) => CompositeStoreHit::Miss(op(v)),
         }
     }
 
@@ -162,11 +162,11 @@ impl<T> CompositeStoreHit<T> {
     /// with the type of hit.
     fn into_counted_result<E>(self, counter: &Counter<u64>) -> Result<T, E> {
         let (kind, value) = match self {
-            CompositeStoreHit::Local(v) => ("local", v),
-            CompositeStoreHit::Durable(v) => ("durable", v),
-            CompositeStoreHit::Replica(v) => ("replica", v),
-            CompositeStoreHit::Mixed(v) => ("mixed", v),
-            CompositeStoreHit::Miss(v) => ("miss", v),
+            Self::Local(v) => ("local", v),
+            Self::Durable(v) => ("durable", v),
+            Self::Replica(v) => ("replica", v),
+            Self::Mixed(v) => ("mixed", v),
+            Self::Miss(v) => ("miss", v),
         };
 
         counter.add(1, &[STORE_ATTRIBUTE.clone(), KeyValue::new("found", kind)]);
diff --git a/lore-revision/src/store/remote.rs b/lore-revision/src/store/remote.rs
index a9d02e9..c8eb050 100644
--- a/lore-revision/src/store/remote.rs
+++ b/lore-revision/src/store/remote.rs
@@ -46,7 +46,7 @@ pub struct RemoteImmutableStore {
 
 impl RemoteImmutableStore {
     pub fn new(remote_url: &str, identity: Option<&str>) -> Self {
-        RemoteImmutableStore {
+        Self {
             remote_url: remote_url.to_string(),
             identity: identity.map(|url| url.to_string()),
             connections: Mutex::new(HashMap::new()),
@@ -330,7 +330,7 @@ pub struct RemoteMutableStore {
 
 impl RemoteMutableStore {
     pub fn new(remote_url: &str, identity: Option<&str>) -> Self {
-        RemoteMutableStore {
+        Self {
             remote_url: remote_url.to_string(),
             identity: identity.map(|identity| identity.to_string()),
             connections: Mutex::new(HashMap::new()),
diff --git a/lore-revision/src/util/fs.rs b/lore-revision/src/util/fs.rs
index c957b39..ba26c44 100644
--- a/lore-revision/src/util/fs.rs
+++ b/lore-revision/src/util/fs.rs
@@ -345,17 +345,17 @@ pub enum PathListingResult {
 impl PathListingResult {
     /// Returns true if the path was a directory.
     pub fn is_directory(&self) -> bool {
-        matches!(self, PathListingResult::Directory { .. })
+        matches!(self, Self::Directory { .. })
     }
 
     /// Returns true if the path was a file.
     pub fn is_file(&self) -> bool {
-        matches!(self, PathListingResult::File { .. })
+        matches!(self, Self::File { .. })
     }
 
     /// Returns true if the path was not found or not accessible.
     pub fn is_not_found(&self) -> bool {
-        matches!(self, PathListingResult::NotFound)
+        matches!(self, Self::NotFound)
     }
 }
 
diff --git a/lore-revision/src/util/inflight.rs b/lore-revision/src/util/inflight.rs
index 1217183..fe17c0c 100644
--- a/lore-revision/src/util/inflight.rs
+++ b/lore-revision/src/util/inflight.rs
@@ -83,7 +83,7 @@ where
     Output: Debug,
 {
     fn default() -> Self {
-        InflightOutput {
+        Self {
             requests: Default::default(),
         }
     }
diff --git a/lore-revision/src/util/path.rs b/lore-revision/src/util/path.rs
index 054a564..bd1431a 100644
--- a/lore-revision/src/util/path.rs
+++ b/lore-revision/src/util/path.rs
@@ -184,7 +184,7 @@ pub struct RelativePath {
 
 impl RelativePath {
     pub fn new() -> Self {
-        RelativePath {
+        Self {
             data: Arc::new(RelativePathData {
                 path: String::new(),
                 path_lower: String::new(),
@@ -272,19 +272,16 @@ impl RelativePath {
         &self.data.path_lower[self.start_lower..self.end_lower]
     }
 
-    pub fn new_from_initial_path(name: impl AsRef<str>) -> Result<RelativePath, PathError> {
+    pub fn new_from_initial_path(name: impl AsRef<str>) -> Result<Self, PathError> {
         RelativePathBuf::new_from_initial_path(name).map(|p| p.freeze())
     }
 
     /// Construct a path from two parts. Parts are required to be clean.
-    pub fn new_from_clean_parts(root: &str, tail: &str) -> RelativePath {
+    pub fn new_from_clean_parts(root: &str, tail: &str) -> Self {
         RelativePathBuf::new_from_clean_parts(root, tail).freeze()
     }
 
-    pub fn new_from_user_path(
-        repository_path: &Path,
-        user_path: &str,
-    ) -> Result<RelativePath, PathError> {
+    pub fn new_from_user_path(repository_path: &Path, user_path: &str) -> Result<Self, PathError> {
         RelativePathBuf::new_from_user_path(repository_path, user_path).map(|p| p.freeze())
     }
 
@@ -292,7 +289,7 @@ impl RelativePath {
         repository_path.as_ref().join(self.as_str())
     }
 
-    pub fn join(&self, suffix: impl AsRef<str>) -> RelativePath {
+    pub fn join(&self, suffix: impl AsRef<str>) -> Self {
         self.push_into_buf(suffix).freeze()
     }
 
@@ -414,7 +411,7 @@ impl RelativePath {
     ///
     /// Comparison is structural on the canonical `/`-separated form
     /// (case-sensitive). The returned paths are in lexicographic order.
-    pub fn dedup_to_supersets(paths: Vec<RelativePath>) -> Vec<RelativePath> {
+    pub fn dedup_to_supersets(paths: Vec<Self>) -> Vec<Self> {
         if paths.iter().any(|p| p.is_empty()) {
             return Vec::new();
         }
@@ -422,7 +419,7 @@ impl RelativePath {
         let mut sorted = paths;
         sorted.sort_by(|a, b| a.as_str().cmp(b.as_str()));
 
-        let mut result: Vec<RelativePath> = Vec::with_capacity(sorted.len());
+        let mut result: Vec<Self> = Vec::with_capacity(sorted.len());
         for path in sorted {
             if !result
                 .iter()
@@ -539,7 +536,7 @@ impl FromStr for RelativePath {
         let path_lower = path.to_lowercase();
         let end = path.len();
         let end_lower = path_lower.len();
-        Ok(RelativePath {
+        Ok(Self {
             data: Arc::new(RelativePathData {
                 path: path.to_owned(),
                 path_lower,
@@ -587,7 +584,7 @@ impl Default for RelativePathBuf {
 impl RelativePathBuf {
     /// Create a new empty `RelativePathBuf`.
     pub fn new() -> Self {
-        RelativePathBuf {
+        Self {
             path: String::with_capacity(256),
             path_lower: String::with_capacity(256),
         }
@@ -595,7 +592,7 @@ impl RelativePathBuf {
 
     /// Construct from an initial path string.
     /// Validates that the path is not absolute and cleans it.
-    pub fn new_from_initial_path(name: impl AsRef<str>) -> Result<RelativePathBuf, PathError> {
+    pub fn new_from_initial_path(name: impl AsRef<str>) -> Result<Self, PathError> {
         let name = name.as_ref();
         if name.starts_with("..") || (name.len() >= 2 && name.as_bytes()[1] == b':') {
             return Err(InvalidPath {
@@ -603,7 +600,7 @@ impl RelativePathBuf {
             }
             .into());
         }
-        let mut initial_path = RelativePathBuf::new();
+        let mut initial_path = Self::new();
         let name = name.trim_matches('/');
         let name = name.replace('\\', "/").replace("//", "/");
         let name = name.trim_start_matches("./");
@@ -617,8 +614,8 @@ impl RelativePathBuf {
 
     /// Construct a path from two clean parts (root and tail).
     /// Parts are required to be clean.
-    pub fn new_from_clean_parts(mut root: &str, mut tail: &str) -> RelativePathBuf {
-        let mut path = RelativePathBuf::new();
+    pub fn new_from_clean_parts(mut root: &str, mut tail: &str) -> Self {
+        let mut path = Self::new();
         if root.ends_with('/') {
             root = &root[..(root.len() - 1)];
         }
@@ -636,12 +633,9 @@ impl RelativePathBuf {
 
     /// Construct from a user-provided path relative to a repository path.
     /// Makes the user path absolute if needed, then computes the relative portion.
-    pub fn new_from_user_path(
-        repository_path: &Path,
-        user_path: &str,
-    ) -> Result<RelativePathBuf, PathError> {
+    pub fn new_from_user_path(repository_path: &Path, user_path: &str) -> Result<Self, PathError> {
         if user_path == "." || user_path.is_empty() {
-            return Ok(RelativePathBuf::new());
+            return Ok(Self::new());
         }
 
         let mut absolute_path = Path::new(user_path).to_path_buf();
@@ -673,10 +667,10 @@ impl RelativePathBuf {
             .1
             .trim_matches('/');
         if relative_path.is_empty() || relative_path == "." {
-            return Ok(RelativePathBuf::new());
+            return Ok(Self::new());
         }
 
-        let mut out_path = RelativePathBuf::new();
+        let mut out_path = Self::new();
         out_path.push(relative_path);
         Ok(out_path)
     }
diff --git a/lore-revision/src/util/task_queue.rs b/lore-revision/src/util/task_queue.rs
index 8da1b78..cb1bc9d 100644
--- a/lore-revision/src/util/task_queue.rs
+++ b/lore-revision/src/util/task_queue.rs
@@ -192,7 +192,7 @@ where
                             // ensure we have capacity to process it. If not, wait until we acquire
                             // a permit before executing the task.
                             #[cfg(not(test))]
-                            let permit_future = TaskQueue::<T>::permit(
+                            let permit_future = Self::permit(
                                 task_limit.clone(),
                                 "concurrency",
                                 worker_otel.clone(),
@@ -339,7 +339,7 @@ where
         work: BoxFuture<'static, T>,
     ) -> Result<TaskProgress<T>, TaskQueueError> {
         #[cfg(not(test))]
-        let permit_future = TaskQueue::<T>::permit(
+        let permit_future = Self::permit(
             self.submission_limit.clone(),
             "submission",
             self.otel.clone(),
diff --git a/lore-server/src/auth/jwk.rs b/lore-server/src/auth/jwk.rs
index 57bacab..46f7e9e 100644
--- a/lore-server/src/auth/jwk.rs
+++ b/lore-server/src/auth/jwk.rs
@@ -65,7 +65,7 @@ pub struct JwkServiceImpl {
 
 impl JwkServiceImpl {
     pub fn new(settings: JWKServiceSettings) -> Self {
-        JwkServiceImpl {
+        Self {
             cached_set: Default::default(),
             settings,
         }
diff --git a/lore-server/src/authnz/auth.rs b/lore-server/src/authnz/auth.rs
index a09274c..e5b5376 100644
--- a/lore-server/src/authnz/auth.rs
+++ b/lore-server/src/authnz/auth.rs
@@ -28,7 +28,7 @@ pub struct LoreAuthClientHelper {
 }
 
 impl LoreAuthClientHelper {
-    async fn new(auth_url: String) -> Result<LoreAuthClientHelper, Status> {
+    async fn new(auth_url: String) -> Result<Self, Status> {
         let mut endpoint = tonic::transport::Endpoint::from_shared(auth_url.clone())
             .warn_map_err(|_| Status::internal("Failed to create lore auth endpoint"))?;
         if auth_url.starts_with("https://") {
@@ -45,7 +45,7 @@ impl LoreAuthClientHelper {
             .await
             .warn_map_err(|_| Status::internal("Failed to connect to lore auth service"))?;
         let client = UrcAuthApiClient::with_interceptor(channel, CorrelationInterceptor);
-        Ok(LoreAuthClientHelper { client })
+        Ok(Self { client })
     }
 
     pub async fn lookup_user_permissions(
diff --git a/lore-server/src/authnz/rebac.rs b/lore-server/src/authnz/rebac.rs
index 2d20b17..15e1fca 100644
--- a/lore-server/src/authnz/rebac.rs
+++ b/lore-server/src/authnz/rebac.rs
@@ -42,7 +42,7 @@ pub struct RebacClientHelper {
 }
 
 impl RebacClientHelper {
-    async fn new(auth_url: String) -> Result<RebacClientHelper, Status> {
+    async fn new(auth_url: String) -> Result<Self, Status> {
         let mut endpoint = tonic::transport::Endpoint::from_shared(auth_url.clone())
             .warn_map_err(|_| Status::internal("Failed to create rebac endpoint"))?;
         if auth_url.starts_with("https://") {
@@ -59,7 +59,7 @@ impl RebacClientHelper {
             .await
             .warn_map_err(|_| Status::internal("Failed to connect to rebac service"))?;
         let client = RebacApiGrpcClient::with_interceptor(channel, CorrelationInterceptor);
-        Ok(RebacClientHelper { client })
+        Ok(Self { client })
     }
 }
 
diff --git a/lore-server/src/correlation/mod.rs b/lore-server/src/correlation/mod.rs
index 24d7e03..bcb0358 100644
--- a/lore-server/src/correlation/mod.rs
+++ b/lore-server/src/correlation/mod.rs
@@ -21,7 +21,7 @@ impl CorrelationId {
 
 impl Default for CorrelationId {
     fn default() -> Self {
-        CorrelationId::new(uuid::Uuid::new_v4())
+        Self::new(uuid::Uuid::new_v4())
     }
 }
 
diff --git a/lore-server/src/grpc/mod.rs b/lore-server/src/grpc/mod.rs
index fa72f55..c645ad7 100644
--- a/lore-server/src/grpc/mod.rs
+++ b/lore-server/src/grpc/mod.rs
@@ -438,7 +438,7 @@ pub trait FilterSlowDownExt<T, E> {
 }
 
 impl<T> FilterSlowDownExt<T, StateError> for Result<T, StateError> {
-    fn filter_slow_down(self) -> Result<Result<T, StateError>, Status> {
+    fn filter_slow_down(self) -> Result<Self, Status> {
         if let Err(err) = &self
             && err.is_slow_down()
         {
@@ -449,7 +449,7 @@ impl<T> FilterSlowDownExt<T, StateError> for Result<T, StateError> {
 }
 
 impl<T> FilterSlowDownExt<T, MetadataError> for Result<T, MetadataError> {
-    fn filter_slow_down(self) -> Result<Result<T, MetadataError>, Status> {
+    fn filter_slow_down(self) -> Result<Self, Status> {
         if let Err(err) = &self
             && err.is_slow_down()
         {
diff --git a/lore-server/src/hooks/registry.rs b/lore-server/src/hooks/registry.rs
index cc2f890..7cb8e78 100644
--- a/lore-server/src/hooks/registry.rs
+++ b/lore-server/src/hooks/registry.rs
@@ -297,7 +297,7 @@ impl<'de> serde::Deserialize<'de> for HookSettings {
         // Keep remaining config
         let config = toml::Value::Table(table);
 
-        Ok(HookSettings { enabled, config })
+        Ok(Self { enabled, config })
     }
 }
 
diff --git a/lore-server/src/hooks/traits.rs b/lore-server/src/hooks/traits.rs
index 7b896ad..341e300 100644
--- a/lore-server/src/hooks/traits.rs
+++ b/lore-server/src/hooks/traits.rs
@@ -126,13 +126,13 @@ pub enum HookPoint {
 
 impl HookPoint {
     /// Returns all defined hook points.
-    pub fn all() -> &'static [HookPoint] {
+    pub fn all() -> &'static [Self] {
         &[
-            HookPoint::BranchPush,
-            HookPoint::BranchCreate,
-            HookPoint::BranchDelete,
-            HookPoint::RepositoryCreate,
-            HookPoint::Obliterate,
+            Self::BranchPush,
+            Self::BranchCreate,
+            Self::BranchDelete,
+            Self::RepositoryCreate,
+            Self::Obliterate,
         ]
     }
 }
@@ -140,11 +140,11 @@ impl HookPoint {
 impl std::fmt::Display for HookPoint {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            HookPoint::BranchPush => write!(f, "BranchPush"),
-            HookPoint::BranchCreate => write!(f, "BranchCreate"),
-            HookPoint::BranchDelete => write!(f, "BranchDelete"),
-            HookPoint::RepositoryCreate => write!(f, "RepositoryCreate"),
-            HookPoint::Obliterate => write!(f, "Obliterate"),
+            Self::BranchPush => write!(f, "BranchPush"),
+            Self::BranchCreate => write!(f, "BranchCreate"),
+            Self::BranchDelete => write!(f, "BranchDelete"),
+            Self::RepositoryCreate => write!(f, "RepositoryCreate"),
+            Self::Obliterate => write!(f, "Obliterate"),
         }
     }
 }
@@ -185,12 +185,12 @@ pub enum StatusCode {
 impl std::fmt::Display for StatusCode {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            StatusCode::PermissionDenied => write!(f, "PERMISSION_DENIED"),
-            StatusCode::FailedPrecondition => write!(f, "FAILED_PRECONDITION"),
-            StatusCode::ResourceExhausted => write!(f, "RESOURCE_EXHAUSTED"),
-            StatusCode::InvalidArgument => write!(f, "INVALID_ARGUMENT"),
-            StatusCode::Aborted => write!(f, "ABORTED"),
-            StatusCode::Internal => write!(f, "INTERNAL"),
+            Self::PermissionDenied => write!(f, "PERMISSION_DENIED"),
+            Self::FailedPrecondition => write!(f, "FAILED_PRECONDITION"),
+            Self::ResourceExhausted => write!(f, "RESOURCE_EXHAUSTED"),
+            Self::InvalidArgument => write!(f, "INVALID_ARGUMENT"),
+            Self::Aborted => write!(f, "ABORTED"),
+            Self::Internal => write!(f, "INTERNAL"),
         }
     }
 }
diff --git a/lore-server/src/http/presigned/repository/redeem.rs b/lore-server/src/http/presigned/repository/redeem.rs
index 04bd298..b3d54ad 100644
--- a/lore-server/src/http/presigned/repository/redeem.rs
+++ b/lore-server/src/http/presigned/repository/redeem.rs
@@ -64,23 +64,21 @@ impl IntoResponse for RedeemError {
         warn!("get_presigned_content error: {:?}", &self);
 
         let (status, msg) = match self {
-            e @ (RedeemError::ParseRepository(_) | RedeemError::ParseAddress(_)) => {
+            e @ (Self::ParseRepository(_) | Self::ParseAddress(_)) => {
                 (StatusCode::BAD_REQUEST, e.to_string())
             }
-            RedeemError::InvalidToken(_) | RedeemError::TokenMismatch => (
+            Self::InvalidToken(_) | Self::TokenMismatch => (
                 StatusCode::UNAUTHORIZED,
                 "invalid or expired token".to_string(),
             ),
-            RedeemError::ReadStream(ref e)
-                if e.is_address_not_found() || e.is_payload_not_found() =>
-            {
+            Self::ReadStream(ref e) if e.is_address_not_found() || e.is_payload_not_found() => {
                 (StatusCode::NOT_FOUND, "address not found".to_string())
             }
-            RedeemError::NotConfigured => (
+            Self::NotConfigured => (
                 StatusCode::NOT_FOUND,
                 "presigned URL feature is not enabled".to_string(),
             ),
-            RedeemError::ReadStream(_) | RedeemError::HeaderGeneration(_) => (
+            Self::ReadStream(_) | Self::HeaderGeneration(_) => (
                 StatusCode::INTERNAL_SERVER_ERROR,
                 "Something went wrong. See server log for more info.".to_string(),
             ),
diff --git a/lore-server/src/http/repositories/repository/contents/content/get_repository_content.rs b/lore-server/src/http/repositories/repository/contents/content/get_repository_content.rs
index 193b92a..c84569f 100644
--- a/lore-server/src/http/repositories/repository/contents/content/get_repository_content.rs
+++ b/lore-server/src/http/repositories/repository/contents/content/get_repository_content.rs
@@ -59,15 +59,13 @@ impl IntoResponse for GetContentError {
         warn!("get_repository_content error: {:?} ", &self);
 
         let (status, msg) = match self {
-            e @ (GetContentError::ParseContext(_) | GetContentError::ParseAddress(_)) => {
+            e @ (Self::ParseContext(_) | Self::ParseAddress(_)) => {
                 (StatusCode::BAD_REQUEST, e.to_string())
             }
-            GetContentError::ReadStream(ref e)
-                if e.is_address_not_found() || e.is_payload_not_found() =>
-            {
+            Self::ReadStream(ref e) if e.is_address_not_found() || e.is_payload_not_found() => {
                 (StatusCode::NOT_FOUND, "address not found".to_string())
             }
-            GetContentError::ReadStream(_) | GetContentError::HeaderGeneration(_) => (
+            Self::ReadStream(_) | Self::HeaderGeneration(_) => (
                 StatusCode::INTERNAL_SERVER_ERROR,
                 "Something went wrong. See server log for more info.".to_string(),
             ),
diff --git a/lore-server/src/http/repositories/repository/contents/content/presign_repository_content.rs b/lore-server/src/http/repositories/repository/contents/content/presign_repository_content.rs
index eaa0c3d..2322a45 100644
--- a/lore-server/src/http/repositories/repository/contents/content/presign_repository_content.rs
+++ b/lore-server/src/http/repositories/repository/contents/content/presign_repository_content.rs
@@ -52,18 +52,18 @@ impl IntoResponse for PresignError {
         warn!("presign_repository_content error: {:?}", &self);
 
         let (status, msg) = match self {
-            e @ (PresignError::ParseRepository(_) | PresignError::ParseAddress(_)) => {
+            e @ (Self::ParseRepository(_) | Self::ParseAddress(_)) => {
                 (StatusCode::BAD_REQUEST, e.to_string())
             }
-            PresignError::NotConfigured => (
+            Self::NotConfigured => (
                 StatusCode::NOT_FOUND,
                 "presigned URL feature is not enabled".to_string(),
             ),
-            PresignError::StoreError | PresignError::SystemTime(_) => (
+            Self::StoreError | Self::SystemTime(_) => (
                 StatusCode::INTERNAL_SERVER_ERROR,
                 "Something went wrong. See server log for more info.".to_string(),
             ),
-            PresignError::NotFound => (StatusCode::NOT_FOUND, "address not found".to_string()),
+            Self::NotFound => (StatusCode::NOT_FOUND, "address not found".to_string()),
         };
 
         let mut headers = HeaderMap::new();
diff --git a/lore-server/src/http/server.rs b/lore-server/src/http/server.rs
index e9280d0..ee24f90 100644
--- a/lore-server/src/http/server.rs
+++ b/lore-server/src/http/server.rs
@@ -68,7 +68,7 @@ impl ServerHealth {
     pub fn new_without_availability(
         immutable_store: Arc<dyn lore_storage::ImmutableStore>,
     ) -> Self {
-        ServerHealth {
+        Self {
             immutable_store: Arc::downgrade(&immutable_store),
             available: AtomicBool::new(true),
             interval_timeout: None,
diff --git a/lore-server/src/protocol/replication_store/exists_batch.rs b/lore-server/src/protocol/replication_store/exists_batch.rs
index d532e8d..627ab29 100644
--- a/lore-server/src/protocol/replication_store/exists_batch.rs
+++ b/lore-server/src/protocol/replication_store/exists_batch.rs
@@ -52,7 +52,7 @@ impl ExistsBatch {
         ]
     }
 
-    pub fn parse(mut bytes: Bytes) -> Result<ExistsBatch, MessageParseError> {
+    pub fn parse(mut bytes: Bytes) -> Result<Self, MessageParseError> {
         if bytes.len() < BASE_REQUEST_SIZE {
             return Err(MessageParseError::InvalidFieldLength);
         };
@@ -72,7 +72,7 @@ impl ExistsBatch {
             return Err(MessageParseError::InvalidFieldLength);
         }
 
-        Ok(ExistsBatch {
+        Ok(Self {
             header,
             store_match,
             addresses,
@@ -105,7 +105,7 @@ impl ExistsBatchResponse {
             })
             .collect::<Result<Vec<_>, _>>()?;
 
-        Ok(ExistsBatchResponse { matches })
+        Ok(Self { matches })
     }
 }
 
diff --git a/lore-server/src/protocol/replication_store/get.rs b/lore-server/src/protocol/replication_store/get.rs
index 295d136..9496b4d 100644
--- a/lore-server/src/protocol/replication_store/get.rs
+++ b/lore-server/src/protocol/replication_store/get.rs
@@ -50,7 +50,7 @@ impl Get {
         ]
     }
 
-    pub fn parse(mut bytes: Bytes) -> Result<Get, MessageParseError> {
+    pub fn parse(mut bytes: Bytes) -> Result<Self, MessageParseError> {
         if bytes.len() < BASE_REQUEST_SIZE {
             return Err(MessageParseError::InvalidFieldLength);
         };
@@ -66,7 +66,7 @@ impl Get {
             })?
         };
 
-        Ok(Get {
+        Ok(Self {
             header,
             address,
             match_required,
@@ -91,7 +91,7 @@ impl GetResponse {
     pub fn parse(mut bytes: Bytes) -> Result<Self, ReplicationStoreClientError> {
         let fragment: Fragment = bytes.split_to(size_of::<Fragment>()).into();
 
-        Ok(GetResponse {
+        Ok(Self {
             fragment,
             payload: bytes,
         })
diff --git a/lore-server/src/protocol/replication_store/header.rs b/lore-server/src/protocol/replication_store/header.rs
index 4be23d8..a7ca2b6 100644
--- a/lore-server/src/protocol/replication_store/header.rs
+++ b/lore-server/src/protocol/replication_store/header.rs
@@ -15,9 +15,7 @@ pub struct ReplicationHeader {
 
 impl From<&[u8]> for ReplicationHeader {
     fn from(bytes: &[u8]) -> Self {
-        ReplicationHeader::read_from_prefix(bytes)
-            .unwrap_or_default()
-            .0
+        Self::read_from_prefix(bytes).unwrap_or_default().0
     }
 }
 
diff --git a/lore-server/src/protocol/replication_store/obliterate.rs b/lore-server/src/protocol/replication_store/obliterate.rs
index 4420153..d0f9b82 100644
--- a/lore-server/src/protocol/replication_store/obliterate.rs
+++ b/lore-server/src/protocol/replication_store/obliterate.rs
@@ -84,7 +84,7 @@ impl ObliterateResponse {
             })?
             .0;
 
-        Ok(ObliterateResponse {
+        Ok(Self {
             num_fragments,
             num_payloads,
         })
diff --git a/lore-server/src/protocol/replication_store/put.rs b/lore-server/src/protocol/replication_store/put.rs
index 5778180..01be158 100644
--- a/lore-server/src/protocol/replication_store/put.rs
+++ b/lore-server/src/protocol/replication_store/put.rs
@@ -58,7 +58,7 @@ pub struct PutFlags {
 
 impl From<u8> for PutFlags {
     fn from(value: u8) -> Self {
-        PutFlags { force: value == 1 }
+        Self { force: value == 1 }
     }
 }
 
diff --git a/lore-server/src/protocol/replication_store/query.rs b/lore-server/src/protocol/replication_store/query.rs
index e1f0c95..9566a09 100644
--- a/lore-server/src/protocol/replication_store/query.rs
+++ b/lore-server/src/protocol/replication_store/query.rs
@@ -38,7 +38,7 @@ impl Query {
         ExistsBatch::to_quic_chunks(self.0)
     }
 
-    pub fn parse(bytes: Bytes) -> Result<Query, MessageParseError> {
+    pub fn parse(bytes: Bytes) -> Result<Self, MessageParseError> {
         let inner = ExistsBatch::parse(bytes)?;
 
         // not possible unless clients we control are malicious for some reason
@@ -47,7 +47,7 @@ impl Query {
             return Err(MessageParseError::InvalidFieldLength);
         }
 
-        Ok(Query(inner))
+        Ok(Self(inner))
     }
 }
 
@@ -77,7 +77,7 @@ impl QueryResponse {
             })?
         };
 
-        Ok(QueryResponse {
+        Ok(Self {
             fragment,
             match_made,
         })
diff --git a/lore-server/src/protocol/storage/messages.rs b/lore-server/src/protocol/storage/messages.rs
index 02864fa..49d1f8a 100644
--- a/lore-server/src/protocol/storage/messages.rs
+++ b/lore-server/src/protocol/storage/messages.rs
@@ -95,9 +95,9 @@ impl From<StoreError> for MessageHandleError {
     fn from(value: StoreError) -> Self {
         warn!("Received store error: {value:?}");
         match value {
-            StoreError::SlowDown(_) => MessageHandleError::SlowDown,
-            StoreError::Oversized(_) => MessageHandleError::Oversized,
-            _ => MessageHandleError::StoreFailure,
+            StoreError::SlowDown(_) => Self::SlowDown,
+            StoreError::Oversized(_) => Self::Oversized,
+            _ => Self::StoreFailure,
         }
     }
 }
diff --git a/lore-server/src/protocol/storage/verify.rs b/lore-server/src/protocol/storage/verify.rs
index 66fbbdc..1a8d7b5 100644
--- a/lore-server/src/protocol/storage/verify.rs
+++ b/lore-server/src/protocol/storage/verify.rs
@@ -49,7 +49,7 @@ impl Verify {
     where
         Self: Sized,
     {
-        Verify::read_from_bytes(bytes.as_ref()).map_err(|_e| MessageParseError::InvalidFieldLength)
+        Self::read_from_bytes(bytes.as_ref()).map_err(|_e| MessageParseError::InvalidFieldLength)
     }
 }
 
diff --git a/lore-server/src/quic/quinn/metrics.rs b/lore-server/src/quic/quinn/metrics.rs
index c1706fc..0382597 100644
--- a/lore-server/src/quic/quinn/metrics.rs
+++ b/lore-server/src/quic/quinn/metrics.rs
@@ -53,9 +53,9 @@ impl QuinnConnectionInstruments {
         }
     }
 
-    pub fn instance() -> &'static QuinnConnectionInstruments {
+    pub fn instance() -> &'static Self {
         static INSTANCE: OnceLock<QuinnConnectionInstruments> = OnceLock::new();
-        INSTANCE.get_or_init(QuinnConnectionInstruments::new)
+        INSTANCE.get_or_init(Self::new)
     }
 }
 
diff --git a/lore-server/src/quic/replication_store_service.rs b/lore-server/src/quic/replication_store_service.rs
index 4120a6a..3dac5fc 100644
--- a/lore-server/src/quic/replication_store_service.rs
+++ b/lore-server/src/quic/replication_store_service.rs
@@ -48,10 +48,10 @@ impl Display for ReplicationServiceErrorCode {
 impl From<&StoreError> for ReplicationServiceErrorCode {
     fn from(err: &StoreError) -> Self {
         match err {
-            StoreError::AddressNotFound(_) => ReplicationServiceErrorCode::AddressNotFound,
-            StoreError::PayloadNotFound(_) => ReplicationServiceErrorCode::PayloadNotFound,
-            StoreError::SlowDown(_) => ReplicationServiceErrorCode::SlowDown,
-            StoreError::Oversized(_) => ReplicationServiceErrorCode::Oversized,
+            StoreError::AddressNotFound(_) => Self::AddressNotFound,
+            StoreError::PayloadNotFound(_) => Self::PayloadNotFound,
+            StoreError::SlowDown(_) => Self::SlowDown,
+            StoreError::Oversized(_) => Self::Oversized,
             StoreError::NotFound(_)
             | StoreError::Disconnected(_)
             | StoreError::NotAuthorized(_)
@@ -59,7 +59,7 @@ impl From<&StoreError> for ReplicationServiceErrorCode {
             | StoreError::Maintenance(_)
             | StoreError::NoRemote(_)
             | StoreError::NotSupported(_)
-            | StoreError::Internal(_) => ReplicationServiceErrorCode::Internal,
+            | StoreError::Internal(_) => Self::Internal,
         }
     }
 }
@@ -80,24 +80,22 @@ pub enum Command {
 
 impl From<Command> for QuicOpCode {
     fn from(value: Command) -> Self {
-        value as QuicOpCode
+        value as Self
     }
 }
 impl TryFrom<QuicOpCode> for Command {
     type Error = UnknownCommand;
     fn try_from(value: QuicOpCode) -> Result<Self, Self::Error> {
         match value {
-            v if v == Command::ImmutableExistBatch as u8 => Ok(Command::ImmutableExistBatch),
-            v if v == Command::ImmutableGet as u8 => Ok(Command::ImmutableGet),
-            v if v == Command::ImmutablePut as u8 => Ok(Command::ImmutablePut),
-            v if v == Command::ImmutableObliterate as u8 => Ok(Command::ImmutableObliterate),
-            v if v == Command::ImmutableQuery as u8 => Ok(Command::ImmutableQuery),
-            v if v == Command::ImmutableLocalExistBatch as u8 => {
-                Ok(Command::ImmutableLocalExistBatch)
-            }
-            v if v == Command::ImmutableLocalGet as u8 => Ok(Command::ImmutableLocalGet),
-            v if v == Command::ImmutableLocalQuery as u8 => Ok(Command::ImmutableLocalQuery),
-            v if v == Command::ImmutableLocalPut as u8 => Ok(Command::ImmutableLocalPut),
+            v if v == Self::ImmutableExistBatch as u8 => Ok(Self::ImmutableExistBatch),
+            v if v == Self::ImmutableGet as u8 => Ok(Self::ImmutableGet),
+            v if v == Self::ImmutablePut as u8 => Ok(Self::ImmutablePut),
+            v if v == Self::ImmutableObliterate as u8 => Ok(Self::ImmutableObliterate),
+            v if v == Self::ImmutableQuery as u8 => Ok(Self::ImmutableQuery),
+            v if v == Self::ImmutableLocalExistBatch as u8 => Ok(Self::ImmutableLocalExistBatch),
+            v if v == Self::ImmutableLocalGet as u8 => Ok(Self::ImmutableLocalGet),
+            v if v == Self::ImmutableLocalQuery as u8 => Ok(Self::ImmutableLocalQuery),
+            v if v == Self::ImmutableLocalPut as u8 => Ok(Self::ImmutableLocalPut),
             _ => Err(UnknownCommand(value)),
         }
     }
diff --git a/lore-server/src/quic/replication_store_service/client.rs b/lore-server/src/quic/replication_store_service/client.rs
index 1c655d3..9840626 100644
--- a/lore-server/src/quic/replication_store_service/client.rs
+++ b/lore-server/src/quic/replication_store_service/client.rs
@@ -77,7 +77,7 @@ pub enum ReplicationStoreClientError {
 
 impl From<ReplicationServiceErrorCode> for ReplicationStoreClientError {
     fn from(code: ReplicationServiceErrorCode) -> Self {
-        ReplicationStoreClientError::ServiceError(code)
+        Self::ServiceError(code)
     }
 }
 
@@ -209,11 +209,11 @@ impl ReplicationStoreClient {
         let quinn = connect(
             &EndpointConfig {
                 remote_url: remote_url.to_string(),
-                default_port: ReplicationStoreClient::DEFAULT_PORT,
+                default_port: Self::DEFAULT_PORT,
                 sni_override: sni_override.clone(),
             },
             auth.client_certs(),
-            ReplicationStoreClient::ALPN,
+            Self::ALPN,
             transport_config.clone(),
         )
         .await?;
@@ -221,7 +221,7 @@ impl ReplicationStoreClient {
         let mut quic = QuicConnection::new(quinn, MAX_CHUNK_SIZE);
         quic.set_max_reconnects(max_reconnects);
 
-        let client = ReplicationStoreClient {
+        let client = Self {
             remote_url: remote_url.to_string(),
             sni_override,
             auth,
diff --git a/lore-server/src/quic/replication_store_service/client_container.rs b/lore-server/src/quic/replication_store_service/client_container.rs
index d0412ac..0935d4b 100644
--- a/lore-server/src/quic/replication_store_service/client_container.rs
+++ b/lore-server/src/quic/replication_store_service/client_container.rs
@@ -111,7 +111,7 @@ where
         config: ClientContainerConfig,
     ) -> Result<Self, ProtocolError> {
         let client = client_factory.make_client().await?;
-        let container = ClientContainer {
+        let container = Self {
             client_factory,
             generate_client_semaphore: Semaphore::new(1),
             client: client.into(),
diff --git a/lore-server/src/server.rs b/lore-server/src/server.rs
index 59b7100..f25802c 100644
--- a/lore-server/src/server.rs
+++ b/lore-server/src/server.rs
@@ -302,7 +302,7 @@ async fn listen_for_termination(shutdown_tx: tokio::sync::watch::Sender<bool>) -
 
 impl From<QuicSettings> for QuinnConfigBuilder {
     fn from(settings: QuicSettings) -> Self {
-        let mut builder = QuinnConfigBuilder::default().num_listeners(settings.num_listeners);
+        let mut builder = Self::default().num_listeners(settings.num_listeners);
 
         if let Some(v) = settings.idle_timeout {
             builder = builder.idle_timeout(Duration::from_millis(v));
diff --git a/lore-server/src/settings.rs b/lore-server/src/settings.rs
index 2cbc5c3..1a34539 100644
--- a/lore-server/src/settings.rs
+++ b/lore-server/src/settings.rs
@@ -159,7 +159,7 @@ impl Settings {
             settings_builder.add_source(config::Environment::with_prefix("lore").separator("__"));
 
         let settings = settings_builder.build()?;
-        let settings: Settings = settings.try_deserialize()?;
+        let settings: Self = settings.try_deserialize()?;
         validate_trace_config(&settings)?;
         validate_feature_config(&settings)?;
         let settings_string = format!("{settings:?}");
diff --git a/lore-server/src/store/grpc_replica.rs b/lore-server/src/store/grpc_replica.rs
index 92e2e0e..c161174 100644
--- a/lore-server/src/store/grpc_replica.rs
+++ b/lore-server/src/store/grpc_replica.rs
@@ -162,7 +162,7 @@ impl ReplicationClientInstruments {
         let connect = instrument_provider.counter("replication.connect");
         let disconnect = instrument_provider.counter("replication.disconnect");
 
-        ReplicationClientInstruments {
+        Self {
             instrument_provider,
             messages_dropped,
             operation_latency,
@@ -201,10 +201,8 @@ impl From<tonic::Status> for ReplicationClientError {
     fn from(status: tonic::Status) -> Self {
         info!(?status, "Replication gRPC request failed");
         match status.code() {
-            tonic::Code::Unavailable | tonic::Code::ResourceExhausted => {
-                ReplicationClientError::SlowDown
-            }
-            _ => ReplicationClientError::RequestFailed(status),
+            tonic::Code::Unavailable | tonic::Code::ResourceExhausted => Self::SlowDown,
+            _ => Self::RequestFailed(status),
         }
     }
 }
@@ -523,7 +521,7 @@ pub struct GrpcReplica {
 
 impl GrpcReplica {
     pub fn new(client: ReplicationClient) -> Self {
-        GrpcReplica { client }
+        Self { client }
     }
 }
 
diff --git a/lore-server/src/store/replicated_store.rs b/lore-server/src/store/replicated_store.rs
index d86a90d..00db6a3 100644
--- a/lore-server/src/store/replicated_store.rs
+++ b/lore-server/src/store/replicated_store.rs
@@ -83,7 +83,7 @@ where
         let instrument_provider = ReplicatedStoreProvider {};
 
         let container = ClientContainer::new(client_factory, client_container_config).await?;
-        let store = Arc::new(ReplicatedStore {
+        let store = Arc::new(Self {
             instruments: ReplicatedStoreInstruments::new(instrument_provider),
             client_container: container,
             refresh_task: None.into(),
@@ -95,10 +95,7 @@ where
         Ok(store)
     }
 
-    fn setup_periodic_refresh(
-        store: &Arc<ReplicatedStore<ClientType>>,
-        periodic_client_refresh: Duration,
-    ) {
+    fn setup_periodic_refresh(store: &Arc<Self>, periodic_client_refresh: Duration) {
         let weak = Arc::downgrade(store);
         let task = lore_spawn!({
             async move {
@@ -124,10 +121,7 @@ where
         *write = Some(AbortOnDropHandle::new(task));
     }
 
-    fn setup_client_stats_monitor(
-        store: &Arc<ReplicatedStore<ClientType>>,
-        monitor_interval: Duration,
-    ) {
+    fn setup_client_stats_monitor(store: &Arc<Self>, monitor_interval: Duration) {
         let quic_instruments = ClientMetrics::new(
             "replicated_store",
             store.instruments.provider.labels().to_vec(),
diff --git a/lore-server/src/topology/composite.rs b/lore-server/src/topology/composite.rs
index fc6c984..311758c 100644
--- a/lore-server/src/topology/composite.rs
+++ b/lore-server/src/topology/composite.rs
@@ -73,7 +73,7 @@ impl CompositeTopology {
 
         let (peers_updated_broadcaster, _) =
             broadcast::channel::<HashSet<PeerInfo>>(PEERS_UPDATED_NOTIFICATION_BUFFER_CAPACITY);
-        let composite_topology = CompositeTopology {
+        let composite_topology = Self {
             composite_sources,
             peers_updated_broadcaster,
         };
diff --git a/lore-server/src/topology/fixed.rs b/lore-server/src/topology/fixed.rs
index 56134c4..fd4e019 100644
--- a/lore-server/src/topology/fixed.rs
+++ b/lore-server/src/topology/fixed.rs
@@ -86,7 +86,7 @@ impl FixedTopology {
             })
             .collect();
 
-        Arc::new(FixedTopology {
+        Arc::new(Self {
             peers,
             peers_updated_broadcaster,
         })
diff --git a/lore-server/src/topology/mod.rs b/lore-server/src/topology/mod.rs
index 599b377..bcfee3d 100644
--- a/lore-server/src/topology/mod.rs
+++ b/lore-server/src/topology/mod.rs
@@ -70,11 +70,8 @@ impl TopologyProvider {
     /// Built-in providers return `None`, plugin-based providers return the plugin name.
     pub fn plugin_name(&self) -> Option<&'static str> {
         match self {
-            TopologyProvider::None
-            | TopologyProvider::Fixed
-            | TopologyProvider::RotatingIdFixed
-            | TopologyProvider::Composite => None, // Built-in, no plugin needed
-            TopologyProvider::Consul => Some("consul"),
+            Self::None | Self::Fixed | Self::RotatingIdFixed | Self::Composite => None, // Built-in, no plugin needed
+            Self::Consul => Some("consul"),
         }
     }
 }
diff --git a/lore-server/src/topology/rotating_id_fixed.rs b/lore-server/src/topology/rotating_id_fixed.rs
index cf8cfea..09eb1ab 100644
--- a/lore-server/src/topology/rotating_id_fixed.rs
+++ b/lore-server/src/topology/rotating_id_fixed.rs
@@ -70,7 +70,7 @@ impl RotatingIdFixedTopology {
             })
             .collect();
 
-        Arc::new(RotatingIdFixedTopology {
+        Arc::new(Self {
             peers,
             rotation_interval: Duration::from_secs(config.rotation_interval_seconds),
             peers_updated_broadcaster,
diff --git a/lore-server/src/util/cert_metrics.rs b/lore-server/src/util/cert_metrics.rs
index 9b06a46..cc7063c 100644
--- a/lore-server/src/util/cert_metrics.rs
+++ b/lore-server/src/util/cert_metrics.rs
@@ -57,9 +57,9 @@ impl CertificateMetricsInstruments {
         }
     }
 
-    pub fn instance() -> &'static CertificateMetricsInstruments {
+    pub fn instance() -> &'static Self {
         static INSTANCE: OnceLock<CertificateMetricsInstruments> = OnceLock::new();
-        INSTANCE.get_or_init(CertificateMetricsInstruments::new)
+        INSTANCE.get_or_init(Self::new)
     }
 }
 
diff --git a/lore-storage/src/compress.rs b/lore-storage/src/compress.rs
index 2245461..6a14631 100644
--- a/lore-storage/src/compress.rs
+++ b/lore-storage/src/compress.rs
@@ -39,11 +39,11 @@ pub enum CompressionMode {
 impl CompressionMode {
     pub fn from_u32(value: u32) -> Self {
         match value {
-            1 => CompressionMode::NoCompression,
-            2 => CompressionMode::Lz4,
-            3 => CompressionMode::Oodle,
-            4 => CompressionMode::Zstd,
-            _ => CompressionMode::NotSpecified,
+            1 => Self::NoCompression,
+            2 => Self::Lz4,
+            3 => Self::Oodle,
+            4 => Self::Zstd,
+            _ => Self::NotSpecified,
         }
     }
 }
diff --git a/lore-storage/src/compress/pool.rs b/lore-storage/src/compress/pool.rs
index 8db96c9..df6fb7c 100644
--- a/lore-storage/src/compress/pool.rs
+++ b/lore-storage/src/compress/pool.rs
@@ -58,7 +58,7 @@ impl CompressionWork {
     // dev/test builds and any future profile change to unwind.
     fn execute(self) {
         match self {
-            CompressionWork::Compress {
+            Self::Compress {
                 fragment,
                 payload,
                 mode,
@@ -83,7 +83,7 @@ impl CompressionWork {
                 });
                 let _ = tx.send(result);
             }
-            CompressionWork::Decompress {
+            Self::Decompress {
                 fragment,
                 compressed,
                 output_buffer,
diff --git a/lore-storage/src/local/immutable_store.rs b/lore-storage/src/local/immutable_store.rs
index 32b1533..a8a6a7d 100644
--- a/lore-storage/src/local/immutable_store.rs
+++ b/lore-storage/src/local/immutable_store.rs
@@ -108,7 +108,7 @@ impl ImmutableData {
     /// Assign the relevant data to make this instance of a fragment point to the same
     /// deduplicated payload as another fragment. Synchronizes `PayloadStoredLocal` with the
     /// resulting `pack_file` so the flag and the pointer it describes always agree.
-    fn assign_deduplicated_payload(&mut self, deduplicated: ImmutableData) {
+    fn assign_deduplicated_payload(&mut self, deduplicated: Self) {
         debug_assert!(
             self.size_content == deduplicated.size_content,
             "Invalid deduplication, content size do not match"
@@ -134,7 +134,7 @@ impl ImmutableData {
     /// `self`'s pre-existing Durable bit is preserved.
     ///
     /// `last_access` is left untouched; the caller stamps it on paths that modify the entry.
-    fn merge_from_copy_source(&mut self, source: ImmutableData, durable: bool) {
+    fn merge_from_copy_source(&mut self, source: Self, durable: bool) {
         self.size_content = source.size_content;
         self.assign_deduplicated_payload(source);
         if durable {
@@ -638,7 +638,7 @@ impl ImmutableStoreBucket {
     }
 
     fn serialize_files(
-        bucket: OwnedRwLockReadGuard<ImmutableStoreBucket, ImmutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<ImmutableStoreGroup>,
         bucket_index: usize,
         path: PathBuf,
@@ -772,7 +772,7 @@ impl ImmutableStoreBucket {
     }
 
     async fn serialize(
-        bucket: OwnedRwLockReadGuard<ImmutableStoreBucket, ImmutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<ImmutableStoreGroup>,
         path: &Path,
         group_index: usize,
@@ -815,7 +815,7 @@ impl ImmutableStoreBucket {
     /// dirty=true while we hold it, so any post-release write will correctly re-set dirty and
     /// be picked up by the next flush, matching the regular `serialize` path's semantics.
     pub async fn serialize_to_new(
-        bucket: OwnedRwLockReadGuard<ImmutableStoreBucket, ImmutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<ImmutableStoreGroup>,
         path: &Path,
         group_index: usize,
@@ -942,7 +942,7 @@ impl LocalImmutableStore {
             None
         };
 
-        let mut store = LocalImmutableStore {
+        let mut store = Self {
             path: immutable_path.clone(),
             lock,
             group: Vec::with_capacity(GROUP_COUNT),
@@ -4025,7 +4025,7 @@ pub struct ImmutableStoreVerifyResult {
 
 impl Default for ImmutableStoreVerifyResult {
     fn default() -> Self {
-        ImmutableStoreVerifyResult {
+        Self {
             hash: Default::default(),
             partition: Default::default(),
             context: Default::default(),
diff --git a/lore-storage/src/local/mutable_store.rs b/lore-storage/src/local/mutable_store.rs
index e168edd..ba95879 100644
--- a/lore-storage/src/local/mutable_store.rs
+++ b/lore-storage/src/local/mutable_store.rs
@@ -86,9 +86,9 @@ const CHUNK_SIZE_ENTRY: usize = 8;
 struct Key(Hash);
 
 impl Key {
-    fn make_typed(mut hash: Hash, key: KeyType) -> Key {
+    fn make_typed(mut hash: Hash, key: KeyType) -> Self {
         hash.data_mut()[2] = key as u8;
-        Key(hash)
+        Self(hash)
     }
 
     fn hash(&self) -> Hash {
@@ -318,7 +318,7 @@ impl MutableStoreBucket {
     }
 
     fn serialize_files(
-        bucket: OwnedRwLockReadGuard<MutableStoreBucket, MutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<MutableStoreGroup>,
         bucket_index: usize,
         path: PathBuf,
@@ -410,7 +410,7 @@ impl MutableStoreBucket {
     }
 
     pub async fn serialize(
-        bucket: OwnedRwLockReadGuard<MutableStoreBucket, MutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<MutableStoreGroup>,
         path: &Path,
         group_index: usize,
@@ -460,7 +460,7 @@ impl MutableStoreBucket {
     /// Reuses `serialize_files` internally; with `sync_data = true`, the path becomes
     /// `index_<bb>.new.tmp` → atomic rename → `index_<bb>.new`.
     pub async fn serialize_to_new(
-        bucket: OwnedRwLockReadGuard<MutableStoreBucket, MutableStoreBucket>,
+        bucket: OwnedRwLockReadGuard<Self, Self>,
         group: Arc<MutableStoreGroup>,
         path: &Path,
         group_index: usize,
@@ -787,7 +787,7 @@ impl LocalMutableStore {
             MutableStoreVersion::TypedItems as u32
         };
 
-        let mut store = LocalMutableStore {
+        let mut store = Self {
             path: mutable_path,
             lock,
             group: Vec::with_capacity(GROUP_COUNT),
@@ -845,7 +845,7 @@ impl LocalMutableStore {
     }
 
     fn flush_delayed(
-        weak_ref: Weak<LocalMutableStore>,
+        weak_ref: Weak<Self>,
         group_index: usize,
         bucket_index: usize,
         delay: u64,
diff --git a/lore-storage/src/options.rs b/lore-storage/src/options.rs
index 0eccc11..476617a 100644
--- a/lore-storage/src/options.rs
+++ b/lore-storage/src/options.rs
@@ -106,7 +106,7 @@ pub struct ReadOptions {
 
 impl Default for ReadOptions {
     fn default() -> Self {
-        ReadOptions {
+        Self {
             isolate: LOCAL_ISOLATION.load(atomic::Ordering::Relaxed),
             decompress: true,
             verify: true,
diff --git a/lore-storage/src/packstore.rs b/lore-storage/src/packstore.rs
index 2a83100..4b956ca 100644
--- a/lore-storage/src/packstore.rs
+++ b/lore-storage/src/packstore.rs
@@ -181,7 +181,7 @@ pub struct PackStore {
 
 impl PackStore {
     pub fn new(path: Option<PathBuf>, min_count: usize) -> Self {
-        PackStore {
+        Self {
             path: path.map(|path| {
                 let mut path = path;
                 path.push("pack");
diff --git a/lore-storage/src/store_types.rs b/lore-storage/src/store_types.rs
index 5f05bb7..00c3670 100644
--- a/lore-storage/src/store_types.rs
+++ b/lore-storage/src/store_types.rs
@@ -32,24 +32,24 @@ pub enum StoreMatch {
 impl StoreMatch {
     pub fn next(&self) -> Option<Self> {
         match self {
-            StoreMatch::MatchNone => Some(StoreMatch::MatchHash),
-            StoreMatch::MatchHash => Some(StoreMatch::MatchPartition),
-            StoreMatch::MatchPartition => Some(StoreMatch::MatchFull),
-            StoreMatch::MatchFull => None,
+            Self::MatchNone => Some(Self::MatchHash),
+            Self::MatchHash => Some(Self::MatchPartition),
+            Self::MatchPartition => Some(Self::MatchFull),
+            Self::MatchFull => None,
         }
     }
 
     pub fn prev(&self) -> Option<Self> {
         match self {
-            StoreMatch::MatchNone => None,
-            StoreMatch::MatchHash => Some(StoreMatch::MatchNone),
-            StoreMatch::MatchPartition => Some(StoreMatch::MatchHash),
-            StoreMatch::MatchFull => Some(StoreMatch::MatchPartition),
+            Self::MatchNone => None,
+            Self::MatchHash => Some(Self::MatchNone),
+            Self::MatchPartition => Some(Self::MatchHash),
+            Self::MatchFull => Some(Self::MatchPartition),
         }
     }
 
     pub fn is_partial(&self) -> bool {
-        self != &StoreMatch::MatchFull
+        self != &Self::MatchFull
     }
 }
 
@@ -69,10 +69,10 @@ impl TryFrom<u8> for StoreMatch {
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
-            0 => Ok(StoreMatch::MatchNone),
-            1 => Ok(StoreMatch::MatchHash),
-            2 => Ok(StoreMatch::MatchPartition),
-            3 => Ok(StoreMatch::MatchFull),
+            0 => Ok(Self::MatchNone),
+            1 => Ok(Self::MatchHash),
+            2 => Ok(Self::MatchPartition),
+            3 => Ok(Self::MatchFull),
             unknown => Err(format!("Unknown store match '{unknown}'")),
         }
     }
diff --git a/lore-telemetry/src/config.rs b/lore-telemetry/src/config.rs
index 9f7c84d..054420f 100644
--- a/lore-telemetry/src/config.rs
+++ b/lore-telemetry/src/config.rs
@@ -18,7 +18,7 @@ pub struct TelemetryConfig {
 
 impl TelemetryConfig {
     pub fn new() -> Self {
-        TelemetryConfig::default()
+        Self::default()
     }
 
     pub fn with_exporter(self, exporter: ExporterConfig) -> Self {
diff --git a/lore-transport/src/error.rs b/lore-transport/src/error.rs
index 8ae5422..05bb2a6 100644
--- a/lore-transport/src/error.rs
+++ b/lore-transport/src/error.rs
@@ -19,17 +19,17 @@ pub enum ProtocolError {
 impl From<tonic::Status> for ProtocolError {
     fn from(value: tonic::Status) -> Self {
         match value.code() {
-            tonic::Code::Unavailable | tonic::Code::Unknown => ProtocolError::from(Disconnected),
-            tonic::Code::PermissionDenied => ProtocolError::from(NotAuthorized),
-            tonic::Code::NotFound => ProtocolError::from(NotFound),
-            tonic::Code::ResourceExhausted => ProtocolError::from(SlowDown),
-            tonic::Code::OutOfRange => ProtocolError::from(Oversized {
+            tonic::Code::Unavailable | tonic::Code::Unknown => Self::from(Disconnected),
+            tonic::Code::PermissionDenied => Self::from(NotAuthorized),
+            tonic::Code::NotFound => Self::from(NotFound),
+            tonic::Code::ResourceExhausted => Self::from(SlowDown),
+            tonic::Code::OutOfRange => Self::from(Oversized {
                 context: value.message().to_string(),
             }),
-            tonic::Code::Unimplemented => ProtocolError::from(NotSupported {
+            tonic::Code::Unimplemented => Self::from(NotSupported {
                 operation: value.message().to_string(),
             }),
-            _ => ProtocolError::internal(value.to_string()),
+            _ => Self::internal(value.to_string()),
         }
     }
 }
@@ -38,21 +38,17 @@ impl From<ProtocolError> for tonic::Status {
     fn from(value: ProtocolError) -> Self {
         let msg = value.to_string();
         match value {
-            ProtocolError::NotAuthenticated(_) => {
-                tonic::Status::new(tonic::Code::Unauthenticated, msg)
-            }
-            ProtocolError::NotAuthorized(_) => {
-                tonic::Status::new(tonic::Code::PermissionDenied, msg)
-            }
-            ProtocolError::SlowDown(_) => tonic::Status::new(tonic::Code::ResourceExhausted, msg),
-            ProtocolError::NotFound(_) => tonic::Status::new(tonic::Code::NotFound, msg),
-            ProtocolError::Oversized(_) => tonic::Status::new(tonic::Code::OutOfRange, msg),
+            ProtocolError::NotAuthenticated(_) => Self::new(tonic::Code::Unauthenticated, msg),
+            ProtocolError::NotAuthorized(_) => Self::new(tonic::Code::PermissionDenied, msg),
+            ProtocolError::SlowDown(_) => Self::new(tonic::Code::ResourceExhausted, msg),
+            ProtocolError::NotFound(_) => Self::new(tonic::Code::NotFound, msg),
+            ProtocolError::Oversized(_) => Self::new(tonic::Code::OutOfRange, msg),
             ProtocolError::Disconnected(_) | ProtocolError::Maintenance(_) => {
-                tonic::Status::new(tonic::Code::Unavailable, msg)
+                Self::new(tonic::Code::Unavailable, msg)
             }
-            ProtocolError::NotSupported(_) => tonic::Status::new(tonic::Code::Unimplemented, msg),
+            ProtocolError::NotSupported(_) => Self::new(tonic::Code::Unimplemented, msg),
             ProtocolError::NoRemote(_) | ProtocolError::Internal(_) => {
-                tonic::Status::new(tonic::Code::Internal, msg)
+                Self::new(tonic::Code::Internal, msg)
             }
         }
     }
diff --git a/lore-transport/src/grpc/environment_client.rs b/lore-transport/src/grpc/environment_client.rs
index fa6729c..da99881 100644
--- a/lore-transport/src/grpc/environment_client.rs
+++ b/lore-transport/src/grpc/environment_client.rs
@@ -18,7 +18,7 @@ use crate::types::EnvironmentServerConfig;
 
 impl From<lore_proto::lore::environment::v1::Environment> for EnvironmentConfig {
     fn from(value: lore_proto::lore::environment::v1::Environment) -> Self {
-        EnvironmentConfig {
+        Self {
             endpoint: value.endpoint.map(|endpoint| Endpoint {
                 auth_url: if !endpoint.auth_url.is_empty() {
                     Some(endpoint.auth_url.clone())
diff --git a/lore-transport/src/grpc/mod.rs b/lore-transport/src/grpc/mod.rs
index d5dad15..f4112c7 100644
--- a/lore-transport/src/grpc/mod.rs
+++ b/lore-transport/src/grpc/mod.rs
@@ -98,7 +98,7 @@ impl GRPCAuth {
         let (authentication_token, authorization_token, resolved_identity) =
             auth_exchange(auth_url, &remote_domain, identity, repository).await;
 
-        let auth = Arc::new(parking_lot::RwLock::new(GRPCAuth {
+        let auth = Arc::new(parking_lot::RwLock::new(Self {
             remote_domain: remote_domain.clone(),
             authentication_token,
             authorization_token,
@@ -136,7 +136,7 @@ impl GRPCAuth {
         let (authentication_token, authorization_token, resolved_identity) =
             auth_exchange_custom_resource(auth_url, &remote_domain, identity, resource_id).await;
 
-        let auth = Arc::new(parking_lot::RwLock::new(GRPCAuth {
+        let auth = Arc::new(parking_lot::RwLock::new(Self {
             remote_domain: remote_domain.clone(),
             authentication_token,
             authorization_token,
@@ -897,7 +897,7 @@ struct RequestScopedCounter {
 impl RequestScopedCounter {
     pub fn new(counter: Arc<AtomicU64>) -> Self {
         counter.fetch_add(1, std::sync::atomic::Ordering::Release);
-        RequestScopedCounter { counter }
+        Self { counter }
     }
 }
 
diff --git a/lore-transport/src/quic/client.rs b/lore-transport/src/quic/client.rs
index 3a74bc4..c3d51f5 100644
--- a/lore-transport/src/quic/client.rs
+++ b/lore-transport/src/quic/client.rs
@@ -331,7 +331,7 @@ impl QuicConnection {
     }
 
     pub fn with_v4(connection: quinn::Connection, max_chunk_size: usize, v4: bool) -> Self {
-        QuicConnection {
+        Self {
             connection: RwLock::new(QuicQuinnConnection {
                 connection,
                 writer: vec![],
diff --git a/lore-transport/src/quic/command_header.rs b/lore-transport/src/quic/command_header.rs
index 9432b1f..e78b46a 100644
--- a/lore-transport/src/quic/command_header.rs
+++ b/lore-transport/src/quic/command_header.rs
@@ -99,7 +99,7 @@ impl CommandHeader {
             bytes
         });
 
-        CommandHeader {
+        Self {
             cmd,
             error,
             size_or_status: size_status,
diff --git a/lore-transport/src/quic/response_reader.rs b/lore-transport/src/quic/response_reader.rs
index 0150d74..6191300 100644
--- a/lore-transport/src/quic/response_reader.rs
+++ b/lore-transport/src/quic/response_reader.rs
@@ -45,7 +45,7 @@ impl ResponseReader {
     ) -> Self {
         let pending = Arc::new(PendingCommandMap::new());
         let pending_clone = pending.clone();
-        ResponseReader {
+        Self {
             task: lore_spawn!({
                 async move {
                     let pending = pending_clone;
diff --git a/lore-transport/src/quic/storage_service/client.rs b/lore-transport/src/quic/storage_service/client.rs
index 7c671e7..ee044f2 100644
--- a/lore-transport/src/quic/storage_service/client.rs
+++ b/lore-transport/src/quic/storage_service/client.rs
@@ -99,7 +99,7 @@ impl StorageClient {
         quinn: quinn::Connection,
     ) -> Self {
         let quic = QuicConnection::with_v4(quinn, MAX_CHUNK_SIZE, true);
-        StorageClient {
+        Self {
             connection,
             remote_url: remote_url.to_string(),
             transport_config,
@@ -153,7 +153,7 @@ impl StorageClient {
         .await?;
         let connection_id = quinn.stable_id();
 
-        let storage = StorageClient::new(
+        let storage = Self::new(
             connection,
             remote_url,
             transport_config,
diff --git a/lore-transport/src/quic/storage_service/mod.rs b/lore-transport/src/quic/storage_service/mod.rs
index 50c9d8f..3a6b304 100644
--- a/lore-transport/src/quic/storage_service/mod.rs
+++ b/lore-transport/src/quic/storage_service/mod.rs
@@ -35,7 +35,7 @@ pub enum Command {
 
 impl From<Command> for QuicOpCode {
     fn from(value: Command) -> Self {
-        value as QuicOpCode
+        value as Self
     }
 }
 
@@ -44,16 +44,16 @@ impl TryFrom<QuicOpCode> for Command {
 
     fn try_from(value: QuicOpCode) -> Result<Self, Self::Error> {
         match value {
-            v if v == Command::Authorize as u8 => Ok(Command::Authorize),
-            v if v == Command::Get as u8 => Ok(Command::Get),
-            v if v == Command::Put as u8 => Ok(Command::Put),
-            v if v == Command::Query as u8 => Ok(Command::Query),
-            v if v == Command::Verify as u8 => Ok(Command::Verify),
-            v if v == Command::Copy as u8 => Ok(Command::Copy),
-            v if v == Command::MutableLoad as u8 => Ok(Command::MutableLoad),
-            v if v == Command::MutableStore as u8 => Ok(Command::MutableStore),
-            v if v == Command::MutableCas as u8 => Ok(Command::MutableCas),
-            v if v == Command::GetMetadata as u8 => Ok(Command::GetMetadata),
+            v if v == Self::Authorize as u8 => Ok(Self::Authorize),
+            v if v == Self::Get as u8 => Ok(Self::Get),
+            v if v == Self::Put as u8 => Ok(Self::Put),
+            v if v == Self::Query as u8 => Ok(Self::Query),
+            v if v == Self::Verify as u8 => Ok(Self::Verify),
+            v if v == Self::Copy as u8 => Ok(Self::Copy),
+            v if v == Self::MutableLoad as u8 => Ok(Self::MutableLoad),
+            v if v == Self::MutableStore as u8 => Ok(Self::MutableStore),
+            v if v == Self::MutableCas as u8 => Ok(Self::MutableCas),
+            v if v == Self::GetMetadata as u8 => Ok(Self::GetMetadata),
             _ => Err(UnknownCommand(value)),
         }
     }
@@ -117,9 +117,9 @@ impl Display for QueryStatus {
             f,
             "{}",
             match self {
-                QueryStatus::ExistFullMatch => "Full match",
-                QueryStatus::ExistHashMatch => "Hash match",
-                QueryStatus::NotFound => "Not found",
+                Self::ExistFullMatch => "Full match",
+                Self::ExistHashMatch => "Hash match",
+                Self::NotFound => "Not found",
             }
         )
     }
diff --git a/lore-transport/src/session.rs b/lore-transport/src/session.rs
index 57e3383..8f56111 100644
--- a/lore-transport/src/session.rs
+++ b/lore-transport/src/session.rs
@@ -92,9 +92,7 @@ impl StorageSession {
     pub fn pending<F, Fut>(resolver: F) -> Self
     where
         F: Fn() -> Fut + Send + Sync + 'static,
-        Fut: std::future::Future<Output = Result<Arc<StorageSession>, ProtocolError>>
-            + Send
-            + 'static,
+        Fut: std::future::Future<Output = Result<Arc<Self>, ProtocolError>> + Send + 'static,
     {
         Self {
             inner: SessionInner::Pending {
diff --git a/lore-transport/src/types.rs b/lore-transport/src/types.rs
index 78b8600..1fa3a92 100644
--- a/lore-transport/src/types.rs
+++ b/lore-transport/src/types.rs
@@ -91,7 +91,7 @@ pub struct CompressionMode(u32);
 
 impl CompressionMode {
     pub fn from_u32(value: u32) -> Self {
-        CompressionMode(value)
+        Self(value)
     }
 
     pub fn as_u32(&self) -> u32 {
@@ -165,13 +165,13 @@ pub struct RevisionListIdentifier {
 
 impl From<RevisionListIdentifier> for RevisionListStart {
     fn from(value: RevisionListIdentifier) -> Self {
-        RevisionListStart::Identifier(value)
+        Self::Identifier(value)
     }
 }
 
 impl From<Hash> for RevisionListStart {
     fn from(value: Hash) -> Self {
-        RevisionListStart::Signature(value)
+        Self::Signature(value)
     }
 }
 
diff --git a/lore/src/remote/message.rs b/lore/src/remote/message.rs
index 8c36c2e..83ce5bb 100644
--- a/lore/src/remote/message.rs
+++ b/lore/src/remote/message.rs
@@ -126,8 +126,8 @@ impl TryFrom<u8> for SerializationType {
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
-            0 => Ok(SerializationType::Bincode),
-            1 => Ok(SerializationType::Json),
+            0 => Ok(Self::Bincode),
+            1 => Ok(Self::Json),
             _ => Err(()),
         }
     }
@@ -148,7 +148,7 @@ impl V1Header {
         }
     }
 
-    pub fn from_bytes(bytes: &[u8; V1Header::SIZE]) -> Result<Self, MessageError> {
+    pub fn from_bytes(bytes: &[u8; Self::SIZE]) -> Result<Self, MessageError> {
         Ok(Self::new(
             bytes[0] as u32
                 | (bytes[1] as u32) << 8
@@ -163,7 +163,7 @@ impl V1Header {
         ))
     }
 
-    pub fn to_bytes(&self) -> [u8; V1Header::SIZE] {
+    pub fn to_bytes(&self) -> [u8; Self::SIZE] {
         [
             (self.payload_size & 0xff) as u8,
             (self.payload_size >> 8 & 0xff) as u8,
diff --git a/lore/src/remote/network/stub.rs b/lore/src/remote/network/stub.rs
index bb06f1e..12cb0b6 100644
--- a/lore/src/remote/network/stub.rs
+++ b/lore/src/remote/network/stub.rs
@@ -11,7 +11,7 @@ pub fn uds_supported() -> bool {
 pub struct UdsListener {}
 
 impl UdsListener {
-    pub fn new() -> Result<UdsListener, UdsListenerError> {
+    pub fn new() -> Result<Self, UdsListenerError> {
         panic!("Networking not supported on this OS")
     }
 
@@ -39,7 +39,7 @@ impl UdsStream {
         panic!("Networking not supported on this OS")
     }
 
-    pub fn connect() -> Result<UdsStream, UdsConnectionError> {
+    pub fn connect() -> Result<Self, UdsConnectionError> {
         panic!("Networking not supported on this OS")
     }
 }
diff --git a/lore/src/revision_tree/call.rs b/lore/src/revision_tree/call.rs
index 7e3771f..7e97b71 100644
--- a/lore/src/revision_tree/call.rs
+++ b/lore/src/revision_tree/call.rs
@@ -36,8 +36,8 @@ enum DispatchError {
 impl EventError for DispatchError {
     fn translated(&self) -> LoreError {
         match self {
-            DispatchError::InvalidArguments(_) => LoreError::InvalidArguments,
-            DispatchError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/call.rs b/lore/src/storage/call.rs
index e70dacc..b2681e6 100644
--- a/lore/src/storage/call.rs
+++ b/lore/src/storage/call.rs
@@ -35,8 +35,8 @@ enum DispatchError {
 impl EventError for DispatchError {
     fn translated(&self) -> LoreError {
         match self {
-            DispatchError::InvalidArguments(_) => LoreError::InvalidArguments,
-            DispatchError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/close.rs b/lore/src/storage/close.rs
index 0c19b5c..8602f0d 100644
--- a/lore/src/storage/close.rs
+++ b/lore/src/storage/close.rs
@@ -72,8 +72,8 @@ enum CloseError {
 impl EventError for CloseError {
     fn translated(&self) -> LoreError {
         match self {
-            CloseError::InvalidArguments(_) => LoreError::InvalidArguments,
-            CloseError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/copy.rs b/lore/src/storage/copy.rs
index 636895f..d6dbd48 100644
--- a/lore/src/storage/copy.rs
+++ b/lore/src/storage/copy.rs
@@ -101,8 +101,8 @@ enum CopyError {
 impl EventError for CopyError {
     fn translated(&self) -> LoreError {
         match self {
-            CopyError::InvalidArguments(_) => LoreError::InvalidArguments,
-            CopyError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/flush.rs b/lore/src/storage/flush.rs
index 7405650..7f38ded 100644
--- a/lore/src/storage/flush.rs
+++ b/lore/src/storage/flush.rs
@@ -38,7 +38,7 @@ enum FlushError {}
 impl EventError for FlushError {
     fn translated(&self) -> LoreError {
         match self {
-            FlushError::Internal(_) => LoreError::Internal,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/get.rs b/lore/src/storage/get.rs
index 9bef4ab..cf793b0 100644
--- a/lore/src/storage/get.rs
+++ b/lore/src/storage/get.rs
@@ -95,8 +95,8 @@ enum GetError {
 impl EventError for GetError {
     fn translated(&self) -> LoreError {
         match self {
-            GetError::InvalidArguments(_) => LoreError::InvalidArguments,
-            GetError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/get_file.rs b/lore/src/storage/get_file.rs
index 177f219..3e74567 100644
--- a/lore/src/storage/get_file.rs
+++ b/lore/src/storage/get_file.rs
@@ -94,8 +94,8 @@ enum GetFileError {
 impl EventError for GetFileError {
     fn translated(&self) -> LoreError {
         match self {
-            GetFileError::InvalidArguments(_) => LoreError::InvalidArguments,
-            GetFileError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/get_metadata.rs b/lore/src/storage/get_metadata.rs
index d4f9db5..27fe60a 100644
--- a/lore/src/storage/get_metadata.rs
+++ b/lore/src/storage/get_metadata.rs
@@ -80,8 +80,8 @@ enum GetMetadataError {
 impl EventError for GetMetadataError {
     fn translated(&self) -> LoreError {
         match self {
-            GetMetadataError::InvalidArguments(_) => LoreError::InvalidArguments,
-            GetMetadataError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/obliterate.rs b/lore/src/storage/obliterate.rs
index 082e2f5..002740d 100644
--- a/lore/src/storage/obliterate.rs
+++ b/lore/src/storage/obliterate.rs
@@ -70,8 +70,8 @@ enum ObliterateError {
 impl EventError for ObliterateError {
     fn translated(&self) -> LoreError {
         match self {
-            ObliterateError::InvalidArguments(_) => LoreError::InvalidArguments,
-            ObliterateError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/open.rs b/lore/src/storage/open.rs
index 9180bc3..c602777 100644
--- a/lore/src/storage/open.rs
+++ b/lore/src/storage/open.rs
@@ -152,8 +152,8 @@ enum OpenError {
 impl EventError for OpenError {
     fn translated(&self) -> LoreError {
         match self {
-            OpenError::InvalidArguments(_) => LoreError::InvalidArguments,
-            OpenError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/put.rs b/lore/src/storage/put.rs
index 004b9d0..a24ebe8 100644
--- a/lore/src/storage/put.rs
+++ b/lore/src/storage/put.rs
@@ -96,8 +96,8 @@ enum PutError {
 impl EventError for PutError {
     fn translated(&self) -> LoreError {
         match self {
-            PutError::InvalidArguments(_) => LoreError::InvalidArguments,
-            PutError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/put_file.rs b/lore/src/storage/put_file.rs
index 46c3eab..ceefed7 100644
--- a/lore/src/storage/put_file.rs
+++ b/lore/src/storage/put_file.rs
@@ -98,8 +98,8 @@ enum PutFileError {
 impl EventError for PutFileError {
     fn translated(&self) -> LoreError {
         match self {
-            PutFileError::InvalidArguments(_) => LoreError::InvalidArguments,
-            PutFileError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }
 
diff --git a/lore/src/storage/upload.rs b/lore/src/storage/upload.rs
index ea209a1..16bebda 100644
--- a/lore/src/storage/upload.rs
+++ b/lore/src/storage/upload.rs
@@ -77,8 +77,8 @@ enum UploadError {
 impl EventError for UploadError {
     fn translated(&self) -> LoreError {
         match self {
-            UploadError::InvalidArguments(_) => LoreError::InvalidArguments,
-            UploadError::Internal(_) => LoreError::Internal,
+            Self::InvalidArguments(_) => LoreError::InvalidArguments,
+            Self::Internal(_) => LoreError::Internal,
         }
     }