diff --git a/libs/common/src/reporting/diagnostic/mod.rs b/libs/common/src/reporting/diagnostic/mod.rs
index 178c8a8a..a8e73a78 100644
--- a/libs/common/src/reporting/diagnostic/mod.rs
+++ b/libs/common/src/reporting/diagnostic/mod.rs
@@ -47,15 +47,9 @@ impl Diagnostic {
         processed: &crate::reporting::Processed,
     ) -> Option<Self> {
         let mut diag = Self::new(code.ident(), code.message()).set_severity(code.severity());
-        let Some(map_start) = processed.mapping(span.start) else {
-            return None;
-        };
-        let Some(map_end) = processed.mapping(span.end) else {
-            return None;
-        };
-        let Some(map_file) = processed.source(map_start.source()) else {
-            return None;
-        };
+        let map_start = processed.mapping(span.start)?;
+        let map_end = processed.mapping(span.end)?;
+        let map_file = processed.source(map_start.source())?;
         diag.labels.push(
             Label::primary(
                 map_file.0.clone(),
diff --git a/libs/common/src/reporting/mod.rs b/libs/common/src/reporting/mod.rs
index 0ed9b5bc..cf2c26fa 100644
--- a/libs/common/src/reporting/mod.rs
+++ b/libs/common/src/reporting/mod.rs
@@ -52,9 +52,7 @@ pub trait Code: Send + Sync {
 
     /// A diagnostic for the LSP / terminal
     fn diagnostic(&self) -> Option<Diagnostic> {
-        let Some(token) = self.token() else {
-            return None;
-        };
+        let token = self.token()?;
         let mut diag = Diagnostic::new(self.ident(), self.message())
             .with_label(
                 Label::primary(token.position().path().clone(), token.position().span())
diff --git a/libs/preprocessor/src/codes/pe12_include_not_found.rs b/libs/preprocessor/src/codes/pe12_include_not_found.rs
index 81fcf3ab..9b45eac6 100644
--- a/libs/preprocessor/src/codes/pe12_include_not_found.rs
+++ b/libs/preprocessor/src/codes/pe12_include_not_found.rs
@@ -25,12 +25,8 @@ impl Code for IncludeNotFound {
 
     fn diagnostic(&self) -> Option<Diagnostic> {
         // TODO look for files with a similar name
-        let Some(first) = self.token.first() else {
-            return None;
-        };
-        let Some(last) = self.token.last() else {
-            return None;
-        };
+        let first = self.token.first()?;
+        let last = self.token.last()?;
         Some(
             Diagnostic::new(self.ident(), self.message()).with_label(
                 Label::primary(
diff --git a/libs/preprocessor/src/codes/pe15_if_invalid_operator.rs b/libs/preprocessor/src/codes/pe15_if_invalid_operator.rs
index 7880fb0f..0426f1ec 100644
--- a/libs/preprocessor/src/codes/pe15_if_invalid_operator.rs
+++ b/libs/preprocessor/src/codes/pe15_if_invalid_operator.rs
@@ -28,12 +28,8 @@ impl Code for IfInvalidOperator {
     }
 
     fn diagnostic(&self) -> Option<Diagnostic> {
-        let Some(start) = self.tokens.first() else {
-            return None;
-        };
-        let Some(end) = self.tokens.last() else {
-            return None;
-        };
+        let start = self.tokens.first()?;
+        let end = self.tokens.last()?;
         Some(
             Diagnostic::new(self.ident(), self.message())
                 .with_label(