diff --git a/src/annotations/mod.rs b/src/annotations/mod.rs
index 8768112..1bb9e85 100644
--- a/src/annotations/mod.rs
+++ b/src/annotations/mod.rs
@@ -23,7 +23,7 @@ cfg_if::cfg_if! {
         use std::thread_local;
 
         thread_local! {
-            static ANNOTATION_STATE: RefCell<Option<AnnotationState>> = RefCell::new(None);
+            static ANNOTATION_STATE: RefCell<Option<AnnotationState>> = const { RefCell::new(None) };
         }
 
         #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
@@ -284,9 +284,11 @@ cfg_if::cfg_if! {
             ANNOTATION_STATE.with(|cell| {
                 let mut bw = cell.borrow_mut();
                 assert!(bw.is_none(), "annotations already started");
-                let mut state: AnnotationState = Default::default();
-                state.version = ANNOTATION_VERSION;
-                state.last_task_id = Some(0.into());
+                let state = AnnotationState {
+                    version: ANNOTATION_VERSION,
+                    last_task_id: Some(0.into()),
+                    ..Default::default()
+                };
                 *bw = Some(state);
             });
         }
diff --git a/src/lazy_static.rs b/src/lazy_static.rs
index 1c00ee2..152a1ab 100644
--- a/src/lazy_static.rs
+++ b/src/lazy_static.rs
@@ -45,7 +45,7 @@ impl<T: Sync> std::fmt::Debug for Lazy<T> {
 
 impl<T: Sync> Lazy<T> {
     /// Get a reference to the lazy value, initializing it first if necessary.
-    pub fn get(&'static self) -> &T {
+    pub fn get(&'static self) -> &'static T {
         // Safety: see the usage below
         unsafe fn extend_lt<T>(t: &T) -> &'static T {
             std::mem::transmute(t)
diff --git a/src/sync/mpsc.rs b/src/sync/mpsc.rs
index a84f723..07b62a1 100644
--- a/src/sync/mpsc.rs
+++ b/src/sync/mpsc.rs
@@ -484,7 +484,7 @@ pub struct IntoIter<T> {
     rx: Receiver<T>,
 }
 
-impl<'a, T> Iterator for Iter<'a, T> {
+impl<T> Iterator for Iter<'_, T> {
     type Item = T;
 
     fn next(&mut self) -> Option<T> {
@@ -492,7 +492,7 @@ impl<'a, T> Iterator for Iter<'a, T> {
     }
 }
 
-impl<'a, T> Iterator for TryIter<'a, T> {
+impl<T> Iterator for TryIter<'_, T> {
     type Item = T;
 
     fn next(&mut self) -> Option<T> {
diff --git a/src/sync/mutex.rs b/src/sync/mutex.rs
index 4dc41e8..4f258d7 100644
--- a/src/sync/mutex.rs
+++ b/src/sync/mutex.rs
@@ -177,7 +177,7 @@ impl<'a, T: ?Sized> MutexGuard<'a, T> {
     }
 }
 
-impl<'a, T: ?Sized> Drop for MutexGuard<'a, T> {
+impl<T: ?Sized> Drop for MutexGuard<'_, T> {
     fn drop(&mut self) {
         // Release the inner mutex
         self.inner = None;
diff --git a/src/thread.rs b/src/thread.rs
index e5acfe8..62cac17 100644
--- a/src/thread.rs
+++ b/src/thread.rs
@@ -318,7 +318,7 @@ impl<T: 'static> LocalKey<T> {
         Ok(f(value))
     }
 
-    fn get(&'static self) -> Option<std::result::Result<&T, AccessError>> {
+    fn get(&'static self) -> Option<std::result::Result<&'static T, AccessError>> {
         // Safety: see the usage below
         unsafe fn extend_lt<'b, T>(t: &'_ T) -> &'b T {
             std::mem::transmute(t)
diff --git a/tests/demo/bounded_buffer.rs b/tests/demo/bounded_buffer.rs
index 5f62b26..d128821 100644
--- a/tests/demo/bounded_buffer.rs
+++ b/tests/demo/bounded_buffer.rs
@@ -1,3 +1,7 @@
+//! This file implements the example from a blog post about Coyote (P#):
+//!   https://cloudblogs.microsoft.com/opensource/2020/07/14/extreme-programming-meets-systematic-testing-using-coyote/
+//! The comments in this file are quotes from that blog post.
+
 // For symmetry we clone some `Arc`s even though we could just move them
 #![allow(clippy::redundant_clone)]
 
@@ -8,10 +12,6 @@ use shuttle::{check_random, replay, thread};
 use std::sync::Arc;
 use test_log::test;
 
-/// This file implements the example from a blog post about Coyote (P#):
-///   https://cloudblogs.microsoft.com/opensource/2020/07/14/extreme-programming-meets-systematic-testing-using-coyote/
-/// The comments in this file are quotes from that blog post.
-
 /// Let’s walk through how Coyote can easily solve the programming problem posed by Tom Cargill. He
 /// shared a BoundedBuffer implementation written in Java with a known, but tricky, deadlock bug.
 ///