diff --git a/prqlc/prqlc/src/semantic/resolver/expr.rs b/prqlc/prqlc/src/semantic/resolver/expr.rs
index a3f9e31e869f..dc2b6eaa2bcb 100644
--- a/prqlc/prqlc/src/semantic/resolver/expr.rs
+++ b/prqlc/prqlc/src/semantic/resolver/expr.rs
@@ -202,23 +202,23 @@ impl PlFold for Resolver<'_> {
                 ..node
             },
         };
-        self.finish_expr_resolve(Box::new(r), id, alias, span)
+        self.finish_expr_resolve(r, id, *alias, *span)
     }
 }
 
 impl Resolver<'_> {
     fn finish_expr_resolve(
         &mut self,
-        expr: Box<Expr>,
+        expr: Expr,
         id: usize,
-        alias: Box<Option<String>>,
-        span: Box<Option<Span>>,
+        alias: Option<String>,
+        span: Option<Span>,
     ) -> Result<Expr> {
-        let mut r = Box::new(self.static_eval(*expr)?);
+        let mut r = Box::new(self.static_eval(expr)?);
 
         r.id = r.id.or(Some(id));
-        r.alias = r.alias.or(*alias);
-        r.span = r.span.or(*span);
+        r.alias = r.alias.or(alias);
+        r.span = r.span.or(span);
 
         if r.ty.is_none() {
             r.ty = Resolver::infer_type(&r)?;
diff --git a/prqlc/prqlc/tests/integration/cli.rs b/prqlc/prqlc/tests/integration/cli.rs
index 84abb7b11eee..eb9f021fb7d4 100644
--- a/prqlc/prqlc/tests/integration/cli.rs
+++ b/prqlc/prqlc/tests/integration/cli.rs
@@ -128,7 +128,6 @@ fn compile_help() {
     "###);
 }
 
-#[cfg(not(windows))] // This is back to causing a SO on Windows since https://github.com/PRQL/prql/pull/3786
 #[test]
 fn long_query() {
     assert_cmd_snapshot!(prqlc_command()