From 8f318c30cf8cbed175181078f8abf975a1e3b058 Mon Sep 17 00:00:00 2001
From: ozgurakgun <ozgurakgun@gmail.com>
Date: Sat, 30 Mar 2024 19:35:50 +0000
Subject: [PATCH] Actions: Update code coverage for main

---
 .../conjure_oxide/src/find_conjure.rs.html    |   92 +-
 .../conjure_oxide/src/utils/conjure.rs.html   |  716 +-
 .../main/conjure_oxide/src/utils/index.html   |   24 +-
 .../main/conjure_oxide/src/utils/json.rs.html |  168 +-
 .../conjure_oxide/src/utils/testing.rs.html   | 1174 +--
 .../tests/generated_tests.rs.html             |  470 +-
 coverage/main/conjure_oxide/tests/index.html  |   10 +-
 .../conjure_oxide/tests/model_tests.rs.html   |    2 +-
 .../conjure_oxide/tests/rewrite_tests.rs.html |   58 +-
 coverage/main/coverage.json                   |    2 +-
 .../conjure_core/src/ast/constants.rs.html    |    4 +-
 .../conjure_core/src/ast/domains.rs.html      |    8 +-
 .../conjure_core/src/ast/symbol_table.rs.html |    4 +-
 .../conjure_core/src/ast/variables.rs.html    |    4 +-
 .../crates/conjure_core/src/context.rs.html   |  560 +-
 .../main/crates/conjure_core/src/index.html   |   20 +-
 .../crates/conjure_core/src/metadata.rs.html  |    4 +-
 .../crates/conjure_core/src/model.rs.html     |  610 +-
 .../src/parse/example_models.rs.html          |  396 +-
 .../src/parse/parse_model.rs.html             | 1188 +--
 .../conjure_core/src/rule_engine/index.html   |   16 +-
 .../src/rule_engine/resolve_rules.rs.html     |   60 +-
 .../conjure_core/src/rule_engine/rule.rs.html |   24 +-
 .../src/rule_engine/rule_set.rs.html          |   34 +-
 .../src/solver/adaptors/index.html            |   16 +-
 .../src/solver/adaptors/minion.rs.html        |  862 ++-
 .../crates/conjure_core/src/solver/index.html |   16 +-
 .../conjure_core/src/solver/mod.rs.html       | 2098 ++++--
 .../crates/conjure_core/src/stats/index.html  |   98 +
 .../crates/conjure_core/src/stats/mod.rs.html |  409 +
 .../src/stats/solver_stats.rs.html            |  633 ++
 .../main/crates/uniplate/src/tree.rs.html     |  140 +-
 coverage/main/doc-coverage.json               |   10 +-
 coverage/main/doc-coverage.txt                |   25 +-
 coverage/main/index.html                      |   96 +-
 coverage/main/lcov.info                       | 6671 +++++++++--------
 36 files changed, 9761 insertions(+), 6961 deletions(-)
 create mode 100644 coverage/main/crates/conjure_core/src/stats/index.html
 create mode 100644 coverage/main/crates/conjure_core/src/stats/mod.rs.html
 create mode 100644 coverage/main/crates/conjure_core/src/stats/solver_stats.rs.html

diff --git a/coverage/main/conjure_oxide/src/find_conjure.rs.html b/coverage/main/conjure_oxide/src/find_conjure.rs.html
index 5674f4d10d..53ef256f71 100644
--- a/coverage/main/conjure_oxide/src/find_conjure.rs.html
+++ b/coverage/main/conjure_oxide/src/find_conjure.rs.html
@@ -167,8 +167,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -183,8 +183,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -199,8 +199,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -215,8 +215,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -231,8 +231,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -263,8 +263,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -295,8 +295,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -311,8 +311,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -327,8 +327,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -343,8 +343,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -359,8 +359,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -375,8 +375,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -567,8 +567,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -583,8 +583,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -599,8 +599,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -615,8 +615,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -631,8 +631,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -663,8 +663,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -679,8 +679,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -903,8 +903,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -999,8 +999,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1015,8 +1015,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1031,8 +1031,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4">
-                4
+                role="cell" aria-label="5">
+                5
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/conjure_oxide/src/utils/conjure.rs.html b/coverage/main/conjure_oxide/src/utils/conjure.rs.html
index 3feb7df911..622b8082e6 100644
--- a/coverage/main/conjure_oxide/src/utils/conjure.rs.html
+++ b/coverage/main/conjure_oxide/src/utils/conjure.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-warning">
-                <abbr title="45 / 59">76.27 %</abbr></p>
+                <abbr title="56 / 70">80 %</abbr></p>
         </div>
     </div>
 
@@ -60,7 +60,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, Mutex};</pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, Mutex, RwLock};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde_json::{Map, Value as JsonValue};</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_core::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use thiserror::Error as ThisError;</pre>
+                <pre class="has-background-white py-0 px-2">use serde_json::{Map, Value as JsonValue};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use thiserror::Error as ThisError;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::model_from_json;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::solver::adaptors::Minion;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::model_from_json;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::solver::Solver;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::solver::adaptors::Minion;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::utils::json::sort_json_object;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::solver::Solver;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -220,7 +220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Error as ParseErr;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::utils::json::sort_json_object;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -236,7 +236,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::Error as ParseErr;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -252,7 +252,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -262,13 +262,13 @@
                 <a href="#15">15</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">#[derive(Debug, ThisError)]</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -278,13 +278,13 @@
                 <a href="#16">16</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub enum EssenceParseError {</pre>
+                <pre class="has-background-danger-light py-0 px-2">#[derive(Debug, ThisError)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -300,7 +300,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[error(&quot;Error running conjure pretty: {0}&quot;)]</pre>
+                <pre class="has-background-white py-0 px-2">pub enum EssenceParseError {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -316,7 +316,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    ConjurePrettyError(String),</pre>
+                <pre class="has-background-white py-0 px-2">    #[error(&quot;Error running conjure pretty: {0}&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -332,7 +332,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[error(&quot;Error parsing essence file: {0}&quot;)]</pre>
+                <pre class="has-background-white py-0 px-2">    ConjurePrettyError(String),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -348,7 +348,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    ParseError(ParseErr),</pre>
+                <pre class="has-background-white py-0 px-2">    #[error(&quot;Error parsing essence file: {0}&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -364,7 +364,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">    ParseError(ParseErr),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -380,7 +380,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -396,7 +396,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl From&lt;ParseErr&gt; for EssenceParseError {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -406,13 +406,13 @@
                 <a href="#24">24</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    fn from(e: ParseErr) -&gt; Self {</pre>
+                <pre class="has-background-white py-0 px-2">impl From&lt;ParseErr&gt; for EssenceParseError {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -428,7 +428,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        EssenceParseError::ParseError(e)</pre>
+                <pre class="has-background-danger-light py-0 px-2">    fn from(e: ParseErr) -&gt; Self {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -444,7 +444,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-danger-light py-0 px-2">        EssenceParseError::ParseError(e)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -454,13 +454,13 @@
                 <a href="#27">27</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -476,7 +476,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -486,13 +486,13 @@
                 <a href="#29">29</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">pub fn parse_essence_file(path: &amp;str, filename: &amp;str) -&gt; Result&lt;Model, EssenceParseError&gt; {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -503,12 +503,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut cmd = std::process::Command::new(&quot;conjure&quot;);</pre>
+                <pre class="has-background-success-light py-0 px-2">pub fn parse_essence_file(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -519,12 +519,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let output = match cmd</pre>
+                <pre class="has-background-success-light py-0 px-2">    path: &amp;str,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -535,12 +535,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;pretty&quot;)</pre>
+                <pre class="has-background-success-light py-0 px-2">    filename: &amp;str,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -551,12 +551,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;--output-format=astjson&quot;)</pre>
+                <pre class="has-background-success-light py-0 px-2">    context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -567,12 +567,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(format!(&quot;{path}&#x2F;{filename}.essence&quot;))</pre>
+                <pre class="has-background-success-light py-0 px-2">) -&gt; Result&lt;Model, EssenceParseError&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -583,12 +583,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .output()</pre>
+                <pre class="has-background-success-light py-0 px-2">    let mut cmd = std::process::Command::new(&quot;conjure&quot;);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -597,6 +597,86 @@
                 role="cell">
                 <a href="#36">36</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let output = match cmd</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="37"
+                role="cell">
+                <a href="#37">37</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;pretty&quot;)</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="38"
+                role="cell">
+                <a href="#38">38</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;--output-format=astjson&quot;)</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="39"
+                role="cell">
+                <a href="#39">39</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .arg(format!(&quot;{path}&#x2F;{filename}.essence&quot;))</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="40"
+                role="cell">
+                <a href="#40">40</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .output()</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="41"
+                role="cell">
+                <a href="#41">41</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
                 role="cell" aria-label="no coverage">
@@ -609,14 +689,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="37"
+                id="42"
                 role="cell">
-                <a href="#37">37</a>
+                <a href="#42">42</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -625,9 +705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="38"
+                id="43"
                 role="cell">
-                <a href="#38">38</a>
+                <a href="#43">43</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -641,9 +721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="39"
+                id="44"
                 role="cell">
-                <a href="#39">39</a>
+                <a href="#44">44</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -657,9 +737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="40"
+                id="45"
                 role="cell">
-                <a href="#40">40</a>
+                <a href="#45">45</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -673,14 +753,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="41"
+                id="46"
                 role="cell">
-                <a href="#41">41</a>
+                <a href="#46">46</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -689,9 +769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="42"
+                id="47"
                 role="cell">
-                <a href="#42">42</a>
+                <a href="#47">47</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -705,9 +785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="43"
+                id="48"
                 role="cell">
-                <a href="#43">43</a>
+                <a href="#48">48</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -721,9 +801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="44"
+                id="49"
                 role="cell">
-                <a href="#44">44</a>
+                <a href="#49">49</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -737,14 +817,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="45"
+                id="50"
                 role="cell">
-                <a href="#45">45</a>
+                <a href="#50">50</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -753,9 +833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="46"
+                id="51"
                 role="cell">
-                <a href="#46">46</a>
+                <a href="#51">51</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -769,14 +849,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="47"
+                id="52"
                 role="cell">
-                <a href="#47">47</a>
+                <a href="#52">52</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -785,14 +865,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="48"
+                id="53"
                 role="cell">
-                <a href="#48">48</a>
+                <a href="#53">53</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -801,9 +881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="49"
+                id="54"
                 role="cell">
-                <a href="#49">49</a>
+                <a href="#54">54</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -817,9 +897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="50"
+                id="55"
                 role="cell">
-                <a href="#50">50</a>
+                <a href="#55">55</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -833,9 +913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="51"
+                id="56"
                 role="cell">
-                <a href="#51">51</a>
+                <a href="#56">56</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -849,9 +929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="52"
+                id="57"
                 role="cell">
-                <a href="#52">52</a>
+                <a href="#57">57</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -865,9 +945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="53"
+                id="58"
                 role="cell">
-                <a href="#53">53</a>
+                <a href="#58">58</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -881,9 +961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="54"
+                id="59"
                 role="cell">
-                <a href="#54">54</a>
+                <a href="#59">59</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -897,9 +977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="55"
+                id="60"
                 role="cell">
-                <a href="#55">55</a>
+                <a href="#60">60</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -913,9 +993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="56"
+                id="61"
                 role="cell">
-                <a href="#56">56</a>
+                <a href="#61">61</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -929,30 +1009,30 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="57"
+                id="62"
                 role="cell">
-                <a href="#57">57</a>
+                <a href="#62">62</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let parsed_model = model_from_json(&amp;astjson)?;</pre>
+                <pre class="has-background-success-light py-0 px-2">    let parsed_model = model_from_json(&amp;astjson, context)?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="58"
+                id="63"
                 role="cell">
-                <a href="#58">58</a>
+                <a href="#63">63</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -961,14 +1041,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="59"
+                id="64"
                 role="cell">
-                <a href="#59">59</a>
+                <a href="#64">64</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -977,9 +1057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="60"
+                id="65"
                 role="cell">
-                <a href="#60">60</a>
+                <a href="#65">65</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -993,14 +1073,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="61"
+                id="66"
                 role="cell">
-                <a href="#61">61</a>
+                <a href="#66">66</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1009,14 +1089,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="62"
+                id="67"
                 role="cell">
-                <a href="#62">62</a>
+                <a href="#67">67</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1025,14 +1105,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="63"
+                id="68"
                 role="cell">
-                <a href="#63">63</a>
+                <a href="#68">68</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1041,14 +1121,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="64"
+                id="69"
                 role="cell">
-                <a href="#64">64</a>
+                <a href="#69">69</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1057,14 +1137,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="65"
+                id="70"
                 role="cell">
-                <a href="#65">65</a>
+                <a href="#70">70</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1073,9 +1153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="66"
+                id="71"
                 role="cell">
-                <a href="#66">66</a>
+                <a href="#71">71</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1089,14 +1169,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="67"
+                id="72"
                 role="cell">
-                <a href="#67">67</a>
+                <a href="#72">72</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1105,14 +1185,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="68"
+                id="73"
                 role="cell">
-                <a href="#68">68</a>
+                <a href="#73">73</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1121,14 +1201,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="69"
+                id="74"
                 role="cell">
-                <a href="#69">69</a>
+                <a href="#74">74</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1137,14 +1217,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="70"
+                id="75"
                 role="cell">
-                <a href="#70">70</a>
+                <a href="#75">75</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1153,14 +1233,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="71"
+                id="76"
                 role="cell">
-                <a href="#71">71</a>
+                <a href="#76">76</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1169,126 +1249,190 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="72"
+                id="77"
                 role="cell">
-                <a href="#72">72</a>
+                <a href="#77">77</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    solver.solve(Box::new(move |sols| {</pre>
+                <pre class="has-background-success-light py-0 px-2">    let solver = solver</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="73"
+                id="78"
                 role="cell">
-                <a href="#73">73</a>
+                <a href="#78">78</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let mut all_solutions = (*all_solutions_ref_2).lock().unwrap();</pre>
+                <pre class="has-background-success-light py-0 px-2">        .solve(Box::new(move |sols| {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="74"
+                id="79"
                 role="cell">
-                <a href="#74">74</a>
+                <a href="#79">79</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (*all_solutions).push(sols);</pre>
+                <pre class="has-background-success-light py-0 px-2">            let mut all_solutions = (*all_solutions_ref_2).lock().unwrap();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="75"
+                id="80"
                 role="cell">
-                <a href="#75">75</a>
+                <a href="#80">80</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        true</pre>
+                <pre class="has-background-success-light py-0 px-2">            (*all_solutions).push(sols);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="76"
+                id="81"
                 role="cell">
-                <a href="#76">76</a>
+                <a href="#81">81</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }))?;</pre>
+                <pre class="has-background-success-light py-0 px-2">            true</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="77"
+                id="82"
                 role="cell">
-                <a href="#77">77</a>
+                <a href="#82">82</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="175">
+                175
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        }))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="78"
+                id="83"
                 role="cell">
-                <a href="#78">78</a>
+                <a href="#83">83</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[allow(clippy::unwrap_used)]</pre>
+                <pre class="has-background-success-light py-0 px-2">        .unwrap();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="79"
+                id="84"
                 role="cell">
-                <a href="#79">79</a>
+                <a href="#84">84</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="85"
+                role="cell">
+                <a href="#85">85</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    solver.save_stats_to_context();</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="86"
+                role="cell">
+                <a href="#86">86</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="87"
+                role="cell">
+                <a href="#87">87</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    #[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="88"
+                role="cell">
+                <a href="#88">88</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1297,14 +1441,30 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="80"
+                id="89"
                 role="cell">
-                <a href="#80">80</a>
+                <a href="#89">89</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="90"
+                role="cell">
+                <a href="#90">90</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1313,14 +1473,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="81"
+                id="91"
                 role="cell">
-                <a href="#81">81</a>
+                <a href="#91">91</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1329,9 +1489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="82"
+                id="92"
                 role="cell">
-                <a href="#82">82</a>
+                <a href="#92">92</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1345,14 +1505,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="83"
+                id="93"
                 role="cell">
-                <a href="#83">83</a>
+                <a href="#93">93</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1361,14 +1521,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="84"
+                id="94"
                 role="cell">
-                <a href="#84">84</a>
+                <a href="#94">94</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1377,14 +1537,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="85"
+                id="95"
                 role="cell">
-                <a href="#85">85</a>
+                <a href="#95">95</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="176">
-                176
+                role="cell" aria-label="220">
+                220
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1393,14 +1553,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="86"
+                id="96"
                 role="cell">
-                <a href="#86">86</a>
+                <a href="#96">96</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1409,14 +1569,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="87"
+                id="97"
                 role="cell">
-                <a href="#87">87</a>
+                <a href="#97">97</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="520">
-                520
+                role="cell" aria-label="650">
+                650
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1425,14 +1585,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="88"
+                id="98"
                 role="cell">
-                <a href="#88">88</a>
+                <a href="#98">98</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="380">
-                380
+                role="cell" aria-label="475">
+                475
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1441,14 +1601,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="89"
+                id="99"
                 role="cell">
-                <a href="#89">89</a>
+                <a href="#99">99</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="380">
-                380
+                role="cell" aria-label="475">
+                475
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1457,9 +1617,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="90"
+                id="100"
                 role="cell">
-                <a href="#90">90</a>
+                <a href="#100">100</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1473,9 +1633,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="91"
+                id="101"
                 role="cell">
-                <a href="#91">91</a>
+                <a href="#101">101</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1489,14 +1649,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="92"
+                id="102"
                 role="cell">
-                <a href="#92">92</a>
+                <a href="#102">102</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="380">
-                380
+                role="cell" aria-label="475">
+                475
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1505,9 +1665,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="93"
+                id="103"
                 role="cell">
-                <a href="#93">93</a>
+                <a href="#103">103</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1521,14 +1681,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="94"
+                id="104"
                 role="cell">
-                <a href="#94">94</a>
+                <a href="#104">104</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="140">
-                140
+                role="cell" aria-label="175">
+                175
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1537,9 +1697,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="95"
+                id="105"
                 role="cell">
-                <a href="#95">95</a>
+                <a href="#105">105</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1553,14 +1713,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="96"
+                id="106"
                 role="cell">
-                <a href="#96">96</a>
+                <a href="#106">106</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1569,14 +1729,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="97"
+                id="107"
                 role="cell">
-                <a href="#97">97</a>
+                <a href="#107">107</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1585,14 +1745,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="98"
+                id="108"
                 role="cell">
-                <a href="#98">98</a>
+                <a href="#108">108</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/conjure_oxide/src/utils/index.html b/coverage/main/conjure_oxide/src/utils/index.html
index bbff7ff666..b9824c34aa 100644
--- a/coverage/main/conjure_oxide/src/utils/index.html
+++ b/coverage/main/conjure_oxide/src/utils/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="147 / 228">64.47 %</abbr></p>
+                <abbr title="171 / 252">67.86 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="15 / 60">25 %</abbr></p>
+                <abbr title="16 / 63">25.4 %</abbr></p>
         </div>
     </div>
 
@@ -46,16 +46,16 @@
         <td class="p-2">
             <progress
                 class="progress is-warning is-large"
-                value="76.27118644067797"
+                value="80"
                 max="100">
-                76.27%
+                80%
             </progress>
         </td>
         <td class="has-text-centered has-background-warning p-2">
-            76.27%
+            80%
         </td>
         <td class="has-text-centered has-background-warning p-2">
-            45 / 59
+            56 / 70
         </td>
         <!-- -->
         <td class="has-text-centered has-background-danger p-2">22.22%</td>
@@ -118,20 +118,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="54.54545454545454"
+                value="59.34959349593496"
                 max="100">
-                54.55%
+                59.35%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            54.55%
+            59.35%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            60 / 110
+            73 / 123
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">23.81%</td>
-        <td class="has-text-centered has-background-danger p-2">5 / 21 </td>
+        <td class="has-text-centered has-background-danger p-2">25%</td>
+        <td class="has-text-centered has-background-danger p-2">6 / 24 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/conjure_oxide/src/utils/json.rs.html b/coverage/main/conjure_oxide/src/utils/json.rs.html
index af3b63bb1f..367be315aa 100644
--- a/coverage/main/conjure_oxide/src/utils/json.rs.html
+++ b/coverage/main/conjure_oxide/src/utils/json.rs.html
@@ -135,8 +135,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="468">
-                468
+                role="cell" aria-label="615">
+                615
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -151,8 +151,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="468">
-                468
+                role="cell" aria-label="615">
+                615
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -295,8 +295,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="116">
-                116
+                role="cell" aria-label="135">
+                135
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -311,8 +311,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="116">
-                116
+                role="cell" aria-label="135">
+                135
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -327,8 +327,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="116">
-                116
+                role="cell" aria-label="135">
+                135
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -343,8 +343,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="116">
-                116
+                role="cell" aria-label="135">
+                135
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -359,8 +359,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="116">
-                116
+                role="cell" aria-label="135">
+                135
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -439,8 +439,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="352">
-                352
+                role="cell" aria-label="480">
+                480
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -471,8 +471,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="468">
-                468
+                role="cell" aria-label="615">
+                615
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -535,8 +535,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -551,8 +551,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -567,8 +567,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -583,8 +583,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -599,8 +599,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -615,8 +615,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -679,8 +679,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -791,8 +791,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7860">
-                7860
+                role="cell" aria-label="10230">
+                10230
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -807,8 +807,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7860">
-                7860
+                role="cell" aria-label="10230">
+                10230
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -823,8 +823,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -839,8 +839,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -855,8 +855,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -871,8 +871,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4196">
-                4196
+                role="cell" aria-label="5560">
+                5560
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -887,8 +887,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4196">
-                4196
+                role="cell" aria-label="5560">
+                5560
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -903,8 +903,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -935,8 +935,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4124">
-                4124
+                role="cell" aria-label="5470">
+                5470
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -967,8 +967,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4196">
-                4196
+                role="cell" aria-label="5560">
+                5560
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -983,8 +983,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -999,8 +999,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1015,8 +1015,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1031,8 +1031,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3572">
-                3572
+                role="cell" aria-label="4600">
+                4600
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1063,8 +1063,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1079,8 +1079,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1095,8 +1095,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1111,8 +1111,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="3592">
-                3592
+                role="cell" aria-label="4535">
+                4535
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1127,8 +1127,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1143,8 +1143,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1159,8 +1159,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1175,8 +1175,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1191,8 +1191,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1356">
-                1356
+                role="cell" aria-label="1785">
+                1785
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1223,8 +1223,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1428">
-                1428
+                role="cell" aria-label="1875">
+                1875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1255,8 +1255,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="2860">
-                2860
+                role="cell" aria-label="3755">
+                3755
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1287,8 +1287,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7860">
-                7860
+                role="cell" aria-label="10230">
+                10230
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/conjure_oxide/src/utils/testing.rs.html b/coverage/main/conjure_oxide/src/utils/testing.rs.html
index a28cc9ebe1..50c96db5b7 100644
--- a/coverage/main/conjure_oxide/src/utils/testing.rs.html
+++ b/coverage/main/conjure_oxide/src/utils/testing.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="60 / 110">54.55 %</abbr></p>
+                <abbr title="73 / 123">59.35 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="5 / 21">23.81 %</abbr></p>
+                <abbr title="6 / 24">25 %</abbr></p>
         </div>
     </div>
 
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, RwLock};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde_json::{Error as JsonError, Value as JsonValue};</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use conjure_core::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_core::error::Error;</pre>
+                <pre class="has-background-white py-0 px-2">use serde_json::{Error as JsonError, Value as JsonValue};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::Name::UserName;</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_core::error::Error;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -220,7 +220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -236,7 +236,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::utils::conjure::minion_solutions_to_json;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::Name::UserName;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -252,7 +252,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::utils::json::sort_json_object;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -268,7 +268,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::utils::misc::to_set;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::utils::conjure::minion_solutions_to_json;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -284,7 +284,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Model as ConjureModel;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::utils::json::sort_json_object;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -300,7 +300,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::utils::misc::to_set;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -309,6 +309,38 @@
                 role="cell">
                 <a href="#18">18</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use crate::Model as ConjureModel;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="19"
+                role="cell">
+                <a href="#19">19</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="20"
+                role="cell">
+                <a href="#20">20</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
                 role="cell" aria-label="0">
@@ -321,9 +353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="19"
+                id="21"
                 role="cell">
-                <a href="#19">19</a>
+                <a href="#21">21</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -337,9 +369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="20"
+                id="22"
                 role="cell">
-                <a href="#20">20</a>
+                <a href="#22">22</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -353,9 +385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="21"
+                id="23"
                 role="cell">
-                <a href="#21">21</a>
+                <a href="#23">23</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -369,9 +401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="22"
+                id="24"
                 role="cell">
-                <a href="#22">22</a>
+                <a href="#24">24</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -385,9 +417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="23"
+                id="25"
                 role="cell">
-                <a href="#23">23</a>
+                <a href="#25">25</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -401,9 +433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="24"
+                id="26"
                 role="cell">
-                <a href="#24">24</a>
+                <a href="#26">26</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -417,9 +449,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="25"
+                id="27"
                 role="cell">
-                <a href="#25">25</a>
+                <a href="#27">27</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -433,9 +465,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="26"
+                id="28"
                 role="cell">
-                <a href="#26">26</a>
+                <a href="#28">28</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -449,9 +481,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="27"
+                id="29"
                 role="cell">
-                <a href="#27">27</a>
+                <a href="#29">29</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -465,9 +497,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="28"
+                id="30"
                 role="cell">
-                <a href="#28">28</a>
+                <a href="#30">30</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -481,9 +513,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="29"
+                id="31"
                 role="cell">
-                <a href="#29">29</a>
+                <a href="#31">31</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -497,9 +529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="30"
+                id="32"
                 role="cell">
-                <a href="#30">30</a>
+                <a href="#32">32</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -513,9 +545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="31"
+                id="33"
                 role="cell">
-                <a href="#31">31</a>
+                <a href="#33">33</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -529,9 +561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="32"
+                id="34"
                 role="cell">
-                <a href="#32">32</a>
+                <a href="#34">34</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -545,9 +577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="33"
+                id="35"
                 role="cell">
-                <a href="#33">33</a>
+                <a href="#35">35</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -561,9 +593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="34"
+                id="36"
                 role="cell">
-                <a href="#34">34</a>
+                <a href="#36">36</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -577,9 +609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="35"
+                id="37"
                 role="cell">
-                <a href="#35">35</a>
+                <a href="#37">37</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -593,9 +625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="36"
+                id="38"
                 role="cell">
-                <a href="#36">36</a>
+                <a href="#38">38</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -609,9 +641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="37"
+                id="39"
                 role="cell">
-                <a href="#37">37</a>
+                <a href="#39">39</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -625,9 +657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="38"
+                id="40"
                 role="cell">
-                <a href="#38">38</a>
+                <a href="#40">40</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -641,14 +673,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="39"
+                id="41"
                 role="cell">
-                <a href="#39">39</a>
+                <a href="#41">41</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -657,9 +689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="40"
+                id="42"
                 role="cell">
-                <a href="#40">40</a>
+                <a href="#42">42</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -673,9 +705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="41"
+                id="43"
                 role="cell">
-                <a href="#41">41</a>
+                <a href="#43">43</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -689,9 +721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="42"
+                id="44"
                 role="cell">
-                <a href="#42">42</a>
+                <a href="#44">44</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -705,14 +737,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="43"
+                id="45"
                 role="cell">
-                <a href="#43">43</a>
+                <a href="#45">45</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -721,9 +753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="44"
+                id="46"
                 role="cell">
-                <a href="#44">44</a>
+                <a href="#46">46</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -737,9 +769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="45"
+                id="47"
                 role="cell">
-                <a href="#45">45</a>
+                <a href="#47">47</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -753,14 +785,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="46"
+                id="48"
                 role="cell">
-                <a href="#46">46</a>
+                <a href="#48">48</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -769,9 +801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="47"
+                id="49"
                 role="cell">
-                <a href="#47">47</a>
+                <a href="#49">49</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -785,14 +817,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="48"
+                id="50"
                 role="cell">
-                <a href="#48">48</a>
+                <a href="#50">50</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -801,14 +833,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="49"
+                id="51"
                 role="cell">
-                <a href="#49">49</a>
+                <a href="#51">51</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -817,9 +849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="50"
+                id="52"
                 role="cell">
-                <a href="#50">50</a>
+                <a href="#52">52</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -833,14 +865,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="51"
+                id="53"
                 role="cell">
-                <a href="#51">51</a>
+                <a href="#53">53</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -849,14 +881,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="52"
+                id="54"
                 role="cell">
-                <a href="#52">52</a>
+                <a href="#54">54</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -865,14 +897,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="53"
+                id="55"
                 role="cell">
-                <a href="#53">53</a>
+                <a href="#55">55</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -881,14 +913,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="54"
+                id="56"
                 role="cell">
-                <a href="#54">54</a>
+                <a href="#56">56</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -897,14 +929,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="55"
+                id="57"
                 role="cell">
-                <a href="#55">55</a>
+                <a href="#57">57</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -913,14 +945,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="56"
+                id="58"
                 role="cell">
-                <a href="#56">56</a>
+                <a href="#58">58</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -929,14 +961,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="57"
+                id="59"
                 role="cell">
-                <a href="#57">57</a>
+                <a href="#59">59</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -945,14 +977,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="58"
+                id="60"
                 role="cell">
-                <a href="#58">58</a>
+                <a href="#60">60</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -961,9 +993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="59"
+                id="61"
                 role="cell">
-                <a href="#59">59</a>
+                <a href="#61">61</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -977,14 +1009,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="60"
+                id="62"
                 role="cell">
-                <a href="#60">60</a>
+                <a href="#62">62</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -993,14 +1025,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="61"
+                id="63"
                 role="cell">
-                <a href="#61">61</a>
+                <a href="#63">63</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1009,14 +1041,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="62"
+                id="64"
                 role="cell">
-                <a href="#62">62</a>
+                <a href="#64">64</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1025,14 +1057,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="63"
+                id="65"
                 role="cell">
-                <a href="#63">63</a>
+                <a href="#65">65</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1041,9 +1073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="64"
+                id="66"
                 role="cell">
-                <a href="#64">64</a>
+                <a href="#66">66</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1057,14 +1089,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="65"
+                id="67"
                 role="cell">
-                <a href="#65">65</a>
+                <a href="#67">67</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1073,9 +1105,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="66"
+                id="68"
                 role="cell">
-                <a href="#66">66</a>
+                <a href="#68">68</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1089,9 +1121,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="67"
+                id="69"
                 role="cell">
-                <a href="#67">67</a>
+                <a href="#69">69</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1105,9 +1137,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="68"
+                id="70"
                 role="cell">
-                <a href="#68">68</a>
+                <a href="#70">70</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1121,9 +1153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="69"
+                id="71"
                 role="cell">
-                <a href="#69">69</a>
+                <a href="#71">71</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1137,14 +1169,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="70"
+                id="72"
                 role="cell">
-                <a href="#70">70</a>
+                <a href="#72">72</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1153,9 +1185,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="71"
+                id="73"
                 role="cell">
-                <a href="#71">71</a>
+                <a href="#73">73</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1169,14 +1201,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="72"
+                id="74"
                 role="cell">
-                <a href="#72">72</a>
+                <a href="#74">74</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1185,14 +1217,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="73"
+                id="75"
                 role="cell">
-                <a href="#73">73</a>
+                <a href="#75">75</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1201,9 +1233,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="74"
+                id="76"
                 role="cell">
-                <a href="#74">74</a>
+                <a href="#76">76</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1217,14 +1249,302 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="75"
+                id="77"
                 role="cell">
-                <a href="#75">75</a>
+                <a href="#77">77</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">pub fn save_stats_json(</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="78"
+                role="cell">
+                <a href="#78">78</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="79"
+                role="cell">
+                <a href="#79">79</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    path: &amp;str,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="80"
+                role="cell">
+                <a href="#80">80</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    test_name: &amp;str,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="81"
+                role="cell">
+                <a href="#81">81</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">) -&gt; Result&lt;(), std::io::Error&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="82"
+                role="cell">
+                <a href="#82">82</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    #[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="83"
+                role="cell">
+                <a href="#83">83</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let stats = context.read().unwrap().clone();</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="84"
+                role="cell">
+                <a href="#84">84</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let generated_json = sort_json_object(&amp;serde_json::to_value(stats)?, false);</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="85"
+                role="cell">
+                <a href="#85">85</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="86"
+                role="cell">
+                <a href="#86">86</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; serialise to string</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="87"
+                role="cell">
+                <a href="#87">87</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let generated_json_str = serde_json::to_string_pretty(&amp;generated_json)?;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="88"
+                role="cell">
+                <a href="#88">88</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="89"
+                role="cell">
+                <a href="#89">89</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    File::create(format!(&quot;{path}&#x2F;{test_name}-stats.json&quot;))?</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="90"
+                role="cell">
+                <a href="#90">90</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .write_all(generated_json_str.as_bytes())?;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="91"
+                role="cell">
+                <a href="#91">91</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="92"
+                role="cell">
+                <a href="#92">92</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    Ok(())</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="93"
+                role="cell">
+                <a href="#93">93</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">}</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="94"
+                role="cell">
+                <a href="#94">94</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="95"
+                role="cell">
+                <a href="#95">95</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1233,14 +1553,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="76"
+                id="96"
                 role="cell">
-                <a href="#76">76</a>
+                <a href="#96">96</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1249,14 +1569,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="77"
+                id="97"
                 role="cell">
-                <a href="#77">77</a>
+                <a href="#97">97</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1265,14 +1585,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="78"
+                id="98"
                 role="cell">
-                <a href="#78">78</a>
+                <a href="#98">98</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1281,14 +1601,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="79"
+                id="99"
                 role="cell">
-                <a href="#79">79</a>
+                <a href="#99">99</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1297,14 +1617,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="80"
+                id="100"
                 role="cell">
-                <a href="#80">80</a>
+                <a href="#100">100</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1313,14 +1633,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="81"
+                id="101"
                 role="cell">
-                <a href="#81">81</a>
+                <a href="#101">101</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1329,14 +1649,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="82"
+                id="102"
                 role="cell">
-                <a href="#82">82</a>
+                <a href="#102">102</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1345,14 +1665,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="83"
+                id="103"
                 role="cell">
-                <a href="#83">83</a>
+                <a href="#103">103</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1361,9 +1681,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="84"
+                id="104"
                 role="cell">
-                <a href="#84">84</a>
+                <a href="#104">104</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1377,14 +1697,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="85"
+                id="105"
                 role="cell">
-                <a href="#85">85</a>
+                <a href="#105">105</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1393,9 +1713,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="86"
+                id="106"
                 role="cell">
-                <a href="#86">86</a>
+                <a href="#106">106</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1409,14 +1729,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="87"
+                id="107"
                 role="cell">
-                <a href="#87">87</a>
+                <a href="#107">107</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1425,14 +1745,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="88"
+                id="108"
                 role="cell">
-                <a href="#88">88</a>
+                <a href="#108">108</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="72">
-                72
+                role="cell" aria-label="90">
+                90
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1441,9 +1761,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="89"
+                id="109"
                 role="cell">
-                <a href="#89">89</a>
+                <a href="#109">109</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1457,9 +1777,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="90"
+                id="110"
                 role="cell">
-                <a href="#90">90</a>
+                <a href="#110">110</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1473,9 +1793,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="91"
+                id="111"
                 role="cell">
-                <a href="#91">91</a>
+                <a href="#111">111</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1489,9 +1809,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="92"
+                id="112"
                 role="cell">
-                <a href="#92">92</a>
+                <a href="#112">112</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1505,9 +1825,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="93"
+                id="113"
                 role="cell">
-                <a href="#93">93</a>
+                <a href="#113">113</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1521,9 +1841,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="94"
+                id="114"
                 role="cell">
-                <a href="#94">94</a>
+                <a href="#114">114</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1537,9 +1857,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="95"
+                id="115"
                 role="cell">
-                <a href="#95">95</a>
+                <a href="#115">115</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1553,9 +1873,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="96"
+                id="116"
                 role="cell">
-                <a href="#96">96</a>
+                <a href="#116">116</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1569,9 +1889,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="97"
+                id="117"
                 role="cell">
-                <a href="#97">97</a>
+                <a href="#117">117</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1585,9 +1905,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="98"
+                id="118"
                 role="cell">
-                <a href="#98">98</a>
+                <a href="#118">118</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1601,9 +1921,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="99"
+                id="119"
                 role="cell">
-                <a href="#99">99</a>
+                <a href="#119">119</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1617,9 +1937,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="100"
+                id="120"
                 role="cell">
-                <a href="#100">100</a>
+                <a href="#120">120</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1633,9 +1953,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="101"
+                id="121"
                 role="cell">
-                <a href="#101">101</a>
+                <a href="#121">121</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1649,9 +1969,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="102"
+                id="122"
                 role="cell">
-                <a href="#102">102</a>
+                <a href="#122">122</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1665,9 +1985,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="103"
+                id="123"
                 role="cell">
-                <a href="#103">103</a>
+                <a href="#123">123</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1681,9 +2001,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="104"
+                id="124"
                 role="cell">
-                <a href="#104">104</a>
+                <a href="#124">124</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1697,9 +2017,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="105"
+                id="125"
                 role="cell">
-                <a href="#105">105</a>
+                <a href="#125">125</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1713,9 +2033,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="106"
+                id="126"
                 role="cell">
-                <a href="#106">106</a>
+                <a href="#126">126</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1729,9 +2049,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="107"
+                id="127"
                 role="cell">
-                <a href="#107">107</a>
+                <a href="#127">127</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1745,9 +2065,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="108"
+                id="128"
                 role="cell">
-                <a href="#108">108</a>
+                <a href="#128">128</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1761,9 +2081,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="109"
+                id="129"
                 role="cell">
-                <a href="#109">109</a>
+                <a href="#129">129</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1777,9 +2097,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="110"
+                id="130"
                 role="cell">
-                <a href="#110">110</a>
+                <a href="#130">130</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1793,9 +2113,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="111"
+                id="131"
                 role="cell">
-                <a href="#111">111</a>
+                <a href="#131">131</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1809,9 +2129,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="112"
+                id="132"
                 role="cell">
-                <a href="#112">112</a>
+                <a href="#132">132</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1825,9 +2145,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="113"
+                id="133"
                 role="cell">
-                <a href="#113">113</a>
+                <a href="#133">133</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1841,9 +2161,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="114"
+                id="134"
                 role="cell">
-                <a href="#114">114</a>
+                <a href="#134">134</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1857,9 +2177,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="115"
+                id="135"
                 role="cell">
-                <a href="#115">115</a>
+                <a href="#135">135</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1873,9 +2193,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="116"
+                id="136"
                 role="cell">
-                <a href="#116">116</a>
+                <a href="#136">136</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1889,9 +2209,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="117"
+                id="137"
                 role="cell">
-                <a href="#117">117</a>
+                <a href="#137">137</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1905,9 +2225,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="118"
+                id="138"
                 role="cell">
-                <a href="#118">118</a>
+                <a href="#138">138</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1921,9 +2241,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="119"
+                id="139"
                 role="cell">
-                <a href="#119">119</a>
+                <a href="#139">139</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1937,9 +2257,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="120"
+                id="140"
                 role="cell">
-                <a href="#120">120</a>
+                <a href="#140">140</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1953,9 +2273,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="121"
+                id="141"
                 role="cell">
-                <a href="#121">121</a>
+                <a href="#141">141</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1969,9 +2289,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="122"
+                id="142"
                 role="cell">
-                <a href="#122">122</a>
+                <a href="#142">142</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1985,9 +2305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="123"
+                id="143"
                 role="cell">
-                <a href="#123">123</a>
+                <a href="#143">143</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2001,9 +2321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="124"
+                id="144"
                 role="cell">
-                <a href="#124">124</a>
+                <a href="#144">144</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2017,9 +2337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="125"
+                id="145"
                 role="cell">
-                <a href="#125">125</a>
+                <a href="#145">145</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2033,9 +2353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="126"
+                id="146"
                 role="cell">
-                <a href="#126">126</a>
+                <a href="#146">146</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2049,9 +2369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="127"
+                id="147"
                 role="cell">
-                <a href="#127">127</a>
+                <a href="#147">147</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2065,14 +2385,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="128"
+                id="148"
                 role="cell">
-                <a href="#128">128</a>
+                <a href="#148">148</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2081,14 +2401,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="129"
+                id="149"
                 role="cell">
-                <a href="#129">129</a>
+                <a href="#149">149</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2097,14 +2417,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="130"
+                id="150"
                 role="cell">
-                <a href="#130">130</a>
+                <a href="#150">150</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2113,14 +2433,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="131"
+                id="151"
                 role="cell">
-                <a href="#131">131</a>
+                <a href="#151">151</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2129,14 +2449,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="132"
+                id="152"
                 role="cell">
-                <a href="#132">132</a>
+                <a href="#152">152</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2145,14 +2465,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="133"
+                id="153"
                 role="cell">
-                <a href="#133">133</a>
+                <a href="#153">153</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2161,14 +2481,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="134"
+                id="154"
                 role="cell">
-                <a href="#134">134</a>
+                <a href="#154">154</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2177,9 +2497,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="135"
+                id="155"
                 role="cell">
-                <a href="#135">135</a>
+                <a href="#155">155</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2193,14 +2513,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="136"
+                id="156"
                 role="cell">
-                <a href="#136">136</a>
+                <a href="#156">156</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2209,9 +2529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="137"
+                id="157"
                 role="cell">
-                <a href="#137">137</a>
+                <a href="#157">157</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2225,14 +2545,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="138"
+                id="158"
                 role="cell">
-                <a href="#138">138</a>
+                <a href="#158">158</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2241,14 +2561,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="139"
+                id="159"
                 role="cell">
-                <a href="#139">139</a>
+                <a href="#159">159</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2257,14 +2577,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="140"
+                id="160"
                 role="cell">
-                <a href="#140">140</a>
+                <a href="#160">160</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2273,14 +2593,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="141"
+                id="161"
                 role="cell">
-                <a href="#141">141</a>
+                <a href="#161">161</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2289,9 +2609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="142"
+                id="162"
                 role="cell">
-                <a href="#142">142</a>
+                <a href="#162">162</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2305,14 +2625,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="143"
+                id="163"
                 role="cell">
-                <a href="#143">143</a>
+                <a href="#163">163</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2321,9 +2641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="144"
+                id="164"
                 role="cell">
-                <a href="#144">144</a>
+                <a href="#164">164</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2337,9 +2657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="145"
+                id="165"
                 role="cell">
-                <a href="#145">145</a>
+                <a href="#165">165</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2353,9 +2673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="146"
+                id="166"
                 role="cell">
-                <a href="#146">146</a>
+                <a href="#166">166</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2369,9 +2689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="147"
+                id="167"
                 role="cell">
-                <a href="#147">147</a>
+                <a href="#167">167</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2385,14 +2705,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="148"
+                id="168"
                 role="cell">
-                <a href="#148">148</a>
+                <a href="#168">168</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2401,9 +2721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="149"
+                id="169"
                 role="cell">
-                <a href="#149">149</a>
+                <a href="#169">169</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2417,14 +2737,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="150"
+                id="170"
                 role="cell">
-                <a href="#150">150</a>
+                <a href="#170">170</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2433,14 +2753,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="151"
+                id="171"
                 role="cell">
-                <a href="#151">151</a>
+                <a href="#171">171</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2449,9 +2769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="152"
+                id="172"
                 role="cell">
-                <a href="#152">152</a>
+                <a href="#172">172</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2465,14 +2785,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="153"
+                id="173"
                 role="cell">
-                <a href="#153">153</a>
+                <a href="#173">173</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2481,14 +2801,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="154"
+                id="174"
                 role="cell">
-                <a href="#154">154</a>
+                <a href="#174">174</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2497,14 +2817,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="155"
+                id="175"
                 role="cell">
-                <a href="#155">155</a>
+                <a href="#175">175</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2513,14 +2833,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="156"
+                id="176"
                 role="cell">
-                <a href="#156">156</a>
+                <a href="#176">176</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2529,14 +2849,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="157"
+                id="177"
                 role="cell">
-                <a href="#157">157</a>
+                <a href="#177">177</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2545,14 +2865,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="158"
+                id="178"
                 role="cell">
-                <a href="#158">158</a>
+                <a href="#178">178</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2561,14 +2881,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="159"
+                id="179"
                 role="cell">
-                <a href="#159">159</a>
+                <a href="#179">179</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2577,9 +2897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="160"
+                id="180"
                 role="cell">
-                <a href="#160">160</a>
+                <a href="#180">180</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2593,14 +2913,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="161"
+                id="181"
                 role="cell">
-                <a href="#161">161</a>
+                <a href="#181">181</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2609,14 +2929,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="162"
+                id="182"
                 role="cell">
-                <a href="#162">162</a>
+                <a href="#182">182</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2625,9 +2945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="163"
+                id="183"
                 role="cell">
-                <a href="#163">163</a>
+                <a href="#183">183</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2641,14 +2961,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="164"
+                id="184"
                 role="cell">
-                <a href="#164">164</a>
+                <a href="#184">184</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2657,14 +2977,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="165"
+                id="185"
                 role="cell">
-                <a href="#165">165</a>
+                <a href="#185">185</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="36">
-                36
+                role="cell" aria-label="45">
+                45
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/conjure_oxide/tests/generated_tests.rs.html b/coverage/main/conjure_oxide/tests/generated_tests.rs.html
index 426fb52aa4..f2d4f0a7b8 100644
--- a/coverage/main/conjure_oxide/tests/generated_tests.rs.html
+++ b/coverage/main/conjure_oxide/tests/generated_tests.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="36 / 54">66.67 %</abbr></p>
+                <abbr title="40 / 58">68.97 %</abbr></p>
         </div>
     </div>
 
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::Arc;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_oxide::rule_engine::resolve_rule_sets;</pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::RwLock;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_oxide::rule_engine::rewrite_model;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_oxide::utils::conjure::{get_minion_solutions, parse_essence_file};</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_core::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_oxide::utils::testing::{</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::rule_engine::resolve_rule_sets;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    read_minion_solutions_json, read_model_json, save_minion_solutions_json, save_model_json,</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::rule_engine::rewrite_model;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">};</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::utils::conjure::{get_minion_solutions, parse_essence_file};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use conjure_oxide::SolverFamily;</pre>
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::utils::testing::save_stats_json;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -220,7 +220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::utils::testing::{</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -229,6 +229,70 @@
                 role="cell">
                 <a href="#13">13</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    read_minion_solutions_json, read_model_json, save_minion_solutions_json, save_model_json,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="14"
+                role="cell">
+                <a href="#14">14</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">};</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="15"
+                role="cell">
+                <a href="#15">15</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use conjure_oxide::SolverFamily;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="16"
+                role="cell">
+                <a href="#16">16</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="17"
+                role="cell">
+                <a href="#17">17</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
                 role="cell" aria-label="0">
@@ -241,9 +305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="14"
+                id="18"
                 role="cell">
-                <a href="#14">14</a>
+                <a href="#18">18</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -257,9 +321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="15"
+                id="19"
                 role="cell">
-                <a href="#15">15</a>
+                <a href="#19">19</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -273,9 +337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="16"
+                id="20"
                 role="cell">
-                <a href="#16">16</a>
+                <a href="#20">20</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -289,9 +353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="17"
+                id="21"
                 role="cell">
-                <a href="#17">17</a>
+                <a href="#21">21</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -305,9 +369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="18"
+                id="22"
                 role="cell">
-                <a href="#18">18</a>
+                <a href="#22">22</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -321,9 +385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="19"
+                id="23"
                 role="cell">
-                <a href="#19">19</a>
+                <a href="#23">23</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -337,9 +401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="20"
+                id="24"
                 role="cell">
-                <a href="#20">20</a>
+                <a href="#24">24</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -353,9 +417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="21"
+                id="25"
                 role="cell">
-                <a href="#21">21</a>
+                <a href="#25">25</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -369,9 +433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="22"
+                id="26"
                 role="cell">
-                <a href="#22">22</a>
+                <a href="#26">26</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -385,9 +449,25 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="23"
+                id="27"
                 role="cell">
-                <a href="#23">23</a>
+                <a href="#27">27</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="28"
+                role="cell">
+                <a href="#28">28</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -401,9 +481,25 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="24"
+                id="29"
                 role="cell">
-                <a href="#24">24</a>
+                <a href="#29">29</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="9">
+                9
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt; = Default::default();</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="30"
+                role="cell">
+                <a href="#30">30</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -417,9 +513,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="25"
+                id="31"
                 role="cell">
-                <a href="#25">25</a>
+                <a href="#31">31</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -433,9 +529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="26"
+                id="32"
                 role="cell">
-                <a href="#26">26</a>
+                <a href="#32">32</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -449,9 +545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="27"
+                id="33"
                 role="cell">
-                <a href="#27">27</a>
+                <a href="#33">33</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -465,9 +561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="28"
+                id="34"
                 role="cell">
-                <a href="#28">28</a>
+                <a href="#34">34</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -481,9 +577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="29"
+                id="35"
                 role="cell">
-                <a href="#29">29</a>
+                <a href="#35">35</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -497,9 +593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="30"
+                id="36"
                 role="cell">
-                <a href="#30">30</a>
+                <a href="#36">36</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -513,9 +609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="31"
+                id="37"
                 role="cell">
-                <a href="#31">31</a>
+                <a href="#37">37</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -529,9 +625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="32"
+                id="38"
                 role="cell">
-                <a href="#32">32</a>
+                <a href="#38">38</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -545,9 +641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="33"
+                id="39"
                 role="cell">
-                <a href="#33">33</a>
+                <a href="#39">39</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -561,9 +657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="34"
+                id="40"
                 role="cell">
-                <a href="#34">34</a>
+                <a href="#40">40</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -577,9 +673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="35"
+                id="41"
                 role="cell">
-                <a href="#35">35</a>
+                <a href="#41">41</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -588,14 +684,14 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let model = parse_essence_file(path, essence_base)?;</pre>
+                <pre class="has-background-success-light py-0 px-2">    let model = parse_essence_file(path, essence_base, context.clone())?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="36"
+                id="42"
                 role="cell">
-                <a href="#36">36</a>
+                <a href="#42">42</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -609,9 +705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="37"
+                id="43"
                 role="cell">
-                <a href="#37">37</a>
+                <a href="#43">43</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -625,9 +721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="38"
+                id="44"
                 role="cell">
-                <a href="#38">38</a>
+                <a href="#44">44</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -641,9 +737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="39"
+                id="45"
                 role="cell">
-                <a href="#39">39</a>
+                <a href="#45">45</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -657,9 +753,41 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="40"
+                id="46"
                 role="cell">
-                <a href="#40">40</a>
+                <a href="#46">46</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="9">
+                9
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    context.as_ref().write().unwrap().file_name = Some(format!(&quot;{path}&#x2F;{essence_base}.essence&quot;));</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="47"
+                role="cell">
+                <a href="#47">47</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="9">
+                9
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="48"
+                role="cell">
+                <a href="#48">48</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -673,9 +801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="41"
+                id="49"
                 role="cell">
-                <a href="#41">41</a>
+                <a href="#49">49</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -689,9 +817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="42"
+                id="50"
                 role="cell">
-                <a href="#42">42</a>
+                <a href="#50">50</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -705,9 +833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="43"
+                id="51"
                 role="cell">
-                <a href="#43">43</a>
+                <a href="#51">51</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -721,9 +849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="44"
+                id="52"
                 role="cell">
-                <a href="#44">44</a>
+                <a href="#52">52</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -737,9 +865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="45"
+                id="53"
                 role="cell">
-                <a href="#45">45</a>
+                <a href="#53">53</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -753,9 +881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="46"
+                id="54"
                 role="cell">
-                <a href="#46">46</a>
+                <a href="#54">54</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -769,9 +897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="47"
+                id="55"
                 role="cell">
-                <a href="#47">47</a>
+                <a href="#55">55</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -785,9 +913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="48"
+                id="56"
                 role="cell">
-                <a href="#48">48</a>
+                <a href="#56">56</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -801,9 +929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="49"
+                id="57"
                 role="cell">
-                <a href="#49">49</a>
+                <a href="#57">57</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -817,9 +945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="50"
+                id="58"
                 role="cell">
-                <a href="#50">50</a>
+                <a href="#58">58</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -833,9 +961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="51"
+                id="59"
                 role="cell">
-                <a href="#51">51</a>
+                <a href="#59">59</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -849,9 +977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="52"
+                id="60"
                 role="cell">
-                <a href="#52">52</a>
+                <a href="#60">60</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -865,9 +993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="53"
+                id="61"
                 role="cell">
-                <a href="#53">53</a>
+                <a href="#61">61</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -881,9 +1009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="54"
+                id="62"
                 role="cell">
-                <a href="#54">54</a>
+                <a href="#62">62</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -897,9 +1025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="55"
+                id="63"
                 role="cell">
-                <a href="#55">55</a>
+                <a href="#63">63</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -913,9 +1041,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="56"
+                id="64"
                 role="cell">
-                <a href="#56">56</a>
+                <a href="#64">64</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -929,9 +1057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="57"
+                id="65"
                 role="cell">
-                <a href="#57">57</a>
+                <a href="#65">65</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -945,9 +1073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="58"
+                id="66"
                 role="cell">
-                <a href="#58">58</a>
+                <a href="#66">66</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -961,9 +1089,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="59"
+                id="67"
                 role="cell">
-                <a href="#59">59</a>
+                <a href="#67">67</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -977,9 +1105,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="60"
+                id="68"
                 role="cell">
-                <a href="#60">60</a>
+                <a href="#68">68</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -993,9 +1121,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="61"
+                id="69"
                 role="cell">
-                <a href="#61">61</a>
+                <a href="#69">69</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1009,9 +1137,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="62"
+                id="70"
                 role="cell">
-                <a href="#62">62</a>
+                <a href="#70">70</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1025,9 +1153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="63"
+                id="71"
                 role="cell">
-                <a href="#63">63</a>
+                <a href="#71">71</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1041,9 +1169,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="64"
+                id="72"
                 role="cell">
-                <a href="#64">64</a>
+                <a href="#72">72</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1057,9 +1185,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="65"
+                id="73"
                 role="cell">
-                <a href="#65">65</a>
+                <a href="#73">73</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1073,9 +1201,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="66"
+                id="74"
                 role="cell">
-                <a href="#66">66</a>
+                <a href="#74">74</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1089,9 +1217,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="67"
+                id="75"
                 role="cell">
-                <a href="#67">67</a>
+                <a href="#75">75</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1105,9 +1233,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="68"
+                id="76"
                 role="cell">
-                <a href="#68">68</a>
+                <a href="#76">76</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1121,9 +1249,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="69"
+                id="77"
                 role="cell">
-                <a href="#69">69</a>
+                <a href="#77">77</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1137,9 +1265,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="70"
+                id="78"
                 role="cell">
-                <a href="#70">70</a>
+                <a href="#78">78</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1153,9 +1281,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="71"
+                id="79"
                 role="cell">
-                <a href="#71">71</a>
+                <a href="#79">79</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1169,9 +1297,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="72"
+                id="80"
                 role="cell">
-                <a href="#72">72</a>
+                <a href="#80">80</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1185,9 +1313,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="73"
+                id="81"
                 role="cell">
-                <a href="#73">73</a>
+                <a href="#81">81</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1201,9 +1329,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="74"
+                id="82"
                 role="cell">
-                <a href="#74">74</a>
+                <a href="#82">82</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1217,9 +1345,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="75"
+                id="83"
                 role="cell">
-                <a href="#75">75</a>
+                <a href="#83">83</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1233,9 +1361,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="76"
+                id="84"
                 role="cell">
-                <a href="#76">76</a>
+                <a href="#84">84</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1249,9 +1377,41 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="77"
+                id="85"
                 role="cell">
-                <a href="#77">77</a>
+                <a href="#85">85</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="9">
+                9
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    save_stats_json(context, path, essence_base)?;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="86"
+                role="cell">
+                <a href="#86">86</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="87"
+                role="cell">
+                <a href="#87">87</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1265,9 +1425,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="78"
+                id="88"
                 role="cell">
-                <a href="#78">78</a>
+                <a href="#88">88</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1281,9 +1441,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="79"
+                id="89"
                 role="cell">
-                <a href="#79">79</a>
+                <a href="#89">89</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1297,9 +1457,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="80"
+                id="90"
                 role="cell">
-                <a href="#80">80</a>
+                <a href="#90">90</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1313,9 +1473,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="81"
+                id="91"
                 role="cell">
-                <a href="#81">81</a>
+                <a href="#91">91</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1329,9 +1489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="82"
+                id="92"
                 role="cell">
-                <a href="#82">82</a>
+                <a href="#92">92</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1345,9 +1505,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="83"
+                id="93"
                 role="cell">
-                <a href="#83">83</a>
+                <a href="#93">93</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1361,9 +1521,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="84"
+                id="94"
                 role="cell">
-                <a href="#84">84</a>
+                <a href="#94">94</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1377,9 +1537,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="85"
+                id="95"
                 role="cell">
-                <a href="#85">85</a>
+                <a href="#95">95</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
diff --git a/coverage/main/conjure_oxide/tests/index.html b/coverage/main/conjure_oxide/tests/index.html
index 769e6ae508..84c7a58c29 100644
--- a/coverage/main/conjure_oxide/tests/index.html
+++ b/coverage/main/conjure_oxide/tests/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-success">
-                <abbr title="962 / 1011">95.15 %</abbr></p>
+                <abbr title="966 / 1015">95.17 %</abbr></p>
         </div>
     </div>
 
@@ -46,16 +46,16 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="66.66666666666666"
+                value="68.96551724137932"
                 max="100">
-                66.67%
+                68.97%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            66.67%
+            68.97%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            36 / 54
+            40 / 58
         </td>
         <!-- -->
         <td class="has-text-centered has-background-danger p-2">50%</td>
diff --git a/coverage/main/conjure_oxide/tests/model_tests.rs.html b/coverage/main/conjure_oxide/tests/model_tests.rs.html
index 6c58b7d0a0..13ab97f6f1 100644
--- a/coverage/main/conjure_oxide/tests/model_tests.rs.html
+++ b/coverage/main/conjure_oxide/tests/model_tests.rs.html
@@ -396,7 +396,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Context::default(),</pre>
+                <pre class="has-background-success-light py-0 px-2">        Default::default(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
diff --git a/coverage/main/conjure_oxide/tests/rewrite_tests.rs.html b/coverage/main/conjure_oxide/tests/rewrite_tests.rs.html
index 52ccb8b4e5..e896deea08 100644
--- a/coverage/main/conjure_oxide/tests/rewrite_tests.rs.html
+++ b/coverage/main/conjure_oxide/tests/rewrite_tests.rs.html
@@ -2460,7 +2460,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2524,7 +2524,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2908,7 +2908,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3436,7 +3436,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4124,7 +4124,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4188,7 +4188,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4540,7 +4540,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr1, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -5004,7 +5004,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr2, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr2, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -5356,7 +5356,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Context::default(),</pre>
+                <pre class="has-background-success-light py-0 px-2">        Default::default(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -5980,7 +5980,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -6444,7 +6444,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -7020,7 +7020,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -7484,7 +7484,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = unwrap_nested_or.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = unwrap_nested_or.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -7756,7 +7756,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = unwrap_nested_and.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = unwrap_nested_and.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -8076,7 +8076,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr_and, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr_and, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -8140,7 +8140,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr_or, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr_or, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -8588,7 +8588,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -8972,7 +8972,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -9324,7 +9324,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = remove_constants_from_or.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = remove_constants_from_or.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -9596,7 +9596,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = remove_constants_from_and.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = remove_constants_from_and.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -9932,7 +9932,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -10636,7 +10636,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -11276,7 +11276,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = distribute_not_over_and.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = distribute_not_over_and.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -11548,7 +11548,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let result = distribute_not_over_or.apply(&amp;expr, &amp;Model::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let result = distribute_not_over_or.apply(&amp;expr, &amp;Model::new_empty(Default::default()));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -11932,7 +11932,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        .apply(&amp;expr, &amp;Model::new_empty(Default::default()))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -12620,7 +12620,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;     let red = ensure_div.apply(&amp;expr, &amp;Model::default()).unwrap();</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;     let red = ensure_div.apply(&amp;expr, &amp;Model::new_empty(Default::default())).unwrap();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -14092,7 +14092,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &amp;Model::new(HashMap::new(), nested_expr, Context::default()),</pre>
+                <pre class="has-background-success-light py-0 px-2">        &amp;Model::new(HashMap::new(), nested_expr, Default::default()),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -14268,7 +14268,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut model = Model::new(HashMap::new(), rewritten_expr, Context::default());</pre>
+                <pre class="has-background-success-light py-0 px-2">    let mut model = Model::new(HashMap::new(), rewritten_expr, Default::default());</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -15516,7 +15516,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        match rule.apply(expression, &amp;Model::default()) {</pre>
+                <pre class="has-background-success-light py-0 px-2">        match rule.apply(expression, &amp;Model::new_empty(Default::default())) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
diff --git a/coverage/main/coverage.json b/coverage/main/coverage.json
index 73855c2736..cf1ad88946 100644
--- a/coverage/main/coverage.json
+++ b/coverage/main/coverage.json
@@ -1 +1 @@
-{"schemaVersion":1,"label":"coverage","message":"73.25%","color":"red"}
\ No newline at end of file
+{"schemaVersion":1,"label":"coverage","message":"73.22%","color":"red"}
\ No newline at end of file
diff --git a/coverage/main/crates/conjure_core/src/ast/constants.rs.html b/coverage/main/crates/conjure_core/src/ast/constants.rs.html
index bab92a075f..be8b32e7af 100644
--- a/coverage/main/crates/conjure_core/src/ast/constants.rs.html
+++ b/coverage/main/crates/conjure_core/src/ast/constants.rs.html
@@ -103,8 +103,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="552">
-                552
+                role="cell" aria-label="690">
+                690
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/ast/domains.rs.html b/coverage/main/crates/conjure_core/src/ast/domains.rs.html
index 25e7c051fd..b32f42e8a4 100644
--- a/coverage/main/crates/conjure_core/src/ast/domains.rs.html
+++ b/coverage/main/crates/conjure_core/src/ast/domains.rs.html
@@ -71,8 +71,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="372">
-                372
+                role="cell" aria-label="465">
+                465
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -167,8 +167,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="328">
-                328
+                role="cell" aria-label="410">
+                410
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/ast/symbol_table.rs.html b/coverage/main/crates/conjure_core/src/ast/symbol_table.rs.html
index c39bbb727f..ca07bff886 100644
--- a/coverage/main/crates/conjure_core/src/ast/symbol_table.rs.html
+++ b/coverage/main/crates/conjure_core/src/ast/symbol_table.rs.html
@@ -151,8 +151,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1384">
-                1384
+                role="cell" aria-label="1730">
+                1730
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/ast/variables.rs.html b/coverage/main/crates/conjure_core/src/ast/variables.rs.html
index 15cf6a870a..6e9d637dc6 100644
--- a/coverage/main/crates/conjure_core/src/ast/variables.rs.html
+++ b/coverage/main/crates/conjure_core/src/ast/variables.rs.html
@@ -135,8 +135,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="328">
-                328
+                role="cell" aria-label="410">
+                410
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/context.rs.html b/coverage/main/crates/conjure_core/src/context.rs.html
index 4d799ea6ce..e3d8b4b2fe 100644
--- a/coverage/main/crates/conjure_core/src/context.rs.html
+++ b/coverage/main/crates/conjure_core/src/context.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="25 / 61">40.98 %</abbr></p>
+                <abbr title="0 / 46">0 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="2 / 18">11.11 %</abbr></p>
+                <abbr title="0 / 18">0 %</abbr></p>
         </div>
     </div>
 
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::rule_engine::{Rule, RuleSet};</pre>
+                <pre class="has-background-white py-0 px-2">use derivative::Derivative;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::solver::SolverFamily;</pre>
+                <pre class="has-background-white py-0 px-2">use serde::Serialize;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use serde_with::skip_serializing_none;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[derive(Clone)]</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[non_exhaustive]</pre>
+                <pre class="has-background-white py-0 px-2">use crate::rule_engine::{Rule, RuleSet};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub struct Context&lt;&#x27;a&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">use crate::solver::SolverFamily;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub target_solver_family: Arc&lt;RwLock&lt;Option&lt;SolverFamily&gt;&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">use crate::stats::Stats;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub extra_rule_set_names: Arc&lt;RwLock&lt;Vec&lt;&amp;&#x27;a str&gt;&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -220,7 +220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub rules: Arc&lt;RwLock&lt;Vec&lt;&amp;&#x27;a Rule&lt;&#x27;a&gt;&gt;&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">#[skip_serializing_none]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -230,13 +230,13 @@
                 <a href="#13">13</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub rule_sets: Arc&lt;RwLock&lt;Vec&lt;&amp;&#x27;a RuleSet&lt;&#x27;a&gt;&gt;&gt;&gt;,</pre>
+                <pre class="has-background-danger-light py-0 px-2">#[derive(Clone, Serialize, Default, Derivative)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -252,7 +252,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">#[serde(rename_all = &quot;camelCase&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -268,7 +268,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">#[derivative(Eq, PartialEq)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -284,7 +284,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;&#x27;a&gt; Context&lt;&#x27;a&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">#[non_exhaustive]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -294,13 +294,13 @@
                 <a href="#17">17</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn new(</pre>
+                <pre class="has-background-white py-0 px-2">pub struct Context&lt;&#x27;a&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -310,13 +310,13 @@
                 <a href="#18">18</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        target_solver_family: SolverFamily,</pre>
+                <pre class="has-background-white py-0 px-2">    pub target_solver_family: Option&lt;SolverFamily&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -326,13 +326,13 @@
                 <a href="#19">19</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        extra_rule_set_names: Vec&lt;&amp;&#x27;a str&gt;,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -342,13 +342,13 @@
                 <a href="#20">20</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        rules: Vec&lt;&amp;&#x27;a Rule&lt;&#x27;a&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">    pub file_name: Option&lt;String&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -358,13 +358,13 @@
                 <a href="#21">21</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        rule_sets: Vec&lt;&amp;&#x27;a RuleSet&lt;&#x27;a&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -374,13 +374,13 @@
                 <a href="#22">22</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    ) -&gt; Self {</pre>
+                <pre class="has-background-white py-0 px-2">    pub extra_rule_set_names: Vec&lt;&amp;&#x27;a str&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -390,13 +390,13 @@
                 <a href="#23">23</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        Context {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -406,13 +406,13 @@
                 <a href="#24">24</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            target_solver_family: Arc::new(RwLock::new(Some(target_solver_family))),</pre>
+                <pre class="has-background-white py-0 px-2">    #[serde(skip)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -422,13 +422,13 @@
                 <a href="#25">25</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            extra_rule_set_names: Arc::new(RwLock::new(extra_rule_set_names)),</pre>
+                <pre class="has-background-white py-0 px-2">    pub rules: Vec&lt;&amp;&#x27;a Rule&lt;&#x27;a&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -438,13 +438,13 @@
                 <a href="#26">26</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            rules: Arc::new(RwLock::new(rules)),</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -454,13 +454,13 @@
                 <a href="#27">27</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            rule_sets: Arc::new(RwLock::new(rule_sets)),</pre>
+                <pre class="has-background-white py-0 px-2">    #[serde(skip)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -470,13 +470,13 @@
                 <a href="#28">28</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        }</pre>
+                <pre class="has-background-white py-0 px-2">    pub rule_sets: Vec&lt;&amp;&#x27;a RuleSet&lt;&#x27;a&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -486,13 +486,13 @@
                 <a href="#29">29</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -508,7 +508,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">    #[derivative(PartialEq = &quot;ignore&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -524,7 +524,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">    pub stats: Stats,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -540,7 +540,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;&#x27;a&gt; Debug for Context&lt;&#x27;a&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -550,13 +550,13 @@
                 <a href="#33">33</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    fn fmt(&amp;self, f: &amp;mut Formatter&lt;&#x27;_&gt;) -&gt; std::fmt::Result {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -566,13 +566,13 @@
                 <a href="#34">34</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let target_solver_family: Option&lt;SolverFamily&gt; = *self.target_solver_family.read().unwrap();</pre>
+                <pre class="has-background-white py-0 px-2">impl&lt;&#x27;a&gt; Context&lt;&#x27;a&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -588,7 +588,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let extra_rule_set_names: Vec&lt;&amp;str&gt; = self.extra_rule_set_names.read().unwrap().clone();</pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn new(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -604,7 +604,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let rules: Vec&lt;&amp;str&gt; = self.rules.read().unwrap().iter().map(|r| r.name).collect();</pre>
+                <pre class="has-background-danger-light py-0 px-2">        target_solver_family: SolverFamily,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -620,7 +620,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let rule_sets: Vec&lt;&amp;str&gt; = self</pre>
+                <pre class="has-background-danger-light py-0 px-2">        extra_rule_set_names: Vec&lt;&amp;&#x27;a str&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -636,7 +636,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .rule_sets</pre>
+                <pre class="has-background-danger-light py-0 px-2">        rules: Vec&lt;&amp;&#x27;a Rule&lt;&#x27;a&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -652,7 +652,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .read()</pre>
+                <pre class="has-background-danger-light py-0 px-2">        rule_sets: Vec&lt;&amp;&#x27;a RuleSet&lt;&#x27;a&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -668,7 +668,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .unwrap()</pre>
+                <pre class="has-background-danger-light py-0 px-2">    ) -&gt; Self {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -684,7 +684,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .iter()</pre>
+                <pre class="has-background-danger-light py-0 px-2">        Context {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -700,7 +700,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .map(|r| r.name)</pre>
+                <pre class="has-background-danger-light py-0 px-2">            target_solver_family: Some(target_solver_family),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -716,7 +716,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            .collect();</pre>
+                <pre class="has-background-danger-light py-0 px-2">            extra_rule_set_names,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -732,7 +732,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2"></pre>
+                <pre class="has-background-danger-light py-0 px-2">            rules,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -748,7 +748,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        write!(</pre>
+                <pre class="has-background-danger-light py-0 px-2">            rule_sets,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -764,7 +764,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            f,</pre>
+                <pre class="has-background-danger-light py-0 px-2">            stats: Default::default(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -780,7 +780,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            &quot;Context {{\n\</pre>
+                <pre class="has-background-danger-light py-0 px-2">            ..Default::default()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -796,7 +796,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            \ttarget_solver_family: {:?}\n\</pre>
+                <pre class="has-background-danger-light py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -812,7 +812,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            \textra_rule_set_names: {:?}\n\</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -822,13 +822,13 @@
                 <a href="#50">50</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            \trules: {:?}\n\</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -838,13 +838,13 @@
                 <a href="#51">51</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            \trule_sets: {:?}\n\</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -854,13 +854,13 @@
                 <a href="#52">52</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        }}&quot;,</pre>
+                <pre class="has-background-white py-0 px-2">impl Context&lt;&#x27;static&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -876,7 +876,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            target_solver_family, extra_rule_set_names, rules, rule_sets</pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn new_ptr(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -892,7 +892,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        )</pre>
+                <pre class="has-background-danger-light py-0 px-2">        target_solver_family: SolverFamily,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -908,7 +908,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-danger-light py-0 px-2">        extra_rule_set_names: Vec&lt;&amp;&#x27;static str&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -918,13 +918,13 @@
                 <a href="#56">56</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-danger-light py-0 px-2">        rules: Vec&lt;&amp;&#x27;static Rule&lt;&#x27;static&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -934,13 +934,13 @@
                 <a href="#57">57</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-danger-light py-0 px-2">        rule_sets: Vec&lt;&amp;&#x27;static RuleSet&lt;&#x27;static&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -950,13 +950,13 @@
                 <a href="#58">58</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;&#x27;a&gt; Default for Context&lt;&#x27;a&gt; {</pre>
+                <pre class="has-background-danger-light py-0 px-2">    ) -&gt; Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -966,13 +966,13 @@
                 <a href="#59">59</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    fn default() -&gt; Self {</pre>
+                <pre class="has-background-danger-light py-0 px-2">        Arc::new(RwLock::new(Context::new(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -982,13 +982,13 @@
                 <a href="#60">60</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Context {</pre>
+                <pre class="has-background-danger-light py-0 px-2">            target_solver_family,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -998,13 +998,13 @@
                 <a href="#61">61</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            target_solver_family: Arc::new(RwLock::new(None)),</pre>
+                <pre class="has-background-danger-light py-0 px-2">            extra_rule_set_names,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1014,13 +1014,13 @@
                 <a href="#62">62</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            extra_rule_set_names: Arc::new(RwLock::new(Vec::new())),</pre>
+                <pre class="has-background-danger-light py-0 px-2">            rules,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1030,13 +1030,13 @@
                 <a href="#63">63</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            rules: Arc::new(RwLock::new(Vec::new())),</pre>
+                <pre class="has-background-danger-light py-0 px-2">            rule_sets,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1046,13 +1046,13 @@
                 <a href="#64">64</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            rule_sets: Arc::new(RwLock::new(Vec::new())),</pre>
+                <pre class="has-background-danger-light py-0 px-2">        )))</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1062,13 +1062,13 @@
                 <a href="#65">65</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        }</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1078,13 +1078,13 @@
                 <a href="#66">66</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="7170">
-                7170
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1100,7 +1100,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1116,7 +1116,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">impl&lt;&#x27;a&gt; Debug for Context&lt;&#x27;a&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1126,13 +1126,13 @@
                 <a href="#69">69</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl PartialEq for Context&lt;&#x27;_&gt; {</pre>
+                <pre class="has-background-danger-light py-0 px-2">    fn fmt(&amp;self, f: &amp;mut Formatter&lt;&#x27;_&gt;) -&gt; std::fmt::Result {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1142,13 +1142,13 @@
                 <a href="#70">70</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[allow(clippy::unwrap_used)] &#x2F;&#x2F; A poisoned RWLock is probably panic worthy</pre>
+                <pre class="has-background-danger-light py-0 px-2">        let target_solver_family: Option&lt;SolverFamily&gt; = self.target_solver_family;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1158,13 +1158,13 @@
                 <a href="#71">71</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    fn eq(&amp;self, other: &amp;Self) -&gt; bool {</pre>
+                <pre class="has-background-danger-light py-0 px-2">        let extra_rule_set_names: Vec&lt;&amp;str&gt; = self.extra_rule_set_names.clone();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1174,13 +1174,13 @@
                 <a href="#72">72</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        self.target_solver_family</pre>
+                <pre class="has-background-danger-light py-0 px-2">        let rules: Vec&lt;&amp;str&gt; = self.rules.iter().map(|r| r.name).collect();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1190,13 +1190,13 @@
                 <a href="#73">73</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .read()</pre>
+                <pre class="has-background-danger-light py-0 px-2">        let rule_sets: Vec&lt;&amp;str&gt; = self.rule_sets.iter().map(|r| r.name).collect();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1206,13 +1206,13 @@
                 <a href="#74">74</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .unwrap()</pre>
+                <pre class="has-background-danger-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1222,13 +1222,13 @@
                 <a href="#75">75</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .eq(&amp;*other.target_solver_family.read().unwrap())</pre>
+                <pre class="has-background-danger-light py-0 px-2">        write!(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1238,13 +1238,13 @@
                 <a href="#76">76</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &amp;&amp; self</pre>
+                <pre class="has-background-danger-light py-0 px-2">            f,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1254,13 +1254,13 @@
                 <a href="#77">77</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .extra_rule_set_names</pre>
+                <pre class="has-background-danger-light py-0 px-2">            &quot;Context {{\n\</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1270,13 +1270,13 @@
                 <a href="#78">78</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .read()</pre>
+                <pre class="has-background-danger-light py-0 px-2">            \ttarget_solver_family: {:?}\n\</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1286,13 +1286,13 @@
                 <a href="#79">79</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .unwrap()</pre>
+                <pre class="has-background-danger-light py-0 px-2">            \textra_rule_set_names: {:?}\n\</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1302,13 +1302,13 @@
                 <a href="#80">80</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .eq(&amp;*other.extra_rule_set_names.read().unwrap())</pre>
+                <pre class="has-background-danger-light py-0 px-2">            \trules: {:?}\n\</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1318,13 +1318,13 @@
                 <a href="#81">81</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &amp;&amp; self.rules.read().unwrap().eq(&amp;*other.rules.read().unwrap())</pre>
+                <pre class="has-background-danger-light py-0 px-2">            \trule_sets: {:?}\n\</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1334,13 +1334,13 @@
                 <a href="#82">82</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &amp;&amp; self</pre>
+                <pre class="has-background-danger-light py-0 px-2">        }}&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1350,13 +1350,13 @@
                 <a href="#83">83</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .rule_sets</pre>
+                <pre class="has-background-danger-light py-0 px-2">            target_solver_family, extra_rule_set_names, rules, rule_sets</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1366,13 +1366,13 @@
                 <a href="#84">84</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .read()</pre>
+                <pre class="has-background-danger-light py-0 px-2">        )</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1382,13 +1382,13 @@
                 <a href="#85">85</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .unwrap()</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1397,38 +1397,6 @@
                 role="cell">
                 <a href="#86">86</a>
             </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
-            </div>
-            <div class="column has-background-success-light p-0"
-                 role="cell">
-                <pre class="has-background-success-light py-0 px-2">                .eq(&amp;*other.rule_sets.read().unwrap())</pre>
-            </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="87"
-                role="cell">
-                <a href="#87">87</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="270">
-                270
-            </div>
-            <div class="column has-background-success-light p-0"
-                 role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
-            </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="88"
-                role="cell">
-                <a href="#88">88</a>
-            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
                 role="cell" aria-label="no coverage">
@@ -1438,38 +1406,6 @@
                  role="cell">
                 <pre class="has-background-white py-0 px-2">}</pre>
             </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="89"
-                role="cell">
-                <a href="#89">89</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
-            </div>
-            <div class="column has-background-white p-0"
-                 role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
-            </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="90"
-                role="cell">
-                <a href="#90">90</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
-            </div>
-            <div class="column has-background-white p-0"
-                 role="cell">
-                <pre class="has-background-white py-0 px-2">impl Eq for Context&lt;&#x27;_&gt; {}</pre>
-            </div>
         </div></div>
 </div>
         <footer class="footer">
diff --git a/coverage/main/crates/conjure_core/src/index.html b/coverage/main/crates/conjure_core/src/index.html
index 1c5f1a81cc..786b1f087f 100644
--- a/coverage/main/crates/conjure_core/src/index.html
+++ b/coverage/main/crates/conjure_core/src/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="77 / 134">57.46 %</abbr></p>
+                <abbr title="52 / 119">43.7 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="19 / 159">11.95 %</abbr></p>
+                <abbr title="18 / 162">11.11 %</abbr></p>
         </div>
     </div>
 
@@ -46,20 +46,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="40.98360655737705"
+                value="0"
                 max="100">
-                40.98%
+                0%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            40.98%
+            0%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            25 / 61
+            0 / 46
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">11.11%</td>
-        <td class="has-text-centered has-background-danger p-2">2 / 18 </td>
+        <td class="has-text-centered has-background-danger p-2">0%</td>
+        <td class="has-text-centered has-background-danger p-2">0 / 18 </td>
         <!-- -->
         
     </tr>
@@ -130,8 +130,8 @@
             48 / 62
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">14.77%</td>
-        <td class="has-text-centered has-background-danger p-2">13 / 88 </td>
+        <td class="has-text-centered has-background-danger p-2">15.38%</td>
+        <td class="has-text-centered has-background-danger p-2">14 / 91 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/crates/conjure_core/src/metadata.rs.html b/coverage/main/crates/conjure_core/src/metadata.rs.html
index 662570326f..ea1f8b56c3 100644
--- a/coverage/main/crates/conjure_core/src/metadata.rs.html
+++ b/coverage/main/crates/conjure_core/src/metadata.rs.html
@@ -103,8 +103,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="2416">
-                2416
+                role="cell" aria-label="3020">
+                3020
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/model.rs.html b/coverage/main/crates/conjure_core/src/model.rs.html
index 1b1f13163a..30c33462ab 100644
--- a/coverage/main/crates/conjure_core/src/model.rs.html
+++ b/coverage/main/crates/conjure_core/src/model.rs.html
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="13 / 88">14.77 %</abbr></p>
+                <abbr title="14 / 91">15.38 %</abbr></p>
         </div>
     </div>
 
@@ -76,7 +76,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, RwLock};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde::{Deserialize, Serialize};</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde_with::serde_as;</pre>
+                <pre class="has-background-white py-0 px-2">use derivative::Derivative;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use serde::{Deserialize, Serialize};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::{DecisionVariable, Domain, Expression, Name, SymbolTable};</pre>
+                <pre class="has-background-white py-0 px-2">use serde_with::serde_as;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::context::Context;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::metadata::Metadata;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::{DecisionVariable, Domain, Expression, Name, SymbolTable};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[serde_as]</pre>
+                <pre class="has-background-white py-0 px-2">use crate::metadata::Metadata;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -214,13 +214,13 @@
                 <a href="#12">12</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="360">
-                360
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -236,7 +236,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub struct Model {</pre>
+                <pre class="has-background-white py-0 px-2">#[serde_as]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -246,13 +246,13 @@
                 <a href="#14">14</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="630">
+                630
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[serde_as(as = &quot;Vec&lt;(_, _)&gt;&quot;)]</pre>
+                <pre class="has-background-success-light py-0 px-2">#[derive(Derivative, Clone, Debug, Serialize, Deserialize)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -268,7 +268,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub variables: SymbolTable,</pre>
+                <pre class="has-background-white py-0 px-2">#[derivative(PartialEq, Eq)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -284,7 +284,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub constraints: Expression,</pre>
+                <pre class="has-background-white py-0 px-2">pub struct Model {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -300,7 +300,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    #[serde(skip)]</pre>
+                <pre class="has-background-white py-0 px-2">    #[serde_as(as = &quot;Vec&lt;(_, _)&gt;&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -316,7 +316,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    pub context: Context&lt;&#x27;static&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">    pub variables: SymbolTable,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -332,7 +332,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    next_var: RefCell&lt;i32&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">    pub constraints: Expression,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -348,7 +348,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">    #[serde(skip)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -364,7 +364,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">    #[derivative(PartialEq = &quot;ignore&quot;)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -380,7 +380,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl Model {</pre>
+                <pre class="has-background-white py-0 px-2">    pub context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -390,13 +390,13 @@
                 <a href="#23">23</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6900">
-                6900
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn new(</pre>
+                <pre class="has-background-white py-0 px-2">    next_var: RefCell&lt;i32&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -406,13 +406,13 @@
                 <a href="#24">24</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6900">
-                6900
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        variables: SymbolTable,</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -422,13 +422,13 @@
                 <a href="#25">25</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6900">
-                6900
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        constraints: Expression,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -438,13 +438,13 @@
                 <a href="#26">26</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6900">
-                6900
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        context: Context&lt;&#x27;static&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">impl Model {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -460,7 +460,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    ) -&gt; Model {</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn new(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -476,7 +476,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Model {</pre>
+                <pre class="has-background-success-light py-0 px-2">        variables: SymbolTable,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -492,7 +492,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            variables,</pre>
+                <pre class="has-background-success-light py-0 px-2">        constraints: Expression,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -508,7 +508,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            constraints,</pre>
+                <pre class="has-background-success-light py-0 px-2">        context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -524,7 +524,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            context,</pre>
+                <pre class="has-background-success-light py-0 px-2">    ) -&gt; Model {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -540,7 +540,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            next_var: RefCell::new(0),</pre>
+                <pre class="has-background-success-light py-0 px-2">        Model {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -556,7 +556,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        }</pre>
+                <pre class="has-background-success-light py-0 px-2">            variables,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -572,7 +572,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">            constraints,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -582,13 +582,13 @@
                 <a href="#35">35</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="6900">
+                6900
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Function to update a DecisionVariable based on its Name</pre>
+                <pre class="has-background-success-light py-0 px-2">            context,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -599,12 +599,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                role="cell" aria-label="6900">
+                6900
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn update_domain(&amp;mut self, name: &amp;Name, new_domain: Domain) {</pre>
+                <pre class="has-background-success-light py-0 px-2">            next_var: RefCell::new(0),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -615,12 +615,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                role="cell" aria-label="6900">
+                6900
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        if let Some(decision_var) = self.variables.get_mut(name) {</pre>
+                <pre class="has-background-success-light py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -631,12 +631,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                role="cell" aria-label="6900">
+                6900
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            decision_var.domain = new_domain;</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -646,13 +646,13 @@
                 <a href="#39">39</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        }</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -663,12 +663,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                role="cell" aria-label="6840">
+                6840
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn new_empty(context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;) -&gt; Model {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -678,13 +678,13 @@
                 <a href="#41">41</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="6840">
+                6840
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        Model::new(Default::default(), Expression::Nothing, context)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -694,13 +694,13 @@
                 <a href="#42">42</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="6840">
+                6840
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn get_domain(&amp;self, name: &amp;Name) -&gt; Option&lt;&amp;Domain&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -710,13 +710,13 @@
                 <a href="#43">43</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.variables.get(name).map(|v| &amp;v.domain)</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Function to update a DecisionVariable based on its Name</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -726,13 +726,13 @@
                 <a href="#44">44</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="15">
+                15
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn update_domain(&amp;mut self, name: &amp;Name, new_domain: Domain) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -742,13 +742,13 @@
                 <a href="#45">45</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="15">
+                15
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        if let Some(decision_var) = self.variables.get_mut(name) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -758,13 +758,13 @@
                 <a href="#46">46</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="15">
+                15
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Function to add a new DecisionVariable to the Model</pre>
+                <pre class="has-background-success-light py-0 px-2">            decision_var.domain = new_domain;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -775,12 +775,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="375">
-                375
+                role="cell" aria-label="15">
+                15
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn add_variable(&amp;mut self, name: Name, decision_var: DecisionVariable) {</pre>
+                <pre class="has-background-success-light py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -791,12 +791,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="375">
-                375
+                role="cell" aria-label="15">
+                15
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        self.variables.insert(name, decision_var);</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -806,13 +806,13 @@
                 <a href="#49">49</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="375">
-                375
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -822,13 +822,13 @@
                 <a href="#50">50</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn get_domain(&amp;self, name: &amp;Name) -&gt; Option&lt;&amp;Domain&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -838,13 +838,13 @@
                 <a href="#51">51</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="360">
-                360
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn get_constraints_vec(&amp;self) -&gt; Vec&lt;Expression&gt; {</pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.variables.get(name).map(|v| &amp;v.domain)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -854,13 +854,13 @@
                 <a href="#52">52</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="360">
-                360
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        match &amp;self.constraints {</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -870,13 +870,13 @@
                 <a href="#53">53</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="120">
-                120
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Expression::And(_, constraints) =&gt; constraints.clone(),</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -886,13 +886,13 @@
                 <a href="#54">54</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Expression::Nothing =&gt; vec![],</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Function to add a new DecisionVariable to the Model</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -903,12 +903,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="60">
-                60
+                role="cell" aria-label="375">
+                375
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            _ =&gt; vec![self.constraints.clone()],</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn add_variable(&amp;mut self, name: Name, decision_var: DecisionVariable) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -918,13 +918,13 @@
                 <a href="#56">56</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="375">
+                375
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        }</pre>
+                <pre class="has-background-success-light py-0 px-2">        self.variables.insert(name, decision_var);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -935,8 +935,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="360">
-                360
+                role="cell" aria-label="375">
+                375
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -967,12 +967,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                role="cell" aria-label="360">
+                360
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn set_constraints(&amp;mut self, constraints: Vec&lt;Expression&gt;) {</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn get_constraints_vec(&amp;self) -&gt; Vec&lt;Expression&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -983,12 +983,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                role="cell" aria-label="360">
+                360
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        if constraints.is_empty() {</pre>
+                <pre class="has-background-success-light py-0 px-2">        match &amp;self.constraints {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -998,13 +998,13 @@
                 <a href="#61">61</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="120">
+                120
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            self.constraints = Expression::Nothing;</pre>
+                <pre class="has-background-success-light py-0 px-2">            Expression::And(_, constraints) =&gt; constraints.clone(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1020,7 +1020,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        } else if constraints.len() == 1 {</pre>
+                <pre class="has-background-success-light py-0 px-2">            Expression::Nothing =&gt; vec![],</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1031,12 +1031,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="150">
-                150
+                role="cell" aria-label="60">
+                60
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            self.constraints = constraints[0].clone();</pre>
+                <pre class="has-background-success-light py-0 px-2">            _ =&gt; vec![self.constraints.clone()],</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1046,13 +1046,13 @@
                 <a href="#64">64</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="150">
-                150
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        } else {</pre>
+                <pre class="has-background-white py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1063,12 +1063,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="30">
-                30
+                role="cell" aria-label="360">
+                360
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            self.constraints = Expression::And(Metadata::new(), constraints);</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1078,13 +1078,13 @@
                 <a href="#66">66</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="30">
-                30
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        }</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1100,7 +1100,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn set_constraints(&amp;mut self, constraints: Vec&lt;Expression&gt;) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1110,13 +1110,13 @@
                 <a href="#68">68</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        if constraints.is_empty() {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1132,7 +1132,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn set_context(&amp;mut self, context: Context&lt;&#x27;static&gt;) {</pre>
+                <pre class="has-background-danger-light py-0 px-2">            self.constraints = Expression::Nothing;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1142,13 +1142,13 @@
                 <a href="#70">70</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.context = context;</pre>
+                <pre class="has-background-success-light py-0 px-2">        } else if constraints.len() == 1 {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1158,13 +1158,13 @@
                 <a href="#71">71</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="150">
+                150
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">            self.constraints = constraints[0].clone();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1174,13 +1174,13 @@
                 <a href="#72">72</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="150">
+                150
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        } else {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1190,13 +1190,13 @@
                 <a href="#73">73</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="30">
+                30
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn add_constraint(&amp;mut self, expression: Expression) {</pre>
+                <pre class="has-background-success-light py-0 px-2">            self.constraints = Expression::And(Metadata::new(), constraints);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1206,13 +1206,13 @@
                 <a href="#74">74</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="30">
+                30
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        &#x2F;&#x2F; ToDo (gs248) - there is no checking whatsoever</pre>
+                <pre class="has-background-success-light py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1222,13 +1222,13 @@
                 <a href="#75">75</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        &#x2F;&#x2F; We need to properly validate the expression but this is just for testing</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1238,13 +1238,13 @@
                 <a href="#76">76</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let mut constraints = self.get_constraints_vec();</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1260,7 +1260,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        constraints.push(expression);</pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn set_context(&amp;mut self, context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1276,7 +1276,7 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.set_constraints(constraints);</pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.context = context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1318,13 +1318,13 @@
                 <a href="#81">81</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn add_constraints(&amp;mut self, expressions: Vec&lt;Expression&gt;) {</pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn add_constraint(&amp;mut self, expression: Expression) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1334,13 +1334,13 @@
                 <a href="#82">82</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let mut constraints = self.get_constraints_vec();</pre>
+                <pre class="has-background-danger-light py-0 px-2">        &#x2F;&#x2F; ToDo (gs248) - there is no checking whatsoever</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1350,13 +1350,13 @@
                 <a href="#83">83</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        constraints.extend(expressions);</pre>
+                <pre class="has-background-danger-light py-0 px-2">        &#x2F;&#x2F; We need to properly validate the expression but this is just for testing</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1366,13 +1366,13 @@
                 <a href="#84">84</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        self.set_constraints(constraints);</pre>
+                <pre class="has-background-danger-light py-0 px-2">        let mut constraints = self.get_constraints_vec();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1382,13 +1382,13 @@
                 <a href="#85">85</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-danger-light py-0 px-2">        constraints.push(expression);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1398,13 +1398,13 @@
                 <a href="#86">86</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.set_constraints(constraints);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1414,13 +1414,13 @@
                 <a href="#87">87</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Returns an arbitrary variable name that is not in the model.</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1430,13 +1430,13 @@
                 <a href="#88">88</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="75">
-                75
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn gensym(&amp;self) -&gt; Name {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1447,12 +1447,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="75">
-                75
+                role="cell" aria-label="180">
+                180
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let num = *self.next_var.borrow();</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn add_constraints(&amp;mut self, expressions: Vec&lt;Expression&gt;) {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1463,12 +1463,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="75">
-                75
+                role="cell" aria-label="180">
+                180
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        *(self.next_var.borrow_mut()) += 1;</pre>
+                <pre class="has-background-success-light py-0 px-2">        let mut constraints = self.get_constraints_vec();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1479,12 +1479,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="75">
-                75
+                role="cell" aria-label="180">
+                180
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Name::MachineName(num) &#x2F;&#x2F; incremented when inserted</pre>
+                <pre class="has-background-success-light py-0 px-2">        constraints.extend(expressions);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1495,12 +1495,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="75">
-                75
+                role="cell" aria-label="180">
+                180
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">        self.set_constraints(constraints);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1510,13 +1510,13 @@
                 <a href="#93">93</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1548,7 +1548,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl Default for Model {</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Returns an arbitrary variable name that is not in the model.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1559,12 +1559,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6840">
-                6840
+                role="cell" aria-label="75">
+                75
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    fn default() -&gt; Self {</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn gensym(&amp;self) -&gt; Name {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1575,12 +1575,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6840">
-                6840
+                role="cell" aria-label="75">
+                75
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Self::new(SymbolTable::new(), Expression::Nothing, Context::default())</pre>
+                <pre class="has-background-success-light py-0 px-2">        let num = *self.next_var.borrow();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1591,12 +1591,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="6840">
-                6840
+                role="cell" aria-label="75">
+                75
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">        *(self.next_var.borrow_mut()) += 1;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1605,6 +1605,38 @@
                 role="cell">
                 <a href="#99">99</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="75">
+                75
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        Name::MachineName(num) &#x2F;&#x2F; incremented when inserted</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="100"
+                role="cell">
+                <a href="#100">100</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="75">
+                75
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="101"
+                role="cell">
+                <a href="#101">101</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
                 role="cell" aria-label="no coverage">
diff --git a/coverage/main/crates/conjure_core/src/parse/example_models.rs.html b/coverage/main/crates/conjure_core/src/parse/example_models.rs.html
index c40889c3c4..8f5f122201 100644
--- a/coverage/main/crates/conjure_core/src/parse/example_models.rs.html
+++ b/coverage/main/crates/conjure_core/src/parse/example_models.rs.html
@@ -76,7 +76,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::path::PathBuf;</pre>
+                <pre class="has-background-white py-0 px-2">use std::default;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::path::PathBuf;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use project_root::get_project_root;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use walkdir::WalkDir;</pre>
+                <pre class="has-background-white py-0 px-2">use project_root::get_project_root;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use walkdir::WalkDir;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::parse::model_from_json;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::parse::model_from_json;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -204,7 +204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Searches recursively in `..&#x2F;tests&#x2F;integration` folder for an `.essence` file matching the given</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -220,7 +220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; filename, then uses conjure to process it into astjson, and returns the parsed model.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Searches recursively in `..&#x2F;tests&#x2F;integration` folder for an `.essence` file matching the given</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -236,7 +236,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; filename, then uses conjure to process it into astjson, and returns the parsed model.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -252,7 +252,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Arguments</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -268,7 +268,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Arguments</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -284,7 +284,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; * `filename` - A string slice that holds filename without extension</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -300,7 +300,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; * `filename` - A string slice that holds filename without extension</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -316,7 +316,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Returns</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -332,7 +332,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Returns</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -348,7 +348,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Function returns a `Result&lt;Value, anyhow::Error&gt;`, where `Value` is the parsed model.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -357,6 +357,22 @@
                 role="cell">
                 <a href="#21">21</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Function returns a `Result&lt;Value, anyhow::Error&gt;`, where `Value` is the parsed model.</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="22"
+                role="cell">
+                <a href="#22">22</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
                 role="cell" aria-label="45">
@@ -369,9 +385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="22"
+                id="23"
                 role="cell">
-                <a href="#22">22</a>
+                <a href="#23">23</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -385,9 +401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="23"
+                id="24"
                 role="cell">
-                <a href="#23">23</a>
+                <a href="#24">24</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -401,9 +417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="24"
+                id="25"
                 role="cell">
-                <a href="#24">24</a>
+                <a href="#25">25</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -417,9 +433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="25"
+                id="26"
                 role="cell">
-                <a href="#25">25</a>
+                <a href="#26">26</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -433,9 +449,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="26"
+                id="27"
                 role="cell">
-                <a href="#26">26</a>
+                <a href="#27">27</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -449,14 +465,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="27"
+                id="28"
                 role="cell">
-                <a href="#27">27</a>
+                <a href="#28">28</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="244185">
-                244185
+                role="cell" aria-label="245640">
+                245640
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -465,14 +481,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="28"
+                id="29"
                 role="cell">
-                <a href="#28">28</a>
+                <a href="#29">29</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="244185">
-                244185
+                role="cell" aria-label="245640">
+                245640
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -481,14 +497,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="29"
+                id="30"
                 role="cell">
-                <a href="#29">29</a>
+                <a href="#30">30</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="244185">
-                244185
+                role="cell" aria-label="245640">
+                245640
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -497,14 +513,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="30"
+                id="31"
                 role="cell">
-                <a href="#30">30</a>
+                <a href="#31">31</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="206565">
-                206565
+                role="cell" aria-label="207915">
+                207915
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -513,9 +529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="31"
+                id="32"
                 role="cell">
-                <a href="#31">31</a>
+                <a href="#32">32</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -529,9 +545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="32"
+                id="33"
                 role="cell">
-                <a href="#32">32</a>
+                <a href="#33">33</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -545,9 +561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="33"
+                id="34"
                 role="cell">
-                <a href="#33">33</a>
+                <a href="#34">34</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -561,9 +577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="34"
+                id="35"
                 role="cell">
-                <a href="#34">34</a>
+                <a href="#35">35</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -577,14 +593,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="35"
+                id="36"
                 role="cell">
-                <a href="#35">35</a>
+                <a href="#36">36</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="244155">
-                244155
+                role="cell" aria-label="245610">
+                245610
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -593,9 +609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="36"
+                id="37"
                 role="cell">
-                <a href="#36">36</a>
+                <a href="#37">37</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -609,9 +625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="37"
+                id="38"
                 role="cell">
-                <a href="#37">37</a>
+                <a href="#38">38</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -625,9 +641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="38"
+                id="39"
                 role="cell">
-                <a href="#38">38</a>
+                <a href="#39">39</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -641,9 +657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="39"
+                id="40"
                 role="cell">
-                <a href="#39">39</a>
+                <a href="#40">40</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -657,9 +673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="40"
+                id="41"
                 role="cell">
-                <a href="#40">40</a>
+                <a href="#41">41</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -673,9 +689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="41"
+                id="42"
                 role="cell">
-                <a href="#41">41</a>
+                <a href="#42">42</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -689,9 +705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="42"
+                id="43"
                 role="cell">
-                <a href="#42">42</a>
+                <a href="#43">43</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -705,9 +721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="43"
+                id="44"
                 role="cell">
-                <a href="#43">43</a>
+                <a href="#44">44</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -721,9 +737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="44"
+                id="45"
                 role="cell">
-                <a href="#44">44</a>
+                <a href="#45">45</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -737,9 +753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="45"
+                id="46"
                 role="cell">
-                <a href="#45">45</a>
+                <a href="#46">46</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -753,9 +769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="46"
+                id="47"
                 role="cell">
-                <a href="#46">46</a>
+                <a href="#47">47</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -769,9 +785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="47"
+                id="48"
                 role="cell">
-                <a href="#47">47</a>
+                <a href="#48">48</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -785,9 +801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="48"
+                id="49"
                 role="cell">
-                <a href="#48">48</a>
+                <a href="#49">49</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -801,9 +817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="49"
+                id="50"
                 role="cell">
-                <a href="#49">49</a>
+                <a href="#50">50</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -817,9 +833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="50"
+                id="51"
                 role="cell">
-                <a href="#50">50</a>
+                <a href="#51">51</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -833,9 +849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="51"
+                id="52"
                 role="cell">
-                <a href="#51">51</a>
+                <a href="#52">52</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -849,9 +865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="52"
+                id="53"
                 role="cell">
-                <a href="#52">52</a>
+                <a href="#53">53</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -865,9 +881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="53"
+                id="54"
                 role="cell">
-                <a href="#53">53</a>
+                <a href="#54">54</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -881,9 +897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="54"
+                id="55"
                 role="cell">
-                <a href="#54">54</a>
+                <a href="#55">55</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -897,9 +913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="55"
+                id="56"
                 role="cell">
-                <a href="#55">55</a>
+                <a href="#56">56</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -913,9 +929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="56"
+                id="57"
                 role="cell">
-                <a href="#56">56</a>
+                <a href="#57">57</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -929,9 +945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="57"
+                id="58"
                 role="cell">
-                <a href="#57">57</a>
+                <a href="#58">58</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -945,9 +961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="58"
+                id="59"
                 role="cell">
-                <a href="#58">58</a>
+                <a href="#59">59</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -961,9 +977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="59"
+                id="60"
                 role="cell">
-                <a href="#59">59</a>
+                <a href="#60">60</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -977,9 +993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="60"
+                id="61"
                 role="cell">
-                <a href="#60">60</a>
+                <a href="#61">61</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -993,9 +1009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="61"
+                id="62"
                 role="cell">
-                <a href="#61">61</a>
+                <a href="#62">62</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1009,9 +1025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="62"
+                id="63"
                 role="cell">
-                <a href="#62">62</a>
+                <a href="#63">63</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1020,14 +1036,14 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let generated_mdl = model_from_json(&amp;astjson)?;</pre>
+                <pre class="has-background-success-light py-0 px-2">    let generated_mdl = model_from_json(&amp;astjson, Default::default())?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="63"
+                id="64"
                 role="cell">
-                <a href="#63">63</a>
+                <a href="#64">64</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1041,9 +1057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="64"
+                id="65"
                 role="cell">
-                <a href="#64">64</a>
+                <a href="#65">65</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1057,9 +1073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="65"
+                id="66"
                 role="cell">
-                <a href="#65">65</a>
+                <a href="#66">66</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1070,22 +1086,6 @@
                  role="cell">
                 <pre class="has-background-success-light py-0 px-2">}</pre>
             </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="66"
-                role="cell">
-                <a href="#66">66</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
-            </div>
-            <div class="column has-background-white p-0"
-                 role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
-            </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
@@ -1100,7 +1100,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Searches for an `.essence` file at the given filepath,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1116,7 +1116,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; then uses conjure to process it into astjson, and returns the parsed model.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Searches for an `.essence` file at the given filepath,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1132,7 +1132,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; then uses conjure to process it into astjson, and returns the parsed model.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1148,7 +1148,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Arguments</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1164,7 +1164,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Arguments</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1180,7 +1180,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; * `filepath` - A string slice that holds the full file path</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1196,7 +1196,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; * `filepath` - A string slice that holds the full file path</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1212,7 +1212,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Returns</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1228,7 +1228,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Returns</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1244,7 +1244,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Function returns a `Result&lt;Value, anyhow::Error&gt;`, where `Value` is the parsed model</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1254,13 +1254,13 @@
                 <a href="#77">77</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="30">
-                30
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">pub fn get_example_model_by_path(filepath: &amp;str) -&gt; Result&lt;Model, anyhow::Error&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Function returns a `Result&lt;Value, anyhow::Error&gt;`, where `Value` is the parsed model</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1276,7 +1276,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let essence_path = PathBuf::from(filepath);</pre>
+                <pre class="has-background-success-light py-0 px-2">pub fn get_example_model_by_path(filepath: &amp;str) -&gt; Result&lt;Model, anyhow::Error&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1292,7 +1292,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    let essence_path = PathBuf::from(filepath);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1308,7 +1308,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; return error if file not found</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1324,7 +1324,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    if essence_path.as_os_str().is_empty() {</pre>
+                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; return error if file not found</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1335,12 +1335,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                role="cell" aria-label="30">
+                30
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        return Err(anyhow::Error::new(std::io::Error::new(</pre>
+                <pre class="has-background-success-light py-0 px-2">    if essence_path.as_os_str().is_empty() {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1356,7 +1356,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            std::io::ErrorKind::NotFound,</pre>
+                <pre class="has-background-success-light py-0 px-2">        return Err(anyhow::Error::new(std::io::Error::new(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1372,7 +1372,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;ERROR: File not found in any subdirectory&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">            std::io::ErrorKind::NotFound,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1388,7 +1388,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        )));</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;ERROR: File not found in any subdirectory&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1404,7 +1404,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">        )));</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1420,7 +1420,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1436,7 +1436,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; println!(&quot;PATH TO FILE: {}&quot;, essence_path.display());</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1452,7 +1452,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; println!(&quot;PATH TO FILE: {}&quot;, essence_path.display());</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1468,7 +1468,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; Command execution using &#x27;conjure&#x27; CLI tool with provided path</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1484,7 +1484,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut cmd = std::process::Command::new(&quot;conjure&quot;);</pre>
+                <pre class="has-background-success-light py-0 px-2">    &#x2F;&#x2F; Command execution using &#x27;conjure&#x27; CLI tool with provided path</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1500,7 +1500,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let output = cmd</pre>
+                <pre class="has-background-success-light py-0 px-2">    let mut cmd = std::process::Command::new(&quot;conjure&quot;);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1516,7 +1516,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;pretty&quot;)</pre>
+                <pre class="has-background-success-light py-0 px-2">    let output = cmd</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1532,7 +1532,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;--output-format=astjson&quot;)</pre>
+                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;pretty&quot;)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1548,7 +1548,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .arg(&amp;essence_path)</pre>
+                <pre class="has-background-success-light py-0 px-2">        .arg(&quot;--output-format=astjson&quot;)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1564,7 +1564,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .output()?;</pre>
+                <pre class="has-background-success-light py-0 px-2">        .arg(&amp;essence_path)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1573,6 +1573,22 @@
                 role="cell">
                 <a href="#97">97</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="15">
+                15
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        .output()?;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="98"
+                role="cell">
+                <a href="#98">98</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
                 role="cell" aria-label="no coverage">
@@ -1585,9 +1601,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="98"
+                id="99"
                 role="cell">
-                <a href="#98">98</a>
+                <a href="#99">99</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1601,9 +1617,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="99"
+                id="100"
                 role="cell">
-                <a href="#99">99</a>
+                <a href="#100">100</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1617,9 +1633,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="100"
+                id="101"
                 role="cell">
-                <a href="#100">100</a>
+                <a href="#101">101</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1633,9 +1649,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="101"
+                id="102"
                 role="cell">
-                <a href="#101">101</a>
+                <a href="#102">102</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1649,9 +1665,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="102"
+                id="103"
                 role="cell">
-                <a href="#102">102</a>
+                <a href="#103">103</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1665,9 +1681,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="103"
+                id="104"
                 role="cell">
-                <a href="#103">103</a>
+                <a href="#104">104</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1681,9 +1697,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="104"
+                id="105"
                 role="cell">
-                <a href="#104">104</a>
+                <a href="#105">105</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1692,14 +1708,14 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let generated_model = model_from_json(&amp;astjson)?;</pre>
+                <pre class="has-background-success-light py-0 px-2">    let generated_model = model_from_json(&amp;astjson, Default::default())?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="105"
+                id="106"
                 role="cell">
-                <a href="#105">105</a>
+                <a href="#106">106</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1713,9 +1729,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="106"
+                id="107"
                 role="cell">
-                <a href="#106">106</a>
+                <a href="#107">107</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1729,9 +1745,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="107"
+                id="108"
                 role="cell">
-                <a href="#107">107</a>
+                <a href="#108">108</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
diff --git a/coverage/main/crates/conjure_core/src/parse/parse_model.rs.html b/coverage/main/crates/conjure_core/src/parse/parse_model.rs.html
index a151a75378..313b00fce1 100644
--- a/coverage/main/crates/conjure_core/src/parse/parse_model.rs.html
+++ b/coverage/main/crates/conjure_core/src/parse/parse_model.rs.html
@@ -60,7 +60,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, RwLock};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -76,7 +76,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde_json::Value;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -92,7 +92,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde_json::Value as JsonValue;</pre>
+                <pre class="has-background-white py-0 px-2">use serde_json::Value;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -108,7 +108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use serde_json::Value as JsonValue;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -124,7 +124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, DecisionVariable, Domain, Expression, Name, Range};</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -140,7 +140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::error::{Error, Result};</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, DecisionVariable, Domain, Expression, Name, Range};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -156,7 +156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::metadata::Metadata;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -172,7 +172,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::error::{Error, Result};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -188,7 +188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::metadata::Metadata;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -198,13 +198,13 @@
                 <a href="#11">11</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">pub fn model_from_json(str: &amp;str) -&gt; Result&lt;Model&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -214,13 +214,13 @@
                 <a href="#12">12</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="180">
-                180
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut m = Model::default();</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -236,7 +236,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let v: JsonValue = serde_json::from_str(str)?;</pre>
+                <pre class="has-background-success-light py-0 px-2">pub fn model_from_json(str: &amp;str, context: Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;) -&gt; Result&lt;Model&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -252,7 +252,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let statements = v[&quot;mStatements&quot;]</pre>
+                <pre class="has-background-success-light py-0 px-2">    let mut m = Model::new_empty(context);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -268,7 +268,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .as_array()</pre>
+                <pre class="has-background-success-light py-0 px-2">    let v: JsonValue = serde_json::from_str(str)?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -284,7 +284,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        .ok_or(Error::Parse(&quot;mStatements is not an array&quot;.to_owned()))?;</pre>
+                <pre class="has-background-success-light py-0 px-2">    let statements = v[&quot;mStatements&quot;]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -294,13 +294,13 @@
                 <a href="#17">17</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        .as_array()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -311,12 +311,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="735">
-                735
+                role="cell" aria-label="180">
+                180
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    for statement in statements {</pre>
+                <pre class="has-background-success-light py-0 px-2">        .ok_or(Error::Parse(&quot;mStatements is not an array&quot;.to_owned()))?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -326,13 +326,13 @@
                 <a href="#19">19</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="555">
-                555
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let entry = statement</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -343,12 +343,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="555">
-                555
+                role="cell" aria-label="735">
+                735
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .as_object()</pre>
+                <pre class="has-background-success-light py-0 px-2">    for statement in statements {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -364,7 +364,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .ok_or(Error::Parse(&quot;mStatements contains a non-object&quot;.to_owned()))?</pre>
+                <pre class="has-background-success-light py-0 px-2">        let entry = statement</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -380,7 +380,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .iter()</pre>
+                <pre class="has-background-success-light py-0 px-2">            .as_object()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -396,7 +396,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .next()</pre>
+                <pre class="has-background-success-light py-0 px-2">            .ok_or(Error::Parse(&quot;mStatements contains a non-object&quot;.to_owned()))?</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -412,7 +412,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            .ok_or(Error::Parse(</pre>
+                <pre class="has-background-success-light py-0 px-2">            .iter()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -428,7 +428,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                &quot;mStatements contains an empty object&quot;.to_owned(),</pre>
+                <pre class="has-background-success-light py-0 px-2">            .next()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -444,7 +444,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            ))?;</pre>
+                <pre class="has-background-success-light py-0 px-2">            .ok_or(Error::Parse(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -460,7 +460,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        match entry.0.as_str() {</pre>
+                <pre class="has-background-success-light py-0 px-2">                &quot;mStatements contains an empty object&quot;.to_owned(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -476,7 +476,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;Declaration&quot; =&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">            ))?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -485,6 +485,38 @@
                 role="cell">
                 <a href="#29">29</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="555">
+                555
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        match entry.0.as_str() {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="30"
+                role="cell">
+                <a href="#30">30</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="555">
+                555
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">            &quot;Declaration&quot; =&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="31"
+                role="cell">
+                <a href="#31">31</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
                 role="cell" aria-label="375">
@@ -497,9 +529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="30"
+                id="32"
                 role="cell">
-                <a href="#30">30</a>
+                <a href="#32">32</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -513,9 +545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="31"
+                id="33"
                 role="cell">
-                <a href="#31">31</a>
+                <a href="#33">33</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -529,9 +561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="32"
+                id="34"
                 role="cell">
-                <a href="#32">32</a>
+                <a href="#34">34</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -545,9 +577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="33"
+                id="35"
                 role="cell">
-                <a href="#33">33</a>
+                <a href="#35">35</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -561,9 +593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="34"
+                id="36"
                 role="cell">
-                <a href="#34">34</a>
+                <a href="#36">36</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -577,9 +609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="35"
+                id="37"
                 role="cell">
-                <a href="#35">35</a>
+                <a href="#37">37</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -593,9 +625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="36"
+                id="38"
                 role="cell">
-                <a href="#36">36</a>
+                <a href="#38">38</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -609,9 +641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="37"
+                id="39"
                 role="cell">
-                <a href="#37">37</a>
+                <a href="#39">39</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -625,9 +657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="38"
+                id="40"
                 role="cell">
-                <a href="#38">38</a>
+                <a href="#40">40</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -641,9 +673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="39"
+                id="41"
                 role="cell">
-                <a href="#39">39</a>
+                <a href="#41">41</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -657,9 +689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="40"
+                id="42"
                 role="cell">
-                <a href="#40">40</a>
+                <a href="#42">42</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -673,9 +705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="41"
+                id="43"
                 role="cell">
-                <a href="#41">41</a>
+                <a href="#43">43</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -689,9 +721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="42"
+                id="44"
                 role="cell">
-                <a href="#42">42</a>
+                <a href="#44">44</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -705,9 +737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="43"
+                id="45"
                 role="cell">
-                <a href="#43">43</a>
+                <a href="#45">45</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -721,9 +753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="44"
+                id="46"
                 role="cell">
-                <a href="#44">44</a>
+                <a href="#46">46</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -737,9 +769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="45"
+                id="47"
                 role="cell">
-                <a href="#45">45</a>
+                <a href="#47">47</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -753,9 +785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="46"
+                id="48"
                 role="cell">
-                <a href="#46">46</a>
+                <a href="#48">48</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -769,9 +801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="47"
+                id="49"
                 role="cell">
-                <a href="#47">47</a>
+                <a href="#49">49</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -785,9 +817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="48"
+                id="50"
                 role="cell">
-                <a href="#48">48</a>
+                <a href="#50">50</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -801,9 +833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="49"
+                id="51"
                 role="cell">
-                <a href="#49">49</a>
+                <a href="#51">51</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -817,9 +849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="50"
+                id="52"
                 role="cell">
-                <a href="#50">50</a>
+                <a href="#52">52</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -833,9 +865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="51"
+                id="53"
                 role="cell">
-                <a href="#51">51</a>
+                <a href="#53">53</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -849,9 +881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="52"
+                id="54"
                 role="cell">
-                <a href="#52">52</a>
+                <a href="#54">54</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -865,9 +897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="53"
+                id="55"
                 role="cell">
-                <a href="#53">53</a>
+                <a href="#55">55</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -881,9 +913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="54"
+                id="56"
                 role="cell">
-                <a href="#54">54</a>
+                <a href="#56">56</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -897,9 +929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="55"
+                id="57"
                 role="cell">
-                <a href="#55">55</a>
+                <a href="#57">57</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -913,9 +945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="56"
+                id="58"
                 role="cell">
-                <a href="#56">56</a>
+                <a href="#58">58</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -929,9 +961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="57"
+                id="59"
                 role="cell">
-                <a href="#57">57</a>
+                <a href="#59">59</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -945,9 +977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="58"
+                id="60"
                 role="cell">
-                <a href="#58">58</a>
+                <a href="#60">60</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -961,9 +993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="59"
+                id="61"
                 role="cell">
-                <a href="#59">59</a>
+                <a href="#61">61</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -977,9 +1009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="60"
+                id="62"
                 role="cell">
-                <a href="#60">60</a>
+                <a href="#62">62</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -993,9 +1025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="61"
+                id="63"
                 role="cell">
-                <a href="#61">61</a>
+                <a href="#63">63</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1009,9 +1041,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="62"
+                id="64"
                 role="cell">
-                <a href="#62">62</a>
+                <a href="#64">64</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1025,9 +1057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="63"
+                id="65"
                 role="cell">
-                <a href="#63">63</a>
+                <a href="#65">65</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1041,9 +1073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="64"
+                id="66"
                 role="cell">
-                <a href="#64">64</a>
+                <a href="#66">66</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1057,9 +1089,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="65"
+                id="67"
                 role="cell">
-                <a href="#65">65</a>
+                <a href="#67">67</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1073,9 +1105,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="66"
+                id="68"
                 role="cell">
-                <a href="#66">66</a>
+                <a href="#68">68</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1089,9 +1121,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="67"
+                id="69"
                 role="cell">
-                <a href="#67">67</a>
+                <a href="#69">69</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1105,9 +1137,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="68"
+                id="70"
                 role="cell">
-                <a href="#68">68</a>
+                <a href="#70">70</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1121,9 +1153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="69"
+                id="71"
                 role="cell">
-                <a href="#69">69</a>
+                <a href="#71">71</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1137,9 +1169,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="70"
+                id="72"
                 role="cell">
-                <a href="#70">70</a>
+                <a href="#72">72</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1153,9 +1185,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="71"
+                id="73"
                 role="cell">
-                <a href="#71">71</a>
+                <a href="#73">73</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1169,9 +1201,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="72"
+                id="74"
                 role="cell">
-                <a href="#72">72</a>
+                <a href="#74">74</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1185,9 +1217,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="73"
+                id="75"
                 role="cell">
-                <a href="#73">73</a>
+                <a href="#75">75</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1201,9 +1233,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="74"
+                id="76"
                 role="cell">
-                <a href="#74">74</a>
+                <a href="#76">76</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1217,9 +1249,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="75"
+                id="77"
                 role="cell">
-                <a href="#75">75</a>
+                <a href="#77">77</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1233,9 +1265,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="76"
+                id="78"
                 role="cell">
-                <a href="#76">76</a>
+                <a href="#78">78</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1249,9 +1281,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="77"
+                id="79"
                 role="cell">
-                <a href="#77">77</a>
+                <a href="#79">79</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1265,9 +1297,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="78"
+                id="80"
                 role="cell">
-                <a href="#78">78</a>
+                <a href="#80">80</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1281,9 +1313,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="79"
+                id="81"
                 role="cell">
-                <a href="#79">79</a>
+                <a href="#81">81</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1297,9 +1329,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="80"
+                id="82"
                 role="cell">
-                <a href="#80">80</a>
+                <a href="#82">82</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1313,9 +1345,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="81"
+                id="83"
                 role="cell">
-                <a href="#81">81</a>
+                <a href="#83">83</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1329,9 +1361,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="82"
+                id="84"
                 role="cell">
-                <a href="#82">82</a>
+                <a href="#84">84</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1345,9 +1377,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="83"
+                id="85"
                 role="cell">
-                <a href="#83">83</a>
+                <a href="#85">85</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1361,9 +1393,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="84"
+                id="86"
                 role="cell">
-                <a href="#84">84</a>
+                <a href="#86">86</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1377,9 +1409,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="85"
+                id="87"
                 role="cell">
-                <a href="#85">85</a>
+                <a href="#87">87</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1393,9 +1425,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="86"
+                id="88"
                 role="cell">
-                <a href="#86">86</a>
+                <a href="#88">88</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1409,9 +1441,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="87"
+                id="89"
                 role="cell">
-                <a href="#87">87</a>
+                <a href="#89">89</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1425,9 +1457,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="88"
+                id="90"
                 role="cell">
-                <a href="#88">88</a>
+                <a href="#90">90</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1441,9 +1473,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="89"
+                id="91"
                 role="cell">
-                <a href="#89">89</a>
+                <a href="#91">91</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1457,9 +1489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="90"
+                id="92"
                 role="cell">
-                <a href="#90">90</a>
+                <a href="#92">92</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1473,9 +1505,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="91"
+                id="93"
                 role="cell">
-                <a href="#91">91</a>
+                <a href="#93">93</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1489,9 +1521,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="92"
+                id="94"
                 role="cell">
-                <a href="#92">92</a>
+                <a href="#94">94</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1505,9 +1537,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="93"
+                id="95"
                 role="cell">
-                <a href="#93">93</a>
+                <a href="#95">95</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1521,9 +1553,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="94"
+                id="96"
                 role="cell">
-                <a href="#94">94</a>
+                <a href="#96">96</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1537,9 +1569,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="95"
+                id="97"
                 role="cell">
-                <a href="#95">95</a>
+                <a href="#97">97</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1553,9 +1585,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="96"
+                id="98"
                 role="cell">
-                <a href="#96">96</a>
+                <a href="#98">98</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1569,9 +1601,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="97"
+                id="99"
                 role="cell">
-                <a href="#97">97</a>
+                <a href="#99">99</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1585,9 +1617,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="98"
+                id="100"
                 role="cell">
-                <a href="#98">98</a>
+                <a href="#100">100</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1601,9 +1633,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="99"
+                id="101"
                 role="cell">
-                <a href="#99">99</a>
+                <a href="#101">101</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1617,9 +1649,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="100"
+                id="102"
                 role="cell">
-                <a href="#100">100</a>
+                <a href="#102">102</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1633,9 +1665,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="101"
+                id="103"
                 role="cell">
-                <a href="#101">101</a>
+                <a href="#103">103</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1649,9 +1681,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="102"
+                id="104"
                 role="cell">
-                <a href="#102">102</a>
+                <a href="#104">104</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1665,9 +1697,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="103"
+                id="105"
                 role="cell">
-                <a href="#103">103</a>
+                <a href="#105">105</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1681,9 +1713,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="104"
+                id="106"
                 role="cell">
-                <a href="#104">104</a>
+                <a href="#106">106</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1697,9 +1729,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="105"
+                id="107"
                 role="cell">
-                <a href="#105">105</a>
+                <a href="#107">107</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1713,9 +1745,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="106"
+                id="108"
                 role="cell">
-                <a href="#106">106</a>
+                <a href="#108">108</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1729,9 +1761,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="107"
+                id="109"
                 role="cell">
-                <a href="#107">107</a>
+                <a href="#109">109</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1745,9 +1777,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="108"
+                id="110"
                 role="cell">
-                <a href="#108">108</a>
+                <a href="#110">110</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1761,9 +1793,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="109"
+                id="111"
                 role="cell">
-                <a href="#109">109</a>
+                <a href="#111">111</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1777,9 +1809,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="110"
+                id="112"
                 role="cell">
-                <a href="#110">110</a>
+                <a href="#112">112</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1793,9 +1825,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="111"
+                id="113"
                 role="cell">
-                <a href="#111">111</a>
+                <a href="#113">113</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1809,9 +1841,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="112"
+                id="114"
                 role="cell">
-                <a href="#112">112</a>
+                <a href="#114">114</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1825,9 +1857,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="113"
+                id="115"
                 role="cell">
-                <a href="#113">113</a>
+                <a href="#115">115</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1841,9 +1873,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="114"
+                id="116"
                 role="cell">
-                <a href="#114">114</a>
+                <a href="#116">116</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1857,9 +1889,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="115"
+                id="117"
                 role="cell">
-                <a href="#115">115</a>
+                <a href="#117">117</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1873,9 +1905,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="116"
+                id="118"
                 role="cell">
-                <a href="#116">116</a>
+                <a href="#118">118</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1889,9 +1921,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="117"
+                id="119"
                 role="cell">
-                <a href="#117">117</a>
+                <a href="#119">119</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1905,9 +1937,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="118"
+                id="120"
                 role="cell">
-                <a href="#118">118</a>
+                <a href="#120">120</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -1921,9 +1953,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="119"
+                id="121"
                 role="cell">
-                <a href="#119">119</a>
+                <a href="#121">121</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -1937,9 +1969,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="120"
+                id="122"
                 role="cell">
-                <a href="#120">120</a>
+                <a href="#122">122</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1953,9 +1985,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="121"
+                id="123"
                 role="cell">
-                <a href="#121">121</a>
+                <a href="#123">123</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1969,9 +2001,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="122"
+                id="124"
                 role="cell">
-                <a href="#122">122</a>
+                <a href="#124">124</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -1985,9 +2017,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="123"
+                id="125"
                 role="cell">
-                <a href="#123">123</a>
+                <a href="#125">125</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2001,9 +2033,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="124"
+                id="126"
                 role="cell">
-                <a href="#124">124</a>
+                <a href="#126">126</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2017,9 +2049,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="125"
+                id="127"
                 role="cell">
-                <a href="#125">125</a>
+                <a href="#127">127</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2033,9 +2065,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="126"
+                id="128"
                 role="cell">
-                <a href="#126">126</a>
+                <a href="#128">128</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2049,9 +2081,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="127"
+                id="129"
                 role="cell">
-                <a href="#127">127</a>
+                <a href="#129">129</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2065,9 +2097,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="128"
+                id="130"
                 role="cell">
-                <a href="#128">128</a>
+                <a href="#130">130</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2081,9 +2113,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="129"
+                id="131"
                 role="cell">
-                <a href="#129">129</a>
+                <a href="#131">131</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2097,9 +2129,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="130"
+                id="132"
                 role="cell">
-                <a href="#130">130</a>
+                <a href="#132">132</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2113,9 +2145,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="131"
+                id="133"
                 role="cell">
-                <a href="#131">131</a>
+                <a href="#133">133</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2129,9 +2161,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="132"
+                id="134"
                 role="cell">
-                <a href="#132">132</a>
+                <a href="#134">134</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2145,9 +2177,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="133"
+                id="135"
                 role="cell">
-                <a href="#133">133</a>
+                <a href="#135">135</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2161,9 +2193,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="134"
+                id="136"
                 role="cell">
-                <a href="#134">134</a>
+                <a href="#136">136</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2177,9 +2209,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="135"
+                id="137"
                 role="cell">
-                <a href="#135">135</a>
+                <a href="#137">137</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2193,9 +2225,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="136"
+                id="138"
                 role="cell">
-                <a href="#136">136</a>
+                <a href="#138">138</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2209,9 +2241,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="137"
+                id="139"
                 role="cell">
-                <a href="#137">137</a>
+                <a href="#139">139</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2225,9 +2257,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="138"
+                id="140"
                 role="cell">
-                <a href="#138">138</a>
+                <a href="#140">140</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2241,9 +2273,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="139"
+                id="141"
                 role="cell">
-                <a href="#139">139</a>
+                <a href="#141">141</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2257,9 +2289,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="140"
+                id="142"
                 role="cell">
-                <a href="#140">140</a>
+                <a href="#142">142</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2273,9 +2305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="141"
+                id="143"
                 role="cell">
-                <a href="#141">141</a>
+                <a href="#143">143</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2289,9 +2321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="142"
+                id="144"
                 role="cell">
-                <a href="#142">142</a>
+                <a href="#144">144</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2305,9 +2337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="143"
+                id="145"
                 role="cell">
-                <a href="#143">143</a>
+                <a href="#145">145</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2321,9 +2353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="144"
+                id="146"
                 role="cell">
-                <a href="#144">144</a>
+                <a href="#146">146</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2334,38 +2366,6 @@
                  role="cell">
                 <pre class="has-background-white py-0 px-2"></pre>
             </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="145"
-                role="cell">
-                <a href="#145">145</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="840">
-                840
-            </div>
-            <div class="column has-background-success-light p-0"
-                 role="cell">
-                <pre class="has-background-success-light py-0 px-2">fn parse_expression(obj: &amp;JsonValue) -&gt; Option&lt;Expression&gt; {</pre>
-            </div>
-        </div><div class="columns p-0 m-0" role="row">
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered"
-                id="146"
-                role="cell">
-                <a href="#146">146</a>
-            </div>
-            <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="840">
-                840
-            </div>
-            <div class="column has-background-success-light p-0"
-                 role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let binary_operators: HashMap&lt;&amp;str, BinOp&gt; = [</pre>
-            </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
@@ -2380,7 +2380,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">fn parse_expression(obj: &amp;JsonValue) -&gt; Option&lt;Expression&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2396,7 +2396,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpEq&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">    let binary_operators: HashMap&lt;&amp;str, BinOp&gt; = [</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2412,7 +2412,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Eq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2428,7 +2428,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpEq&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2444,7 +2444,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Eq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2460,7 +2460,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpNeq&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2476,7 +2476,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Neq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2492,7 +2492,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpNeq&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2508,7 +2508,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Neq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2524,7 +2524,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGeq&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2540,7 +2540,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Geq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2556,7 +2556,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGeq&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2572,7 +2572,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Geq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2588,7 +2588,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLeq&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2604,7 +2604,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Leq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2620,7 +2620,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLeq&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2636,7 +2636,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Leq) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2652,7 +2652,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGt&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2668,7 +2668,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Gt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2684,7 +2684,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGt&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2700,7 +2700,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Gt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2716,7 +2716,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLt&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2732,7 +2732,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Lt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2748,7 +2748,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLt&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2764,7 +2764,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Lt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2780,7 +2780,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGt&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2796,7 +2796,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Gt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2812,7 +2812,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpGt&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2828,7 +2828,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Gt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2844,7 +2844,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLt&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2860,7 +2860,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Lt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2876,7 +2876,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpLt&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2892,7 +2892,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F; (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Lt) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2908,7 +2908,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F;     &quot;MkOpDiv&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2924,7 +2924,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F;     Box::new(Expression::Div) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F; (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2940,7 +2940,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F; ),</pre>
+                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F;     &quot;MkOpDiv&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2956,7 +2956,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    ]</pre>
+                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F;     Box::new(Expression::Div) as Box&lt;dyn Fn(_, _, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2972,7 +2972,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
+                <pre class="has-background-success-light py-0 px-2">        &#x2F;&#x2F; ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2988,7 +2988,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
+                <pre class="has-background-success-light py-0 px-2">    ]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3004,7 +3004,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3020,7 +3020,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let unary_operators: HashMap&lt;&amp;str, UnaryOp&gt; = [(</pre>
+                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3036,7 +3036,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        &quot;MkOpNot&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3052,7 +3052,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Box::new(Expression::Not) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">    let unary_operators: HashMap&lt;&amp;str, UnaryOp&gt; = [(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3068,7 +3068,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    )]</pre>
+                <pre class="has-background-success-light py-0 px-2">        &quot;MkOpNot&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3084,7 +3084,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
+                <pre class="has-background-success-light py-0 px-2">        Box::new(Expression::Not) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3100,7 +3100,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
+                <pre class="has-background-success-light py-0 px-2">    )]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3116,7 +3116,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3132,7 +3132,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let vec_operators: HashMap&lt;&amp;str, VecOp&gt; = [</pre>
+                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3148,7 +3148,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3164,7 +3164,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpSum&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">    let vec_operators: HashMap&lt;&amp;str, VecOp&gt; = [</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3180,7 +3180,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Sum) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3196,7 +3196,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpSum&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3212,7 +3212,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Sum) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3228,7 +3228,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpAnd&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3244,7 +3244,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::And) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3260,7 +3260,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpAnd&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3276,7 +3276,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (&quot;MkOpOr&quot;, Box::new(Expression::Or) as Box&lt;dyn Fn(_, _) -&gt; _&gt;),</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::And) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3292,7 +3292,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        (</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3308,7 +3308,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpMin&quot;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (&quot;MkOpOr&quot;, Box::new(Expression::Or) as Box&lt;dyn Fn(_, _) -&gt; _&gt;),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3324,7 +3324,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Min) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
+                <pre class="has-background-success-light py-0 px-2">        (</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3340,7 +3340,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        ),</pre>
+                <pre class="has-background-success-light py-0 px-2">            &quot;MkOpMin&quot;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3356,7 +3356,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    ]</pre>
+                <pre class="has-background-success-light py-0 px-2">            Box::new(Expression::Min) as Box&lt;dyn Fn(_, _) -&gt; _&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3372,7 +3372,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
+                <pre class="has-background-success-light py-0 px-2">        ),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3388,7 +3388,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
+                <pre class="has-background-success-light py-0 px-2">    ]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3404,7 +3404,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">    .into_iter()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3415,12 +3415,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1455">
-                1455
+                role="cell" aria-label="840">
+                840
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut binary_operator_names = binary_operators.iter().map(|x| x.0);</pre>
+                <pre class="has-background-success-light py-0 px-2">    .collect();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3436,7 +3436,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    let mut unary_operator_names = unary_operators.iter().map(|x| x.0);</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3445,6 +3445,38 @@
                 role="cell">
                 <a href="#214">214</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="1515">
+                1515
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let mut binary_operator_names = binary_operators.iter().map(|x| x.0);</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="215"
+                role="cell">
+                <a href="#215">215</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="840">
+                840
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    let mut unary_operator_names = unary_operators.iter().map(|x| x.0);</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="216"
+                role="cell">
+                <a href="#216">216</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
                 role="cell" aria-label="840">
@@ -3457,9 +3489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="215"
+                id="217"
                 role="cell">
-                <a href="#215">215</a>
+                <a href="#217">217</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3473,9 +3505,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="216"
+                id="218"
                 role="cell">
-                <a href="#216">216</a>
+                <a href="#218">218</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3489,9 +3521,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="217"
+                id="219"
                 role="cell">
-                <a href="#217">217</a>
+                <a href="#219">219</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3505,14 +3537,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="218"
+                id="220"
                 role="cell">
-                <a href="#218">218</a>
+                <a href="#220">220</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1455">
-                1455
+                role="cell" aria-label="1515">
+                1515
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -3521,9 +3553,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="219"
+                id="221"
                 role="cell">
-                <a href="#219">219</a>
+                <a href="#221">221</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3537,9 +3569,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="220"
+                id="222"
                 role="cell">
-                <a href="#220">220</a>
+                <a href="#222">222</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3553,9 +3585,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="221"
+                id="223"
                 role="cell">
-                <a href="#221">221</a>
+                <a href="#223">223</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3569,9 +3601,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="222"
+                id="224"
                 role="cell">
-                <a href="#222">222</a>
+                <a href="#224">224</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3585,9 +3617,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="223"
+                id="225"
                 role="cell">
-                <a href="#223">223</a>
+                <a href="#225">225</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3601,14 +3633,14 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="224"
+                id="226"
                 role="cell">
-                <a href="#224">224</a>
+                <a href="#226">226</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="375">
-                375
+                role="cell" aria-label="420">
+                420
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -3617,9 +3649,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="225"
+                id="227"
                 role="cell">
-                <a href="#225">225</a>
+                <a href="#227">227</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3633,9 +3665,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="226"
+                id="228"
                 role="cell">
-                <a href="#226">226</a>
+                <a href="#228">228</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3649,9 +3681,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="227"
+                id="229"
                 role="cell">
-                <a href="#227">227</a>
+                <a href="#229">229</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3665,9 +3697,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="228"
+                id="230"
                 role="cell">
-                <a href="#228">228</a>
+                <a href="#230">230</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3681,9 +3713,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="229"
+                id="231"
                 role="cell">
-                <a href="#229">229</a>
+                <a href="#231">231</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3697,9 +3729,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="230"
+                id="232"
                 role="cell">
-                <a href="#230">230</a>
+                <a href="#232">232</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3713,9 +3745,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="231"
+                id="233"
                 role="cell">
-                <a href="#231">231</a>
+                <a href="#233">233</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3729,9 +3761,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="232"
+                id="234"
                 role="cell">
-                <a href="#232">232</a>
+                <a href="#234">234</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3745,9 +3777,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="233"
+                id="235"
                 role="cell">
-                <a href="#233">233</a>
+                <a href="#235">235</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3761,9 +3793,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="234"
+                id="236"
                 role="cell">
-                <a href="#234">234</a>
+                <a href="#236">236</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3777,9 +3809,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="235"
+                id="237"
                 role="cell">
-                <a href="#235">235</a>
+                <a href="#237">237</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3793,9 +3825,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="236"
+                id="238"
                 role="cell">
-                <a href="#236">236</a>
+                <a href="#238">238</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3809,9 +3841,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="237"
+                id="239"
                 role="cell">
-                <a href="#237">237</a>
+                <a href="#239">239</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3825,9 +3857,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="238"
+                id="240"
                 role="cell">
-                <a href="#238">238</a>
+                <a href="#240">240</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3841,9 +3873,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="239"
+                id="241"
                 role="cell">
-                <a href="#239">239</a>
+                <a href="#241">241</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3857,9 +3889,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="240"
+                id="242"
                 role="cell">
-                <a href="#240">240</a>
+                <a href="#242">242</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3873,9 +3905,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="241"
+                id="243"
                 role="cell">
-                <a href="#241">241</a>
+                <a href="#243">243</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3889,9 +3921,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="242"
+                id="244"
                 role="cell">
-                <a href="#242">242</a>
+                <a href="#244">244</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3905,9 +3937,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="243"
+                id="245"
                 role="cell">
-                <a href="#243">243</a>
+                <a href="#245">245</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3921,9 +3953,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="244"
+                id="246"
                 role="cell">
-                <a href="#244">244</a>
+                <a href="#246">246</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3937,9 +3969,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="245"
+                id="247"
                 role="cell">
-                <a href="#245">245</a>
+                <a href="#247">247</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3953,9 +3985,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="246"
+                id="248"
                 role="cell">
-                <a href="#246">246</a>
+                <a href="#248">248</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3969,9 +4001,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="247"
+                id="249"
                 role="cell">
-                <a href="#247">247</a>
+                <a href="#249">249</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3985,9 +4017,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="248"
+                id="250"
                 role="cell">
-                <a href="#248">248</a>
+                <a href="#250">250</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4001,9 +4033,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="249"
+                id="251"
                 role="cell">
-                <a href="#249">249</a>
+                <a href="#251">251</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4017,9 +4049,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="250"
+                id="252"
                 role="cell">
-                <a href="#250">250</a>
+                <a href="#252">252</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4033,9 +4065,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="251"
+                id="253"
                 role="cell">
-                <a href="#251">251</a>
+                <a href="#253">253</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4049,9 +4081,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="252"
+                id="254"
                 role="cell">
-                <a href="#252">252</a>
+                <a href="#254">254</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4065,9 +4097,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="253"
+                id="255"
                 role="cell">
-                <a href="#253">253</a>
+                <a href="#255">255</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4081,9 +4113,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="254"
+                id="256"
                 role="cell">
-                <a href="#254">254</a>
+                <a href="#256">256</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4097,9 +4129,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="255"
+                id="257"
                 role="cell">
-                <a href="#255">255</a>
+                <a href="#257">257</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4113,9 +4145,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="256"
+                id="258"
                 role="cell">
-                <a href="#256">256</a>
+                <a href="#258">258</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4129,9 +4161,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="257"
+                id="259"
                 role="cell">
-                <a href="#257">257</a>
+                <a href="#259">259</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4145,9 +4177,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="258"
+                id="260"
                 role="cell">
-                <a href="#258">258</a>
+                <a href="#260">260</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4161,9 +4193,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="259"
+                id="261"
                 role="cell">
-                <a href="#259">259</a>
+                <a href="#261">261</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4177,9 +4209,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="260"
+                id="262"
                 role="cell">
-                <a href="#260">260</a>
+                <a href="#262">262</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4193,9 +4225,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="261"
+                id="263"
                 role="cell">
-                <a href="#261">261</a>
+                <a href="#263">263</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4209,9 +4241,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="262"
+                id="264"
                 role="cell">
-                <a href="#262">262</a>
+                <a href="#264">264</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4225,9 +4257,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="263"
+                id="265"
                 role="cell">
-                <a href="#263">263</a>
+                <a href="#265">265</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4241,9 +4273,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="264"
+                id="266"
                 role="cell">
-                <a href="#264">264</a>
+                <a href="#266">266</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4257,9 +4289,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="265"
+                id="267"
                 role="cell">
-                <a href="#265">265</a>
+                <a href="#267">267</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4273,9 +4305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="266"
+                id="268"
                 role="cell">
-                <a href="#266">266</a>
+                <a href="#268">268</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4289,9 +4321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="267"
+                id="269"
                 role="cell">
-                <a href="#267">267</a>
+                <a href="#269">269</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4305,9 +4337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="268"
+                id="270"
                 role="cell">
-                <a href="#268">268</a>
+                <a href="#270">270</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4321,9 +4353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="269"
+                id="271"
                 role="cell">
-                <a href="#269">269</a>
+                <a href="#271">271</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4337,9 +4369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="270"
+                id="272"
                 role="cell">
-                <a href="#270">270</a>
+                <a href="#272">272</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4353,9 +4385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="271"
+                id="273"
                 role="cell">
-                <a href="#271">271</a>
+                <a href="#273">273</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4369,9 +4401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="272"
+                id="274"
                 role="cell">
-                <a href="#272">272</a>
+                <a href="#274">274</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4385,9 +4417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="273"
+                id="275"
                 role="cell">
-                <a href="#273">273</a>
+                <a href="#275">275</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4401,9 +4433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="274"
+                id="276"
                 role="cell">
-                <a href="#274">274</a>
+                <a href="#276">276</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4417,9 +4449,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="275"
+                id="277"
                 role="cell">
-                <a href="#275">275</a>
+                <a href="#277">277</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4433,9 +4465,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="276"
+                id="278"
                 role="cell">
-                <a href="#276">276</a>
+                <a href="#278">278</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4449,9 +4481,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="277"
+                id="279"
                 role="cell">
-                <a href="#277">277</a>
+                <a href="#279">279</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4465,9 +4497,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="278"
+                id="280"
                 role="cell">
-                <a href="#278">278</a>
+                <a href="#280">280</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4481,9 +4513,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="279"
+                id="281"
                 role="cell">
-                <a href="#279">279</a>
+                <a href="#281">281</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4497,9 +4529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="280"
+                id="282"
                 role="cell">
-                <a href="#280">280</a>
+                <a href="#282">282</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4513,9 +4545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="281"
+                id="283"
                 role="cell">
-                <a href="#281">281</a>
+                <a href="#283">283</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4529,9 +4561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="282"
+                id="284"
                 role="cell">
-                <a href="#282">282</a>
+                <a href="#284">284</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4545,9 +4577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="283"
+                id="285"
                 role="cell">
-                <a href="#283">283</a>
+                <a href="#285">285</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4561,9 +4593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="284"
+                id="286"
                 role="cell">
-                <a href="#284">284</a>
+                <a href="#286">286</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4577,9 +4609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="285"
+                id="287"
                 role="cell">
-                <a href="#285">285</a>
+                <a href="#287">287</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4593,9 +4625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="286"
+                id="288"
                 role="cell">
-                <a href="#286">286</a>
+                <a href="#288">288</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4609,9 +4641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="287"
+                id="289"
                 role="cell">
-                <a href="#287">287</a>
+                <a href="#289">289</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4625,9 +4657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="288"
+                id="290"
                 role="cell">
-                <a href="#288">288</a>
+                <a href="#290">290</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4641,9 +4673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="289"
+                id="291"
                 role="cell">
-                <a href="#289">289</a>
+                <a href="#291">291</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4657,9 +4689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="290"
+                id="292"
                 role="cell">
-                <a href="#290">290</a>
+                <a href="#292">292</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4673,9 +4705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="291"
+                id="293"
                 role="cell">
-                <a href="#291">291</a>
+                <a href="#293">293</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4689,9 +4721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="292"
+                id="294"
                 role="cell">
-                <a href="#292">292</a>
+                <a href="#294">294</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4705,9 +4737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="293"
+                id="295"
                 role="cell">
-                <a href="#293">293</a>
+                <a href="#295">295</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4721,9 +4753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="294"
+                id="296"
                 role="cell">
-                <a href="#294">294</a>
+                <a href="#296">296</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4737,9 +4769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="295"
+                id="297"
                 role="cell">
-                <a href="#295">295</a>
+                <a href="#297">297</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4753,9 +4785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="296"
+                id="298"
                 role="cell">
-                <a href="#296">296</a>
+                <a href="#298">298</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4769,9 +4801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="297"
+                id="299"
                 role="cell">
-                <a href="#297">297</a>
+                <a href="#299">299</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4785,9 +4817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="298"
+                id="300"
                 role="cell">
-                <a href="#298">298</a>
+                <a href="#300">300</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4801,9 +4833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="299"
+                id="301"
                 role="cell">
-                <a href="#299">299</a>
+                <a href="#301">301</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4817,9 +4849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="300"
+                id="302"
                 role="cell">
-                <a href="#300">300</a>
+                <a href="#302">302</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4833,9 +4865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="301"
+                id="303"
                 role="cell">
-                <a href="#301">301</a>
+                <a href="#303">303</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4849,9 +4881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="302"
+                id="304"
                 role="cell">
-                <a href="#302">302</a>
+                <a href="#304">304</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4865,9 +4897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="303"
+                id="305"
                 role="cell">
-                <a href="#303">303</a>
+                <a href="#305">305</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4881,9 +4913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="304"
+                id="306"
                 role="cell">
-                <a href="#304">304</a>
+                <a href="#306">306</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4897,9 +4929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="305"
+                id="307"
                 role="cell">
-                <a href="#305">305</a>
+                <a href="#307">307</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4913,9 +4945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="306"
+                id="308"
                 role="cell">
-                <a href="#306">306</a>
+                <a href="#308">308</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4929,9 +4961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="307"
+                id="309"
                 role="cell">
-                <a href="#307">307</a>
+                <a href="#309">309</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4945,9 +4977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="308"
+                id="310"
                 role="cell">
-                <a href="#308">308</a>
+                <a href="#310">310</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4961,9 +4993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="309"
+                id="311"
                 role="cell">
-                <a href="#309">309</a>
+                <a href="#311">311</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4977,9 +5009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="310"
+                id="312"
                 role="cell">
-                <a href="#310">310</a>
+                <a href="#312">312</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4993,9 +5025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="311"
+                id="313"
                 role="cell">
-                <a href="#311">311</a>
+                <a href="#313">313</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5009,9 +5041,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="312"
+                id="314"
                 role="cell">
-                <a href="#312">312</a>
+                <a href="#314">314</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
diff --git a/coverage/main/crates/conjure_core/src/rule_engine/index.html b/coverage/main/crates/conjure_core/src/rule_engine/index.html
index 57bfec5116..df967238bd 100644
--- a/coverage/main/crates/conjure_core/src/rule_engine/index.html
+++ b/coverage/main/crates/conjure_core/src/rule_engine/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="283 / 381">74.28 %</abbr></p>
+                <abbr title="280 / 381">73.49 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="39 / 158">24.68 %</abbr></p>
+                <abbr title="38 / 158">24.05 %</abbr></p>
         </div>
     </div>
 
@@ -142,20 +142,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="62.244897959183675"
+                value="59.183673469387756"
                 max="100">
-                62.24%
+                59.18%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            62.24%
+            59.18%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            61 / 98
+            58 / 98
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">23.33%</td>
-        <td class="has-text-centered has-background-danger p-2">7 / 30 </td>
+        <td class="has-text-centered has-background-danger p-2">20%</td>
+        <td class="has-text-centered has-background-danger p-2">6 / 30 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/crates/conjure_core/src/rule_engine/resolve_rules.rs.html b/coverage/main/crates/conjure_core/src/rule_engine/resolve_rules.rs.html
index 99f711307d..4078c28b5d 100644
--- a/coverage/main/crates/conjure_core/src/rule_engine/resolve_rules.rs.html
+++ b/coverage/main/crates/conjure_core/src/rule_engine/resolve_rules.rs.html
@@ -2071,8 +2071,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2087,8 +2087,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2103,8 +2103,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2119,8 +2119,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2135,8 +2135,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2151,8 +2151,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2167,8 +2167,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2183,8 +2183,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2199,8 +2199,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2215,8 +2215,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="17160">
-                17160
+                role="cell" aria-label="16320">
+                16320
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2231,8 +2231,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="2145">
-                2145
+                role="cell" aria-label="2535">
+                2535
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2247,8 +2247,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="2145">
-                2145
+                role="cell" aria-label="2535">
+                2535
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2263,8 +2263,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="2145">
-                2145
+                role="cell" aria-label="2535">
+                2535
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2279,8 +2279,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2455,8 +2455,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="19305">
-                19305
+                role="cell" aria-label="18855">
+                18855
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/rule_engine/rule.rs.html b/coverage/main/crates/conjure_core/src/rule_engine/rule.rs.html
index 12e008e3e1..2dc69dd6e8 100644
--- a/coverage/main/crates/conjure_core/src/rule_engine/rule.rs.html
+++ b/coverage/main/crates/conjure_core/src/rule_engine/rule.rs.html
@@ -2119,8 +2119,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="39870">
-                39870
+                role="cell" aria-label="39420">
+                39420
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2135,8 +2135,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="39870">
-                39870
+                role="cell" aria-label="39420">
+                39420
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2151,8 +2151,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="39870">
-                39870
+                role="cell" aria-label="39420">
+                39420
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2247,8 +2247,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="61935">
-                61935
+                role="cell" aria-label="61035">
+                61035
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2263,8 +2263,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="61935">
-                61935
+                role="cell" aria-label="61035">
+                61035
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -2279,8 +2279,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="61935">
-                61935
+                role="cell" aria-label="61035">
+                61035
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/crates/conjure_core/src/rule_engine/rule_set.rs.html b/coverage/main/crates/conjure_core/src/rule_engine/rule_set.rs.html
index 922da95338..e1ef1a9460 100644
--- a/coverage/main/crates/conjure_core/src/rule_engine/rule_set.rs.html
+++ b/coverage/main/crates/conjure_core/src/rule_engine/rule_set.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="61 / 98">62.24 %</abbr></p>
+                <abbr title="58 / 98">59.18 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="7 / 30">23.33 %</abbr></p>
+                <abbr title="6 / 30">20 %</abbr></p>
         </div>
     </div>
 
@@ -2262,13 +2262,13 @@
                 <a href="#140">140</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    fn eq(&amp;self, other: &amp;Self) -&gt; bool {</pre>
+                <pre class="has-background-danger-light py-0 px-2">    fn eq(&amp;self, other: &amp;Self) -&gt; bool {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2278,13 +2278,13 @@
                 <a href="#141">141</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        self.name == other.name</pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.name == other.name</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2294,13 +2294,13 @@
                 <a href="#142">142</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="15">
-                15
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
diff --git a/coverage/main/crates/conjure_core/src/solver/adaptors/index.html b/coverage/main/crates/conjure_core/src/solver/adaptors/index.html
index cc5ba86a05..b9a58f410c 100644
--- a/coverage/main/crates/conjure_core/src/solver/adaptors/index.html
+++ b/coverage/main/crates/conjure_core/src/solver/adaptors/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="200 / 427">46.84 %</abbr></p>
+                <abbr title="206 / 430">47.91 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="19 / 162">11.73 %</abbr></p>
+                <abbr title="21 / 165">12.73 %</abbr></p>
         </div>
     </div>
 
@@ -70,20 +70,20 @@
         <td class="p-2">
             <progress
                 class="progress is-warning is-large"
-                value="83.68200836820083"
+                value="85.12396694214877"
                 max="100">
-                83.68%
+                85.12%
             </progress>
         </td>
         <td class="has-text-centered has-background-warning p-2">
-            83.68%
+            85.12%
         </td>
         <td class="has-text-centered has-background-warning p-2">
-            200 / 239
+            206 / 242
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">24.36%</td>
-        <td class="has-text-centered has-background-danger p-2">19 / 78 </td>
+        <td class="has-text-centered has-background-danger p-2">25.93%</td>
+        <td class="has-text-centered has-background-danger p-2">21 / 81 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/crates/conjure_core/src/solver/adaptors/minion.rs.html b/coverage/main/crates/conjure_core/src/solver/adaptors/minion.rs.html
index 9e44ff0da2..ea4eefcca6 100644
--- a/coverage/main/crates/conjure_core/src/solver/adaptors/minion.rs.html
+++ b/coverage/main/crates/conjure_core/src/solver/adaptors/minion.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-warning">
-                <abbr title="200 / 239">83.68 %</abbr></p>
+                <abbr title="206 / 242">85.12 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="19 / 78">24.36 %</abbr></p>
+                <abbr title="21 / 81">25.93 %</abbr></p>
         </div>
     </div>
 
@@ -2108,7 +2108,7 @@
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            stats: None,</pre>
+                <pre class="has-background-success-light py-0 px-2">            stats: Default::default(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2438,13 +2438,13 @@
                 <a href="#151">151</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    fn get_family(&amp;self) -&gt; SolverFamily {</pre>
+                <pre class="has-background-success-light py-0 px-2">    fn get_family(&amp;self) -&gt; SolverFamily {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2454,13 +2454,13 @@
                 <a href="#152">152</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        SolverFamily::Minion</pre>
+                <pre class="has-background-success-light py-0 px-2">        SolverFamily::Minion</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2470,13 +2470,13 @@
                 <a href="#153">153</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2492,7 +2492,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2501,6 +2501,70 @@
                 role="cell">
                 <a href="#155">155</a>
             </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    fn get_name(&amp;self) -&gt; Option&lt;String&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="156"
+                role="cell">
+                <a href="#156">156</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        Some(&quot;adaptors::Minion&quot;.to_owned())</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="157"
+                role="cell">
+                <a href="#157">157</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="158"
+                role="cell">
+                <a href="#158">158</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="159"
+                role="cell">
+                <a href="#159">159</a>
+            </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
                 role="cell" aria-label="no coverage">
@@ -2513,9 +2577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="156"
+                id="160"
                 role="cell">
-                <a href="#156">156</a>
+                <a href="#160">160</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2529,9 +2593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="157"
+                id="161"
                 role="cell">
-                <a href="#157">157</a>
+                <a href="#161">161</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2545,9 +2609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="158"
+                id="162"
                 role="cell">
-                <a href="#158">158</a>
+                <a href="#162">162</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2561,9 +2625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="159"
+                id="163"
                 role="cell">
-                <a href="#159">159</a>
+                <a href="#163">163</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2577,9 +2641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="160"
+                id="164"
                 role="cell">
-                <a href="#160">160</a>
+                <a href="#164">164</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2593,9 +2657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="161"
+                id="165"
                 role="cell">
-                <a href="#161">161</a>
+                <a href="#165">165</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2609,9 +2673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="162"
+                id="166"
                 role="cell">
-                <a href="#162">162</a>
+                <a href="#166">166</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2625,9 +2689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="163"
+                id="167"
                 role="cell">
-                <a href="#163">163</a>
+                <a href="#167">167</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2641,9 +2705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="164"
+                id="168"
                 role="cell">
-                <a href="#164">164</a>
+                <a href="#168">168</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2657,9 +2721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="165"
+                id="169"
                 role="cell">
-                <a href="#165">165</a>
+                <a href="#169">169</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2673,9 +2737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="166"
+                id="170"
                 role="cell">
-                <a href="#166">166</a>
+                <a href="#170">170</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2689,9 +2753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="167"
+                id="171"
                 role="cell">
-                <a href="#167">167</a>
+                <a href="#171">171</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2705,9 +2769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="168"
+                id="172"
                 role="cell">
-                <a href="#168">168</a>
+                <a href="#172">172</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2721,9 +2785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="169"
+                id="173"
                 role="cell">
-                <a href="#169">169</a>
+                <a href="#173">173</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2737,9 +2801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="170"
+                id="174"
                 role="cell">
-                <a href="#170">170</a>
+                <a href="#174">174</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2753,9 +2817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="171"
+                id="175"
                 role="cell">
-                <a href="#171">171</a>
+                <a href="#175">175</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2769,9 +2833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="172"
+                id="176"
                 role="cell">
-                <a href="#172">172</a>
+                <a href="#176">176</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2785,9 +2849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="173"
+                id="177"
                 role="cell">
-                <a href="#173">173</a>
+                <a href="#177">177</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2801,9 +2865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="174"
+                id="178"
                 role="cell">
-                <a href="#174">174</a>
+                <a href="#178">178</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2817,9 +2881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="175"
+                id="179"
                 role="cell">
-                <a href="#175">175</a>
+                <a href="#179">179</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2833,9 +2897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="176"
+                id="180"
                 role="cell">
-                <a href="#176">176</a>
+                <a href="#180">180</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2849,9 +2913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="177"
+                id="181"
                 role="cell">
-                <a href="#177">177</a>
+                <a href="#181">181</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -2865,9 +2929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="178"
+                id="182"
                 role="cell">
-                <a href="#178">178</a>
+                <a href="#182">182</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2881,9 +2945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="179"
+                id="183"
                 role="cell">
-                <a href="#179">179</a>
+                <a href="#183">183</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2897,9 +2961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="180"
+                id="184"
                 role="cell">
-                <a href="#180">180</a>
+                <a href="#184">184</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -2913,9 +2977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="181"
+                id="185"
                 role="cell">
-                <a href="#181">181</a>
+                <a href="#185">185</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2929,9 +2993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="182"
+                id="186"
                 role="cell">
-                <a href="#182">182</a>
+                <a href="#186">186</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2945,9 +3009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="183"
+                id="187"
                 role="cell">
-                <a href="#183">183</a>
+                <a href="#187">187</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2961,9 +3025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="184"
+                id="188"
                 role="cell">
-                <a href="#184">184</a>
+                <a href="#188">188</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2977,9 +3041,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="185"
+                id="189"
                 role="cell">
-                <a href="#185">185</a>
+                <a href="#189">189</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -2993,9 +3057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="186"
+                id="190"
                 role="cell">
-                <a href="#186">186</a>
+                <a href="#190">190</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3009,9 +3073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="187"
+                id="191"
                 role="cell">
-                <a href="#187">187</a>
+                <a href="#191">191</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3025,9 +3089,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="188"
+                id="192"
                 role="cell">
-                <a href="#188">188</a>
+                <a href="#192">192</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3041,9 +3105,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="189"
+                id="193"
                 role="cell">
-                <a href="#189">189</a>
+                <a href="#193">193</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3057,9 +3121,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="190"
+                id="194"
                 role="cell">
-                <a href="#190">190</a>
+                <a href="#194">194</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3073,9 +3137,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="191"
+                id="195"
                 role="cell">
-                <a href="#191">191</a>
+                <a href="#195">195</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3089,9 +3153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="192"
+                id="196"
                 role="cell">
-                <a href="#192">192</a>
+                <a href="#196">196</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3105,9 +3169,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="193"
+                id="197"
                 role="cell">
-                <a href="#193">193</a>
+                <a href="#197">197</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3121,9 +3185,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="194"
+                id="198"
                 role="cell">
-                <a href="#194">194</a>
+                <a href="#198">198</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3137,9 +3201,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="195"
+                id="199"
                 role="cell">
-                <a href="#195">195</a>
+                <a href="#199">199</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3153,9 +3217,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="196"
+                id="200"
                 role="cell">
-                <a href="#196">196</a>
+                <a href="#200">200</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3169,9 +3233,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="197"
+                id="201"
                 role="cell">
-                <a href="#197">197</a>
+                <a href="#201">201</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3185,9 +3249,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="198"
+                id="202"
                 role="cell">
-                <a href="#198">198</a>
+                <a href="#202">202</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3201,9 +3265,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="199"
+                id="203"
                 role="cell">
-                <a href="#199">199</a>
+                <a href="#203">203</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3217,9 +3281,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="200"
+                id="204"
                 role="cell">
-                <a href="#200">200</a>
+                <a href="#204">204</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3233,9 +3297,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="201"
+                id="205"
                 role="cell">
-                <a href="#201">201</a>
+                <a href="#205">205</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3249,9 +3313,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="202"
+                id="206"
                 role="cell">
-                <a href="#202">202</a>
+                <a href="#206">206</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3265,9 +3329,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="203"
+                id="207"
                 role="cell">
-                <a href="#203">203</a>
+                <a href="#207">207</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3281,9 +3345,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="204"
+                id="208"
                 role="cell">
-                <a href="#204">204</a>
+                <a href="#208">208</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3297,9 +3361,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="205"
+                id="209"
                 role="cell">
-                <a href="#205">205</a>
+                <a href="#209">209</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3313,9 +3377,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="206"
+                id="210"
                 role="cell">
-                <a href="#206">206</a>
+                <a href="#210">210</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -3329,9 +3393,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="207"
+                id="211"
                 role="cell">
-                <a href="#207">207</a>
+                <a href="#211">211</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3345,9 +3409,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="208"
+                id="212"
                 role="cell">
-                <a href="#208">208</a>
+                <a href="#212">212</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3361,9 +3425,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="209"
+                id="213"
                 role="cell">
-                <a href="#209">209</a>
+                <a href="#213">213</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3377,9 +3441,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="210"
+                id="214"
                 role="cell">
-                <a href="#210">210</a>
+                <a href="#214">214</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3393,9 +3457,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="211"
+                id="215"
                 role="cell">
-                <a href="#211">211</a>
+                <a href="#215">215</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3409,9 +3473,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="212"
+                id="216"
                 role="cell">
-                <a href="#212">212</a>
+                <a href="#216">216</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3425,9 +3489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="213"
+                id="217"
                 role="cell">
-                <a href="#213">213</a>
+                <a href="#217">217</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3441,9 +3505,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="214"
+                id="218"
                 role="cell">
-                <a href="#214">214</a>
+                <a href="#218">218</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3457,9 +3521,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="215"
+                id="219"
                 role="cell">
-                <a href="#215">215</a>
+                <a href="#219">219</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3473,9 +3537,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="216"
+                id="220"
                 role="cell">
-                <a href="#216">216</a>
+                <a href="#220">220</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3489,9 +3553,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="217"
+                id="221"
                 role="cell">
-                <a href="#217">217</a>
+                <a href="#221">221</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3505,9 +3569,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="218"
+                id="222"
                 role="cell">
-                <a href="#218">218</a>
+                <a href="#222">222</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3521,9 +3585,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="219"
+                id="223"
                 role="cell">
-                <a href="#219">219</a>
+                <a href="#223">223</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3537,9 +3601,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="220"
+                id="224"
                 role="cell">
-                <a href="#220">220</a>
+                <a href="#224">224</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3553,9 +3617,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="221"
+                id="225"
                 role="cell">
-                <a href="#221">221</a>
+                <a href="#225">225</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3569,9 +3633,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="222"
+                id="226"
                 role="cell">
-                <a href="#222">222</a>
+                <a href="#226">226</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3585,9 +3649,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="223"
+                id="227"
                 role="cell">
-                <a href="#223">223</a>
+                <a href="#227">227</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3601,9 +3665,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="224"
+                id="228"
                 role="cell">
-                <a href="#224">224</a>
+                <a href="#228">228</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3617,9 +3681,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="225"
+                id="229"
                 role="cell">
-                <a href="#225">225</a>
+                <a href="#229">229</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3633,9 +3697,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="226"
+                id="230"
                 role="cell">
-                <a href="#226">226</a>
+                <a href="#230">230</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3649,9 +3713,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="227"
+                id="231"
                 role="cell">
-                <a href="#227">227</a>
+                <a href="#231">231</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3665,9 +3729,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="228"
+                id="232"
                 role="cell">
-                <a href="#228">228</a>
+                <a href="#232">232</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3681,9 +3745,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="229"
+                id="233"
                 role="cell">
-                <a href="#229">229</a>
+                <a href="#233">233</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3697,9 +3761,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="230"
+                id="234"
                 role="cell">
-                <a href="#230">230</a>
+                <a href="#234">234</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3713,9 +3777,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="231"
+                id="235"
                 role="cell">
-                <a href="#231">231</a>
+                <a href="#235">235</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3729,9 +3793,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="232"
+                id="236"
                 role="cell">
-                <a href="#232">232</a>
+                <a href="#236">236</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3745,9 +3809,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="233"
+                id="237"
                 role="cell">
-                <a href="#233">233</a>
+                <a href="#237">237</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3761,9 +3825,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="234"
+                id="238"
                 role="cell">
-                <a href="#234">234</a>
+                <a href="#238">238</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3777,9 +3841,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="235"
+                id="239"
                 role="cell">
-                <a href="#235">235</a>
+                <a href="#239">239</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3793,9 +3857,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="236"
+                id="240"
                 role="cell">
-                <a href="#236">236</a>
+                <a href="#240">240</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3809,9 +3873,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="237"
+                id="241"
                 role="cell">
-                <a href="#237">237</a>
+                <a href="#241">241</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3825,9 +3889,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="238"
+                id="242"
                 role="cell">
-                <a href="#238">238</a>
+                <a href="#242">242</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3841,9 +3905,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="239"
+                id="243"
                 role="cell">
-                <a href="#239">239</a>
+                <a href="#243">243</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3857,9 +3921,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="240"
+                id="244"
                 role="cell">
-                <a href="#240">240</a>
+                <a href="#244">244</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3873,9 +3937,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="241"
+                id="245"
                 role="cell">
-                <a href="#241">241</a>
+                <a href="#245">245</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3889,9 +3953,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="242"
+                id="246"
                 role="cell">
-                <a href="#242">242</a>
+                <a href="#246">246</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3905,9 +3969,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="243"
+                id="247"
                 role="cell">
-                <a href="#243">243</a>
+                <a href="#247">247</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3921,9 +3985,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="244"
+                id="248"
                 role="cell">
-                <a href="#244">244</a>
+                <a href="#248">248</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3937,9 +4001,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="245"
+                id="249"
                 role="cell">
-                <a href="#245">245</a>
+                <a href="#249">249</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3953,9 +4017,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="246"
+                id="250"
                 role="cell">
-                <a href="#246">246</a>
+                <a href="#250">250</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -3969,9 +4033,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="247"
+                id="251"
                 role="cell">
-                <a href="#247">247</a>
+                <a href="#251">251</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -3985,9 +4049,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="248"
+                id="252"
                 role="cell">
-                <a href="#248">248</a>
+                <a href="#252">252</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4001,9 +4065,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="249"
+                id="253"
                 role="cell">
-                <a href="#249">249</a>
+                <a href="#253">253</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4017,9 +4081,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="250"
+                id="254"
                 role="cell">
-                <a href="#250">250</a>
+                <a href="#254">254</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4033,9 +4097,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="251"
+                id="255"
                 role="cell">
-                <a href="#251">251</a>
+                <a href="#255">255</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4049,9 +4113,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="252"
+                id="256"
                 role="cell">
-                <a href="#252">252</a>
+                <a href="#256">256</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4065,9 +4129,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="253"
+                id="257"
                 role="cell">
-                <a href="#253">253</a>
+                <a href="#257">257</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4081,9 +4145,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="254"
+                id="258"
                 role="cell">
-                <a href="#254">254</a>
+                <a href="#258">258</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4097,9 +4161,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="255"
+                id="259"
                 role="cell">
-                <a href="#255">255</a>
+                <a href="#259">259</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4113,9 +4177,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="256"
+                id="260"
                 role="cell">
-                <a href="#256">256</a>
+                <a href="#260">260</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4129,9 +4193,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="257"
+                id="261"
                 role="cell">
-                <a href="#257">257</a>
+                <a href="#261">261</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4145,9 +4209,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="258"
+                id="262"
                 role="cell">
-                <a href="#258">258</a>
+                <a href="#262">262</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4161,9 +4225,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="259"
+                id="263"
                 role="cell">
-                <a href="#259">259</a>
+                <a href="#263">263</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4177,9 +4241,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="260"
+                id="264"
                 role="cell">
-                <a href="#260">260</a>
+                <a href="#264">264</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4193,9 +4257,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="261"
+                id="265"
                 role="cell">
-                <a href="#261">261</a>
+                <a href="#265">265</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4209,9 +4273,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="262"
+                id="266"
                 role="cell">
-                <a href="#262">262</a>
+                <a href="#266">266</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4225,9 +4289,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="263"
+                id="267"
                 role="cell">
-                <a href="#263">263</a>
+                <a href="#267">267</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4241,9 +4305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="264"
+                id="268"
                 role="cell">
-                <a href="#264">264</a>
+                <a href="#268">268</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4257,9 +4321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="265"
+                id="269"
                 role="cell">
-                <a href="#265">265</a>
+                <a href="#269">269</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4273,9 +4337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="266"
+                id="270"
                 role="cell">
-                <a href="#266">266</a>
+                <a href="#270">270</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4289,9 +4353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="267"
+                id="271"
                 role="cell">
-                <a href="#267">267</a>
+                <a href="#271">271</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4305,9 +4369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="268"
+                id="272"
                 role="cell">
-                <a href="#268">268</a>
+                <a href="#272">272</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4321,9 +4385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="269"
+                id="273"
                 role="cell">
-                <a href="#269">269</a>
+                <a href="#273">273</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4337,9 +4401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="270"
+                id="274"
                 role="cell">
-                <a href="#270">270</a>
+                <a href="#274">274</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4353,9 +4417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="271"
+                id="275"
                 role="cell">
-                <a href="#271">271</a>
+                <a href="#275">275</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4369,9 +4433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="272"
+                id="276"
                 role="cell">
-                <a href="#272">272</a>
+                <a href="#276">276</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4385,9 +4449,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="273"
+                id="277"
                 role="cell">
-                <a href="#273">273</a>
+                <a href="#277">277</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4401,9 +4465,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="274"
+                id="278"
                 role="cell">
-                <a href="#274">274</a>
+                <a href="#278">278</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4417,9 +4481,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="275"
+                id="279"
                 role="cell">
-                <a href="#275">275</a>
+                <a href="#279">279</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4433,9 +4497,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="276"
+                id="280"
                 role="cell">
-                <a href="#276">276</a>
+                <a href="#280">280</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4449,9 +4513,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="277"
+                id="281"
                 role="cell">
-                <a href="#277">277</a>
+                <a href="#281">281</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4465,9 +4529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="278"
+                id="282"
                 role="cell">
-                <a href="#278">278</a>
+                <a href="#282">282</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4481,9 +4545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="279"
+                id="283"
                 role="cell">
-                <a href="#279">279</a>
+                <a href="#283">283</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4497,9 +4561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="280"
+                id="284"
                 role="cell">
-                <a href="#280">280</a>
+                <a href="#284">284</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4513,9 +4577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="281"
+                id="285"
                 role="cell">
-                <a href="#281">281</a>
+                <a href="#285">285</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4529,9 +4593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="282"
+                id="286"
                 role="cell">
-                <a href="#282">282</a>
+                <a href="#286">286</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4545,9 +4609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="283"
+                id="287"
                 role="cell">
-                <a href="#283">283</a>
+                <a href="#287">287</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4561,9 +4625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="284"
+                id="288"
                 role="cell">
-                <a href="#284">284</a>
+                <a href="#288">288</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4577,9 +4641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="285"
+                id="289"
                 role="cell">
-                <a href="#285">285</a>
+                <a href="#289">289</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4593,9 +4657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="286"
+                id="290"
                 role="cell">
-                <a href="#286">286</a>
+                <a href="#290">290</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4609,9 +4673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="287"
+                id="291"
                 role="cell">
-                <a href="#287">287</a>
+                <a href="#291">291</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4625,9 +4689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="288"
+                id="292"
                 role="cell">
-                <a href="#288">288</a>
+                <a href="#292">292</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4641,9 +4705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="289"
+                id="293"
                 role="cell">
-                <a href="#289">289</a>
+                <a href="#293">293</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4657,9 +4721,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="290"
+                id="294"
                 role="cell">
-                <a href="#290">290</a>
+                <a href="#294">294</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4673,9 +4737,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="291"
+                id="295"
                 role="cell">
-                <a href="#291">291</a>
+                <a href="#295">295</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4689,9 +4753,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="292"
+                id="296"
                 role="cell">
-                <a href="#292">292</a>
+                <a href="#296">296</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4705,9 +4769,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="293"
+                id="297"
                 role="cell">
-                <a href="#293">293</a>
+                <a href="#297">297</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4721,9 +4785,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="294"
+                id="298"
                 role="cell">
-                <a href="#294">294</a>
+                <a href="#298">298</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4737,9 +4801,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="295"
+                id="299"
                 role="cell">
-                <a href="#295">295</a>
+                <a href="#299">299</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4753,9 +4817,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="296"
+                id="300"
                 role="cell">
-                <a href="#296">296</a>
+                <a href="#300">300</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4769,9 +4833,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="297"
+                id="301"
                 role="cell">
-                <a href="#297">297</a>
+                <a href="#301">301</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4785,9 +4849,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="298"
+                id="302"
                 role="cell">
-                <a href="#298">298</a>
+                <a href="#302">302</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4801,9 +4865,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="299"
+                id="303"
                 role="cell">
-                <a href="#299">299</a>
+                <a href="#303">303</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4817,9 +4881,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="300"
+                id="304"
                 role="cell">
-                <a href="#300">300</a>
+                <a href="#304">304</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4833,9 +4897,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="301"
+                id="305"
                 role="cell">
-                <a href="#301">301</a>
+                <a href="#305">305</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4849,9 +4913,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="302"
+                id="306"
                 role="cell">
-                <a href="#302">302</a>
+                <a href="#306">306</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4865,9 +4929,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="303"
+                id="307"
                 role="cell">
-                <a href="#303">303</a>
+                <a href="#307">307</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4881,9 +4945,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="304"
+                id="308"
                 role="cell">
-                <a href="#304">304</a>
+                <a href="#308">308</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4897,9 +4961,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="305"
+                id="309"
                 role="cell">
-                <a href="#305">305</a>
+                <a href="#309">309</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4913,9 +4977,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="306"
+                id="310"
                 role="cell">
-                <a href="#306">306</a>
+                <a href="#310">310</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4929,9 +4993,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="307"
+                id="311"
                 role="cell">
-                <a href="#307">307</a>
+                <a href="#311">311</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4945,9 +5009,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="308"
+                id="312"
                 role="cell">
-                <a href="#308">308</a>
+                <a href="#312">312</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4961,9 +5025,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="309"
+                id="313"
                 role="cell">
-                <a href="#309">309</a>
+                <a href="#313">313</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4977,9 +5041,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="310"
+                id="314"
                 role="cell">
-                <a href="#310">310</a>
+                <a href="#314">314</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -4993,9 +5057,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="311"
+                id="315"
                 role="cell">
-                <a href="#311">311</a>
+                <a href="#315">315</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5009,9 +5073,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="312"
+                id="316"
                 role="cell">
-                <a href="#312">312</a>
+                <a href="#316">316</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5025,9 +5089,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="313"
+                id="317"
                 role="cell">
-                <a href="#313">313</a>
+                <a href="#317">317</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5041,9 +5105,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="314"
+                id="318"
                 role="cell">
-                <a href="#314">314</a>
+                <a href="#318">318</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5057,9 +5121,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="315"
+                id="319"
                 role="cell">
-                <a href="#315">315</a>
+                <a href="#319">319</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5073,9 +5137,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="316"
+                id="320"
                 role="cell">
-                <a href="#316">316</a>
+                <a href="#320">320</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5089,9 +5153,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="317"
+                id="321"
                 role="cell">
-                <a href="#317">317</a>
+                <a href="#321">321</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5105,9 +5169,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="318"
+                id="322"
                 role="cell">
-                <a href="#318">318</a>
+                <a href="#322">322</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5121,9 +5185,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="319"
+                id="323"
                 role="cell">
-                <a href="#319">319</a>
+                <a href="#323">323</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5137,9 +5201,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="320"
+                id="324"
                 role="cell">
-                <a href="#320">320</a>
+                <a href="#324">324</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5153,9 +5217,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="321"
+                id="325"
                 role="cell">
-                <a href="#321">321</a>
+                <a href="#325">325</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5169,9 +5233,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="322"
+                id="326"
                 role="cell">
-                <a href="#322">322</a>
+                <a href="#326">326</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5185,9 +5249,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="323"
+                id="327"
                 role="cell">
-                <a href="#323">323</a>
+                <a href="#327">327</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5201,9 +5265,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="324"
+                id="328"
                 role="cell">
-                <a href="#324">324</a>
+                <a href="#328">328</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5217,9 +5281,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="325"
+                id="329"
                 role="cell">
-                <a href="#325">325</a>
+                <a href="#329">329</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5233,9 +5297,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="326"
+                id="330"
                 role="cell">
-                <a href="#326">326</a>
+                <a href="#330">330</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5249,9 +5313,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="327"
+                id="331"
                 role="cell">
-                <a href="#327">327</a>
+                <a href="#331">331</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5265,9 +5329,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="328"
+                id="332"
                 role="cell">
-                <a href="#328">328</a>
+                <a href="#332">332</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5281,9 +5345,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="329"
+                id="333"
                 role="cell">
-                <a href="#329">329</a>
+                <a href="#333">333</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5297,9 +5361,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="330"
+                id="334"
                 role="cell">
-                <a href="#330">330</a>
+                <a href="#334">334</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5313,9 +5377,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="331"
+                id="335"
                 role="cell">
-                <a href="#331">331</a>
+                <a href="#335">335</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5329,9 +5393,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="332"
+                id="336"
                 role="cell">
-                <a href="#332">332</a>
+                <a href="#336">336</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5345,9 +5409,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="333"
+                id="337"
                 role="cell">
-                <a href="#333">333</a>
+                <a href="#337">337</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5361,9 +5425,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="334"
+                id="338"
                 role="cell">
-                <a href="#334">334</a>
+                <a href="#338">338</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5377,9 +5441,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="335"
+                id="339"
                 role="cell">
-                <a href="#335">335</a>
+                <a href="#339">339</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5393,9 +5457,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="336"
+                id="340"
                 role="cell">
-                <a href="#336">336</a>
+                <a href="#340">340</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5409,9 +5473,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="337"
+                id="341"
                 role="cell">
-                <a href="#337">337</a>
+                <a href="#341">341</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5425,9 +5489,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="338"
+                id="342"
                 role="cell">
-                <a href="#338">338</a>
+                <a href="#342">342</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5441,9 +5505,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="339"
+                id="343"
                 role="cell">
-                <a href="#339">339</a>
+                <a href="#343">343</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5457,9 +5521,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="340"
+                id="344"
                 role="cell">
-                <a href="#340">340</a>
+                <a href="#344">344</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5473,9 +5537,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="341"
+                id="345"
                 role="cell">
-                <a href="#341">341</a>
+                <a href="#345">345</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5489,9 +5553,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="342"
+                id="346"
                 role="cell">
-                <a href="#342">342</a>
+                <a href="#346">346</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5505,9 +5569,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="343"
+                id="347"
                 role="cell">
-                <a href="#343">343</a>
+                <a href="#347">347</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
@@ -5521,9 +5585,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="344"
+                id="348"
                 role="cell">
-                <a href="#344">344</a>
+                <a href="#348">348</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5537,9 +5601,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="345"
+                id="349"
                 role="cell">
-                <a href="#345">345</a>
+                <a href="#349">349</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
diff --git a/coverage/main/crates/conjure_core/src/solver/index.html b/coverage/main/crates/conjure_core/src/solver/index.html
index ee9cc65752..4738520349 100644
--- a/coverage/main/crates/conjure_core/src/solver/index.html
+++ b/coverage/main/crates/conjure_core/src/solver/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="83 / 125">66.4 %</abbr></p>
+                <abbr title="112 / 160">70 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="11 / 105">10.48 %</abbr></p>
+                <abbr title="15 / 121">12.4 %</abbr></p>
         </div>
     </div>
 
@@ -46,20 +46,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="69.74789915966386"
+                value="72.72727272727273"
                 max="100">
-                69.75%
+                72.73%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            69.75%
+            72.73%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            83 / 119
+            112 / 154
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">11.11%</td>
-        <td class="has-text-centered has-background-danger p-2">11 / 99 </td>
+        <td class="has-text-centered has-background-danger p-2">13.04%</td>
+        <td class="has-text-centered has-background-danger p-2">15 / 115 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/crates/conjure_core/src/solver/mod.rs.html b/coverage/main/crates/conjure_core/src/solver/mod.rs.html
index a22f1da3d9..cc18b2d262 100644
--- a/coverage/main/crates/conjure_core/src/solver/mod.rs.html
+++ b/coverage/main/crates/conjure_core/src/solver/mod.rs.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="83 / 119">69.75 %</abbr></p>
+                <abbr title="112 / 154">72.73 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="11 / 99">11.11 %</abbr></p>
+                <abbr title="15 / 115">13.04 %</abbr></p>
         </div>
     </div>
 
@@ -1420,7 +1420,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::collections::HashMap;</pre>
+                <pre class="has-background-white py-0 px-2">use std::any::Any;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1436,7 +1436,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::error::Error;</pre>
+                <pre class="has-background-white py-0 px-2">use std::cell::OnceCell;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1452,7 +1452,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::fmt::{Debug, Display};</pre>
+                <pre class="has-background-white py-0 px-2">use std::collections::HashMap;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1468,7 +1468,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use std::time::Instant;</pre>
+                <pre class="has-background-white py-0 px-2">use std::error::Error;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1484,7 +1484,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use std::fmt::{Debug, Display};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1500,7 +1500,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use serde::{Deserialize, Serialize};</pre>
+                <pre class="has-background-white py-0 px-2">use std::rc::Rc;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1516,7 +1516,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use strum_macros::{Display, EnumIter, EnumString};</pre>
+                <pre class="has-background-white py-0 px-2">use std::sync::{Arc, RwLock};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1532,7 +1532,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use thiserror::Error;</pre>
+                <pre class="has-background-white py-0 px-2">use std::time::Instant;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1564,7 +1564,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
+                <pre class="has-background-white py-0 px-2">use serde::{Deserialize, Serialize};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1580,7 +1580,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
+                <pre class="has-background-white py-0 px-2">use strum_macros::{Display, EnumIter, EnumString};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1596,7 +1596,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use thiserror::Error;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1612,7 +1612,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use self::model_modifier::*;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1628,7 +1628,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use self::states::*;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::ast::{Constant, Name};</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1644,7 +1644,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">use self::stats::SolverStats;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::context::Context;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1660,7 +1660,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use crate::stats::SolverStats;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1676,7 +1676,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub mod adaptors;</pre>
+                <pre class="has-background-white py-0 px-2">use crate::Model;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1692,7 +1692,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub mod model_modifier;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1708,7 +1708,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub mod stats;</pre>
+                <pre class="has-background-white py-0 px-2">use self::model_modifier::ModelModifier;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1724,7 +1724,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">use self::states::*;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1740,7 +1740,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[doc(hidden)]</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1756,7 +1756,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">mod private;</pre>
+                <pre class="has-background-white py-0 px-2">pub mod adaptors;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1772,7 +1772,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">pub mod model_modifier;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1788,7 +1788,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub mod states;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1804,7 +1804,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">#[doc(hidden)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1820,7 +1820,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[derive(</pre>
+                <pre class="has-background-white py-0 px-2">mod private;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1830,13 +1830,13 @@
                 <a href="#113">113</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    Debug, EnumString, EnumIter, Display, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize,</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1852,7 +1852,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">)]</pre>
+                <pre class="has-background-white py-0 px-2">pub mod states;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1868,7 +1868,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub enum SolverFamily {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1884,7 +1884,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    SAT,</pre>
+                <pre class="has-background-white py-0 px-2">#[derive(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1894,13 +1894,13 @@
                 <a href="#117">117</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    Minion,</pre>
+                <pre class="has-background-danger-light py-0 px-2">    Debug, EnumString, EnumIter, Display, PartialEq, Eq, Hash, Clone, Copy, Serialize, Deserialize,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1916,7 +1916,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1932,7 +1932,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">pub enum SolverFamily {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1948,7 +1948,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The type for user-defined callbacks for use with [Solver].</pre>
+                <pre class="has-background-white py-0 px-2">    SAT,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1964,7 +1964,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    Minion,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1980,7 +1980,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Note that this enforces thread safety</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -1996,7 +1996,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub type SolverCallback = Box&lt;dyn Fn(HashMap&lt;Name, Constant&gt;) -&gt; bool + Send&gt;;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2012,7 +2012,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub type SolverMutCallback =</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The type for user-defined callbacks for use with [Solver].</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2028,7 +2028,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    Box&lt;dyn Fn(HashMap&lt;Name, Constant&gt;, Box&lt;dyn ModelModifier&gt;) -&gt; bool + Send&gt;;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2044,7 +2044,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Note that this enforces thread safety</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2060,7 +2060,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; A common interface for calling underlying solver APIs inside a [`Solver`].</pre>
+                <pre class="has-background-white py-0 px-2">pub type SolverCallback = Box&lt;dyn Fn(HashMap&lt;Name, Constant&gt;) -&gt; bool + Send&gt;;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2076,7 +2076,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">pub type SolverMutCallback =</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2092,7 +2092,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Implementations of this trait aren&#x27;t directly callable and should be used through [`Solver`] .</pre>
+                <pre class="has-background-white py-0 px-2">    Box&lt;dyn Fn(HashMap&lt;Name, Constant&gt;, Box&lt;dyn ModelModifier&gt;) -&gt; bool + Send&gt;;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2108,7 +2108,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2124,7 +2124,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The below documentation lists the formal requirements that all implementations of</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; A common interface for calling underlying solver APIs inside a [`Solver`].</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2140,7 +2140,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`SolverAdaptor`] should follow - **see the top level module documentation and [`Solver`] for</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2156,7 +2156,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; usage details.**</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Implementations of this trait aren&#x27;t directly callable and should be used through [`Solver`] .</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2188,7 +2188,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Encapsulation</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The below documentation lists the formal requirements that all implementations of</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2204,7 +2204,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  </pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`SolverAdaptor`] should follow - **see the top level module documentation and [`Solver`] for</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2220,7 +2220,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  The [`SolverAdaptor`] trait **must** only be implemented inside a submodule of this one,</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; usage details.**</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2236,7 +2236,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  and **should** only be called through [`Solver`].</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2252,7 +2252,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Encapsulation</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2268,7 +2268,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The `private::Sealed` trait and `private::Internal` type enforce these requirements by only</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  </pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2284,7 +2284,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; allowing trait implementations and calling of methods of SolverAdaptor to occur inside this</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  The [`SolverAdaptor`] trait **must** only be implemented inside a submodule of this one,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2300,7 +2300,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; module.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;  and **should** only be called through [`Solver`].</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2332,7 +2332,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Thread Safety</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; The `private::Sealed` trait and `private::Internal` type enforce these requirements by only</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2348,7 +2348,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; allowing trait implementations and calling of methods of SolverAdaptor to occur inside this</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2364,7 +2364,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Multiple instances of [`Solver`] can be run in parallel across multiple threads.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; module.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2396,7 +2396,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`Solver`] provides no concurrency control or thread-safety; therefore, adaptors **must**</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; # Thread Safety</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2412,7 +2412,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; ensure that multiple instances of themselves can be ran in parallel. This applies to all</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2428,7 +2428,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; stages of solving including having two active `solve()` calls happening at a time, loading</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Multiple instances of [`Solver`] can be run in parallel across multiple threads.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2444,7 +2444,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; a model while another is mid-solve, loading two models at once, etc.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2460,7 +2460,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`Solver`] provides no concurrency control or thread-safety; therefore, adaptors **must**</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2476,7 +2476,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; A [SolverAdaptor] **may** use whatever threading or process model it likes underneath the hood,</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; ensure that multiple instances of themselves can be ran in parallel. This applies to all</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2492,7 +2492,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; as long as it obeys the above.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; stages of solving including having two active `solve()` calls happening at a time, loading</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2508,7 +2508,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; a model while another is mid-solve, loading two models at once, etc.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2524,7 +2524,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Method calls **should** block instead of erroring where possible.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2540,7 +2540,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; A [SolverAdaptor] **may** use whatever threading or process model it likes underneath the hood,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2556,7 +2556,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Underlying solvers that only have one instance per process (such as Minion) **should** block</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; as long as it obeys the above.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2572,7 +2572,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; (eg. using a [`Mutex&lt;()&gt;`](`std::sync::Mutex`)) to run calls to</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2588,7 +2588,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`Solver&lt;A,ModelLoaded&gt;::solve()`] and [`Solver&lt;A,ModelLoaded&gt;::solve_mut()`] sequentially.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Method calls **should** block instead of erroring where possible.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2604,7 +2604,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub trait SolverAdaptor: private::Sealed {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2620,7 +2620,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Runs the solver on the given model.</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Underlying solvers that only have one instance per process (such as Minion) **should** block</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2636,7 +2636,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; (eg. using a [`Mutex&lt;()&gt;`](`std::sync::Mutex`)) to run calls to</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2652,7 +2652,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Implementations of this function **must** call the user provided callback whenever a solution</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [`Solver&lt;A,ModelLoaded&gt;::solve()`] and [`Solver&lt;A,ModelLoaded&gt;::solve_mut()`] sequentially.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2668,7 +2668,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; is found. If the user callback returns `true`, search should continue, if the user callback</pre>
+                <pre class="has-background-white py-0 px-2">pub trait SolverAdaptor: private::Sealed + Any {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2684,7 +2684,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; returns `false`, search should terminate.</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Runs the solver on the given model.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2716,7 +2716,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; # Returns</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Implementations of this function **must** call the user provided callback whenever a solution</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2732,7 +2732,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; is found. If the user callback returns `true`, search should continue, if the user callback</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2748,7 +2748,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; If the solver terminates without crashing a [SolveSuccess] struct **must** returned. The</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; returns `false`, search should terminate.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2764,7 +2764,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; value of [SearchStatus] can be used to denote whether the underlying solver completed its</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2780,7 +2780,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; search or not. The latter case covers most non-crashing &quot;failure&quot; cases including user</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; # Returns</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2796,7 +2796,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; termination, timeouts, etc.</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2812,7 +2812,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; If the solver terminates without crashing a [SolveSuccess] struct **must** returned. The</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2828,7 +2828,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; To help populate [SearchStatus], it may be helpful to implement counters that track if the</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; value of [SearchStatus] can be used to denote whether the underlying solver completed its</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2844,7 +2844,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; user callback has been called yet, and its return value. This information makes it is</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; search or not. The latter case covers most non-crashing &quot;failure&quot; cases including user</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2860,7 +2860,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; possible to distinguish between the most common search statuses:</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; termination, timeouts, etc.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2876,7 +2876,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [SearchComplete::HasSolutions], [SearchComplete::NoSolutions], and</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2892,7 +2892,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [SearchIncomplete::UserTerminated].</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; To help populate [SearchStatus], it may be helpful to implement counters that track if the</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2908,7 +2908,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    fn solve(</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; user callback has been called yet, and its return value. This information makes it is</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2924,7 +2924,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        &amp;mut self,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; possible to distinguish between the most common search statuses:</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2940,7 +2940,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        callback: SolverCallback,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [SearchComplete::HasSolutions], [SearchComplete::NoSolutions], and</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2956,7 +2956,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        _: private::Internal,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [SearchIncomplete::UserTerminated].</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2972,7 +2972,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    ) -&gt; Result&lt;SolveSuccess, SolverError&gt;;</pre>
+                <pre class="has-background-white py-0 px-2">    fn solve(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -2988,7 +2988,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">        &amp;mut self,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3004,7 +3004,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Runs the solver on the given model, allowing modification of the model through a</pre>
+                <pre class="has-background-white py-0 px-2">        callback: SolverCallback,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3020,7 +3020,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [`ModelModifier`].</pre>
+                <pre class="has-background-white py-0 px-2">        _: private::Internal,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3036,7 +3036,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    ) -&gt; Result&lt;SolveSuccess, SolverError&gt;;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3052,7 +3052,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Implementations of this function **must** return [`OpNotSupported`](`ModificationFailure::OpNotSupported`)</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3068,7 +3068,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; if modifying the model mid-search is not supported.</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Runs the solver on the given model, allowing modification of the model through a</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3084,7 +3084,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; [`ModelModifier`].</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3100,7 +3100,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Otherwise, this should work in the same way as [`solve`](SolverAdaptor::solve).</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3116,7 +3116,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    fn solve_mut(</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Implementations of this function **must** return [`OpNotSupported`](`ModificationFailure::OpNotSupported`)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3132,7 +3132,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        &amp;mut self,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; if modifying the model mid-search is not supported.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3148,7 +3148,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        callback: SolverMutCallback,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3164,7 +3164,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        _: private::Internal,</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Otherwise, this should work in the same way as [`solve`](SolverAdaptor::solve).</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3180,7 +3180,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    ) -&gt; Result&lt;SolveSuccess, SolverError&gt;;</pre>
+                <pre class="has-background-white py-0 px-2">    fn solve_mut(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3196,7 +3196,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    fn load_model(&amp;mut self, model: Model, _: private::Internal) -&gt; Result&lt;(), SolverError&gt;;</pre>
+                <pre class="has-background-white py-0 px-2">        &amp;mut self,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3206,13 +3206,13 @@
                 <a href="#199">199</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    fn init_solver(&amp;mut self, _: private::Internal) {}</pre>
+                <pre class="has-background-white py-0 px-2">        callback: SolverMutCallback,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3228,7 +3228,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">        _: private::Internal,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3244,7 +3244,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Get the solver family that this solver adaptor belongs to</pre>
+                <pre class="has-background-white py-0 px-2">    ) -&gt; Result&lt;SolveSuccess, SolverError&gt;;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3260,7 +3260,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    fn get_family(&amp;self) -&gt; SolverFamily;</pre>
+                <pre class="has-background-white py-0 px-2">    fn load_model(&amp;mut self, model: Model, _: private::Internal) -&gt; Result&lt;(), SolverError&gt;;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3270,13 +3270,13 @@
                 <a href="#203">203</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-success-light py-0 px-2">    fn init_solver(&amp;mut self, _: private::Internal) {}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3308,7 +3308,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; An abstract representation of a constraints solver.</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Get the solver family that this solver adaptor belongs to</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3324,7 +3324,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-white py-0 px-2">    fn get_family(&amp;self) -&gt; SolverFamily;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3340,7 +3340,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [Solver] provides a common interface for interacting with a constraint solver. It also</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3356,7 +3356,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; abstracts over solver-specific datatypes, handling the translation to&#x2F;from [conjure_core::ast]</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Gets the name of the solver adaptor for pretty printing.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3366,13 +3366,13 @@
                 <a href="#209">209</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; types for a model and its solutions.</pre>
+                <pre class="has-background-danger-light py-0 px-2">    fn get_name(&amp;self) -&gt; Option&lt;String&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3382,13 +3382,13 @@
                 <a href="#210">210</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-danger-light py-0 px-2">        None</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3398,13 +3398,13 @@
                 <a href="#211">211</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
                 
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Details of how a model is solved is specified by the [SolverAdaptor]. This includes: the</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3420,7 +3420,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; underlying solver used, the translation of the model to a solver compatible form, how solutions</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3436,7 +3436,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; are translated back to [conjure_core::ast] types, and how incremental solving is implemented.</pre>
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Adds the solver adaptor name and family (if they exist) to the given stats object.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3446,13 +3446,13 @@
                 <a href="#214">214</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; As such, there may be multiple [SolverAdaptor] implementations for a single underlying solver:</pre>
+                <pre class="has-background-success-light py-0 px-2">    fn add_adaptor_info_to_stats(&amp;self, stats: SolverStats) -&gt; SolverStats {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3462,13 +3462,13 @@
                 <a href="#215">215</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; e.g. one adaptor may give solutions in a representation close to the solvers, while another may</pre>
+                <pre class="has-background-success-light py-0 px-2">        SolverStats {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3478,13 +3478,13 @@
                 <a href="#216">216</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; attempt to rewrite it back into Essence.</pre>
+                <pre class="has-background-success-light py-0 px-2">            solver_adaptor: self.get_name(),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3494,13 +3494,13 @@
                 <a href="#217">217</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
+                <pre class="has-background-success-light py-0 px-2">            solver_family: Some(self.get_family()),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3510,13 +3510,13 @@
                 <a href="#218">218</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">#[derive(Clone)]</pre>
+                <pre class="has-background-success-light py-0 px-2">            ..stats</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3526,13 +3526,13 @@
                 <a href="#219">219</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">pub struct Solver&lt;A: SolverAdaptor, State: SolverState = Init&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">        }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3542,13 +3542,13 @@
                 <a href="#220">220</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    state: State,</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3564,7 +3564,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    adaptor: A,</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3580,7 +3580,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3596,7 +3596,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; An abstract representation of a constraints solver.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3612,7 +3612,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;Adaptor: SolverAdaptor&gt; Solver&lt;Adaptor&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3622,13 +3622,13 @@
                 <a href="#225">225</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn new(solver_adaptor: Adaptor) -&gt; Solver&lt;Adaptor&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; [Solver] provides a common interface for interacting with a constraint solver. It also</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3638,13 +3638,13 @@
                 <a href="#226">226</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let mut solver = Solver {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; abstracts over solver-specific datatypes, handling the translation to&#x2F;from [conjure_core::ast]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3654,13 +3654,13 @@
                 <a href="#227">227</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            state: Init,</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; types for a model and its solutions.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3670,13 +3670,13 @@
                 <a href="#228">228</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            adaptor: solver_adaptor,</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3686,13 +3686,13 @@
                 <a href="#229">229</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        };</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; Details of how a model is solved is specified by the [SolverAdaptor]. This includes: the</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3702,13 +3702,13 @@
                 <a href="#230">230</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; underlying solver used, the translation of the model to a solver compatible form, how solutions</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3718,13 +3718,13 @@
                 <a href="#231">231</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        solver.adaptor.init_solver(private::Internal);</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; are translated back to [conjure_core::ast] types, and how incremental solving is implemented.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3734,13 +3734,13 @@
                 <a href="#232">232</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        solver</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; As such, there may be multiple [SolverAdaptor] implementations for a single underlying solver:</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3750,13 +3750,13 @@
                 <a href="#233">233</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; e.g. one adaptor may give solutions in a representation close to the solvers, while another may</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3772,7 +3772,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F; attempt to rewrite it back into Essence.</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3782,13 +3782,13 @@
                 <a href="#235">235</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn get_family(&amp;self) -&gt; SolverFamily {</pre>
+                <pre class="has-background-white py-0 px-2">&#x2F;&#x2F;&#x2F;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3798,13 +3798,13 @@
                 <a href="#236">236</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.adaptor.get_family()</pre>
+                <pre class="has-background-white py-0 px-2">#[derive(Clone)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3814,13 +3814,13 @@
                 <a href="#237">237</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
                 
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-white py-0 px-2">pub struct Solver&lt;A: SolverAdaptor, State: SolverState = Init&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3836,7 +3836,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-white py-0 px-2">    state: State,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3852,7 +3852,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">    adaptor: A,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3868,7 +3868,7 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, Init&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">    context: Option&lt;Arc&lt;RwLock&lt;Context&lt;&#x27;static&gt;&gt;&gt;&gt;,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3878,13 +3878,13 @@
                 <a href="#241">241</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn load_model(mut self, model: Model) -&gt; Result&lt;Solver&lt;A, ModelLoaded&gt;, SolverError&gt; {</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3894,13 +3894,13 @@
                 <a href="#242">242</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let solver_model = &amp;mut self.adaptor.load_model(model, private::Internal)?;</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3910,13 +3910,13 @@
                 <a href="#243">243</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        Ok(Solver {</pre>
+                <pre class="has-background-white py-0 px-2">impl&lt;Adaptor: SolverAdaptor&gt; Solver&lt;Adaptor&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3927,12 +3927,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            state: ModelLoaded,</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn new(solver_adaptor: Adaptor) -&gt; Solver&lt;Adaptor&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3943,12 +3943,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            adaptor: self.adaptor,</pre>
+                <pre class="has-background-success-light py-0 px-2">        let mut solver = Solver {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3959,12 +3959,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        })</pre>
+                <pre class="has-background-success-light py-0 px-2">            state: Init,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3975,12 +3975,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">            adaptor: solver_adaptor,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -3990,13 +3990,13 @@
                 <a href="#248">248</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-success-light py-0 px-2">            context: None,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4006,13 +4006,13 @@
                 <a href="#249">249</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        };</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4022,13 +4022,13 @@
                 <a href="#250">250</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, ModelLoaded&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4039,12 +4039,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    pub fn solve(</pre>
+                <pre class="has-background-success-light py-0 px-2">        solver.adaptor.init_solver(private::Internal);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4055,12 +4055,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        mut self,</pre>
+                <pre class="has-background-success-light py-0 px-2">        solver</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4071,12 +4071,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        callback: SolverCallback,</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4086,13 +4086,13 @@
                 <a href="#254">254</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    ) -&gt; Result&lt;Solver&lt;A, ExecutionSuccess&gt;, SolverError&gt; {</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4102,13 +4102,13 @@
                 <a href="#255">255</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+                <pre class="has-background-danger-light py-0 px-2">    pub fn get_family(&amp;self) -&gt; SolverFamily {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4118,13 +4118,13 @@
                 <a href="#256">256</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let start_time = Instant::now();</pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.adaptor.get_family()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4134,13 +4134,13 @@
                 <a href="#257">257</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4150,13 +4150,13 @@
                 <a href="#258">258</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4166,13 +4166,13 @@
                 <a href="#259">259</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let result = self.adaptor.solve(callback, private::Internal);</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4182,13 +4182,13 @@
                 <a href="#260">260</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, Init&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4199,12 +4199,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        let duration = start_time.elapsed();</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn load_model(mut self, model: Model) -&gt; Result&lt;Solver&lt;A, ModelLoaded&gt;, SolverError&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4215,12 +4215,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        let solver_model = &amp;mut self.adaptor.load_model(model.clone(), private::Internal)?;</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4231,12 +4231,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">        match result {</pre>
+                <pre class="has-background-success-light py-0 px-2">        Ok(Solver {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4247,12 +4247,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            Ok(x) =&gt; Ok(Solver {</pre>
+                <pre class="has-background-success-light py-0 px-2">            state: ModelLoaded,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4263,12 +4263,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                adaptor: self.adaptor,</pre>
+                <pre class="has-background-success-light py-0 px-2">            adaptor: self.adaptor,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4279,12 +4279,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                state: ExecutionSuccess {</pre>
+                <pre class="has-background-success-light py-0 px-2">            context: Some(model.context.clone()),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4295,12 +4295,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                    stats: x.stats,</pre>
+                <pre class="has-background-success-light py-0 px-2">        })</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4311,12 +4311,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                    status: x.status,</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4326,13 +4326,13 @@
                 <a href="#269">269</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                    _sealed: private::Internal,</pre>
+                <pre class="has-background-white py-0 px-2">}</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4342,13 +4342,13 @@
                 <a href="#270">270</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                    wall_time_s: duration.as_secs_f64(),</pre>
+                <pre class="has-background-white py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4358,13 +4358,13 @@
                 <a href="#271">271</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
             </div>
-            <div class="column has-background-success-light p-0"
+            <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">                },</pre>
+                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, ModelLoaded&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4375,12 +4375,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">            }),</pre>
+                <pre class="has-background-success-light py-0 px-2">    pub fn solve(</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4390,13 +4390,13 @@
                 <a href="#273">273</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            Err(x) =&gt; Err(x),</pre>
+                <pre class="has-background-success-light py-0 px-2">        mut self,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4406,13 +4406,13 @@
                 <a href="#274">274</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        }</pre>
+                <pre class="has-background-success-light py-0 px-2">        callback: SolverCallback,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4423,12 +4423,12 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="45">
-                45
+                role="cell" aria-label="56">
+                56
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-success-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    ) -&gt; Result&lt;Solver&lt;A, ExecutionSuccess&gt;, SolverError&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4438,13 +4438,13 @@
                 <a href="#276">276</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4454,13 +4454,13 @@
                 <a href="#277">277</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn solve_mut(</pre>
+                <pre class="has-background-success-light py-0 px-2">        let start_time = Instant::now();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4470,13 +4470,13 @@
                 <a href="#278">278</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        mut self,</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4486,13 +4486,13 @@
                 <a href="#279">279</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        callback: SolverMutCallback,</pre>
+                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4502,13 +4502,13 @@
                 <a href="#280">280</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    ) -&gt; Result&lt;Solver&lt;A, ExecutionSuccess&gt;, SolverError&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">        let result = self.adaptor.solve(callback, private::Internal);</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4518,13 +4518,13 @@
                 <a href="#281">281</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4534,13 +4534,13 @@
                 <a href="#282">282</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let start_time = Instant::now();</pre>
+                <pre class="has-background-success-light py-0 px-2">        let duration = start_time.elapsed();</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4550,13 +4550,13 @@
                 <a href="#283">283</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2"></pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4566,13 +4566,13 @@
                 <a href="#284">284</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+                <pre class="has-background-success-light py-0 px-2">        match result {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4582,13 +4582,13 @@
                 <a href="#285">285</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let result = self.adaptor.solve_mut(callback, private::Internal);</pre>
+                <pre class="has-background-success-light py-0 px-2">            Ok(x) =&gt; {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4598,13 +4598,13 @@
                 <a href="#286">286</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">                let stats = self</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4614,13 +4614,13 @@
                 <a href="#287">287</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        let duration = start_time.elapsed();</pre>
+                <pre class="has-background-success-light py-0 px-2">                    .adaptor</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
@@ -4630,7 +4630,567 @@
                 <a href="#288">288</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    .add_adaptor_info_to_stats(x.stats)</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="289"
+                role="cell">
+                <a href="#289">289</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    .with_timings(duration.as_secs_f64());</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="290"
+                role="cell">
+                <a href="#290">290</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="291"
+                role="cell">
+                <a href="#291">291</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                Ok(Solver {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="292"
+                role="cell">
+                <a href="#292">292</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    adaptor: self.adaptor,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="293"
+                role="cell">
+                <a href="#293">293</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    state: ExecutionSuccess {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="294"
+                role="cell">
+                <a href="#294">294</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                        stats,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="295"
+                role="cell">
+                <a href="#295">295</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                        status: x.status,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="296"
+                role="cell">
+                <a href="#296">296</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                        _sealed: private::Internal,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="297"
+                role="cell">
+                <a href="#297">297</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    },</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="298"
+                role="cell">
+                <a href="#298">298</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                    context: self.context,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="299"
+                role="cell">
+                <a href="#299">299</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">                })</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="300"
+                role="cell">
+                <a href="#300">300</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">            }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="301"
+                role="cell">
+                <a href="#301">301</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">            Err(x) =&gt; Err(x),</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="302"
+                role="cell">
+                <a href="#302">302</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">        }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="303"
+                role="cell">
+                <a href="#303">303</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="56">
+                56
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="304"
+                role="cell">
+                <a href="#304">304</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="305"
+                role="cell">
+                <a href="#305">305</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">    pub fn solve_mut(</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="306"
+                role="cell">
+                <a href="#306">306</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        mut self,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="307"
+                role="cell">
+                <a href="#307">307</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        callback: SolverMutCallback,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="308"
+                role="cell">
+                <a href="#308">308</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">    ) -&gt; Result&lt;Solver&lt;A, ExecutionSuccess&gt;, SolverError&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="309"
+                role="cell">
+                <a href="#309">309</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="310"
+                role="cell">
+                <a href="#310">310</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        let start_time = Instant::now();</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="311"
+                role="cell">
+                <a href="#311">311</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="312"
+                role="cell">
+                <a href="#312">312</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="313"
+                role="cell">
+                <a href="#313">313</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        let result = self.adaptor.solve_mut(callback, private::Internal);</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="314"
+                role="cell">
+                <a href="#314">314</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="315"
+                role="cell">
+                <a href="#315">315</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        let duration = start_time.elapsed();</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="316"
+                role="cell">
+                <a href="#316">316</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="317"
+                role="cell">
+                <a href="#317">317</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        match result {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="318"
+                role="cell">
+                <a href="#318">318</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">            Ok(x) =&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="319"
+                role="cell">
+                <a href="#319">319</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">                let stats = self</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="320"
+                role="cell">
+                <a href="#320">320</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">                    .adaptor</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="321"
+                role="cell">
+                <a href="#321">321</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">                    .add_adaptor_info_to_stats(x.stats)</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="322"
+                role="cell">
+                <a href="#322">322</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">                    .with_timings(duration.as_secs_f64());</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="323"
+                role="cell">
+                <a href="#323">323</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
                 role="cell" aria-label="0">
                 
             </div>
@@ -4641,9 +5201,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="289"
+                id="324"
                 role="cell">
-                <a href="#289">289</a>
+                <a href="#324">324</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4652,14 +5212,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        match result {</pre>
+                <pre class="has-background-danger-light py-0 px-2">                Ok(Solver {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="290"
+                id="325"
                 role="cell">
-                <a href="#290">290</a>
+                <a href="#325">325</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4668,14 +5228,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            Ok(x) =&gt; Ok(Solver {</pre>
+                <pre class="has-background-danger-light py-0 px-2">                    adaptor: self.adaptor,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="291"
+                id="326"
                 role="cell">
-                <a href="#291">291</a>
+                <a href="#326">326</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4684,14 +5244,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                adaptor: self.adaptor,</pre>
+                <pre class="has-background-danger-light py-0 px-2">                    state: ExecutionSuccess {</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="292"
+                id="327"
                 role="cell">
-                <a href="#292">292</a>
+                <a href="#327">327</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4700,14 +5260,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                state: ExecutionSuccess {</pre>
+                <pre class="has-background-danger-light py-0 px-2">                        stats,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="293"
+                id="328"
                 role="cell">
-                <a href="#293">293</a>
+                <a href="#328">328</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4716,14 +5276,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                    stats: x.stats,</pre>
+                <pre class="has-background-danger-light py-0 px-2">                        status: x.status,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="294"
+                id="329"
                 role="cell">
-                <a href="#294">294</a>
+                <a href="#329">329</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4732,14 +5292,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                    status: x.status,</pre>
+                <pre class="has-background-danger-light py-0 px-2">                        _sealed: private::Internal,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="295"
+                id="330"
                 role="cell">
-                <a href="#295">295</a>
+                <a href="#330">330</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4748,14 +5308,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                    _sealed: private::Internal,</pre>
+                <pre class="has-background-danger-light py-0 px-2">                    },</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="296"
+                id="331"
                 role="cell">
-                <a href="#296">296</a>
+                <a href="#331">331</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4764,14 +5324,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                    wall_time_s: duration.as_secs_f64(),</pre>
+                <pre class="has-background-danger-light py-0 px-2">                    context: self.context,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="297"
+                id="332"
                 role="cell">
-                <a href="#297">297</a>
+                <a href="#332">332</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4780,14 +5340,30 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">                },</pre>
+                <pre class="has-background-danger-light py-0 px-2">                })</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="298"
+                id="333"
                 role="cell">
-                <a href="#298">298</a>
+                <a href="#333">333</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">            }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="334"
+                role="cell">
+                <a href="#334">334</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4796,14 +5372,30 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            }),</pre>
+                <pre class="has-background-danger-light py-0 px-2">            Err(x) =&gt; Err(x),</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="299"
+                id="335"
                 role="cell">
-                <a href="#299">299</a>
+                <a href="#335">335</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">        }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="336"
+                role="cell">
+                <a href="#336">336</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4812,142 +5404,318 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">            Err(x) =&gt; Err(x),</pre>
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="300"
+                id="337"
                 role="cell">
-                <a href="#300">300</a>
+                <a href="#337">337</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="338"
+                role="cell">
+                <a href="#338">338</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="339"
+                role="cell">
+                <a href="#339">339</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, ExecutionSuccess&gt; {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="340"
+                role="cell">
+                <a href="#340">340</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    pub fn stats(&amp;self) -&gt; SolverStats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="341"
+                role="cell">
+                <a href="#341">341</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        self.state.stats.clone()</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="342"
+                role="cell">
+                <a href="#342">342</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="343"
+                role="cell">
+                <a href="#343">343</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="344"
+                role="cell">
+                <a href="#344">344</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Saves this solvers stats to the global context as a &quot;solver run&quot;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="345"
+                role="cell">
+                <a href="#345">345</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    pub fn save_stats_to_context(&amp;self) {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="346"
+                role="cell">
+                <a href="#346">346</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::unwrap_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="347"
+                role="cell">
+                <a href="#347">347</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        #[allow(clippy::expect_used)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="348"
+                role="cell">
+                <a href="#348">348</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">        }</pre>
+                <pre class="has-background-success-light py-0 px-2">        self.context</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="301"
+                id="349"
                 role="cell">
-                <a href="#301">301</a>
+                <a href="#349">349</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">            .as_ref()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="302"
+                id="350"
                 role="cell">
-                <a href="#302">302</a>
+                <a href="#350">350</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">}</pre>
+                <pre class="has-background-success-light py-0 px-2">            .expect(&quot;&quot;)</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="303"
+                id="351"
                 role="cell">
-                <a href="#303">303</a>
+                <a href="#351">351</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2"></pre>
+                <pre class="has-background-success-light py-0 px-2">            .write()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="304"
+                id="352"
                 role="cell">
-                <a href="#304">304</a>
+                <a href="#352">352</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
-                role="cell" aria-label="no coverage">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-white p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">impl&lt;A: SolverAdaptor&gt; Solver&lt;A, ExecutionSuccess&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">            .unwrap()</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="305"
+                id="353"
                 role="cell">
-                <a href="#305">305</a>
+                <a href="#353">353</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    pub fn stats(self) -&gt; Option&lt;Box&lt;dyn SolverStats&gt;&gt; {</pre>
+                <pre class="has-background-success-light py-0 px-2">            .stats</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="306"
+                id="354"
                 role="cell">
-                <a href="#306">306</a>
+                <a href="#354">354</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.state.stats</pre>
+                <pre class="has-background-success-light py-0 px-2">            .add_solver_run(self.stats());</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="307"
+                id="355"
                 role="cell">
-                <a href="#307">307</a>
+                <a href="#355">355</a>
             </div>
             <div
-                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
-                role="cell" aria-label="0">
-                
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="45">
+                45
             </div>
-            <div class="column has-background-danger-light p-0"
+            <div class="column has-background-success-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="308"
+                id="356"
                 role="cell">
-                <a href="#308">308</a>
+                <a href="#356">356</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -4961,9 +5729,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="309"
+                id="357"
                 role="cell">
-                <a href="#309">309</a>
+                <a href="#357">357</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4977,9 +5745,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="310"
+                id="358"
                 role="cell">
-                <a href="#310">310</a>
+                <a href="#358">358</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -4988,14 +5756,14 @@
             </div>
             <div class="column has-background-danger-light p-0"
                  role="cell">
-                <pre class="has-background-danger-light py-0 px-2">        self.state.wall_time_s</pre>
+                <pre class="has-background-danger-light py-0 px-2">        self.stats().conjure_solver_wall_time_s</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="311"
+                id="359"
                 role="cell">
-                <a href="#311">311</a>
+                <a href="#359">359</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5009,9 +5777,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="312"
+                id="360"
                 role="cell">
-                <a href="#312">312</a>
+                <a href="#360">360</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5025,9 +5793,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="313"
+                id="361"
                 role="cell">
-                <a href="#313">313</a>
+                <a href="#361">361</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5041,9 +5809,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="314"
+                id="362"
                 role="cell">
-                <a href="#314">314</a>
+                <a href="#362">362</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5057,9 +5825,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="315"
+                id="363"
                 role="cell">
-                <a href="#315">315</a>
+                <a href="#363">363</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5073,9 +5841,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="316"
+                id="364"
                 role="cell">
-                <a href="#316">316</a>
+                <a href="#364">364</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
@@ -5089,9 +5857,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="317"
+                id="365"
                 role="cell">
-                <a href="#317">317</a>
+                <a href="#365">365</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5105,9 +5873,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="318"
+                id="366"
                 role="cell">
-                <a href="#318">318</a>
+                <a href="#366">366</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5121,9 +5889,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="319"
+                id="367"
                 role="cell">
-                <a href="#319">319</a>
+                <a href="#367">367</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5137,9 +5905,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="320"
+                id="368"
                 role="cell">
-                <a href="#320">320</a>
+                <a href="#368">368</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5153,9 +5921,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="321"
+                id="369"
                 role="cell">
-                <a href="#321">321</a>
+                <a href="#369">369</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5169,9 +5937,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="322"
+                id="370"
                 role="cell">
-                <a href="#322">322</a>
+                <a href="#370">370</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5185,9 +5953,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="323"
+                id="371"
                 role="cell">
-                <a href="#323">323</a>
+                <a href="#371">371</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5201,9 +5969,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="324"
+                id="372"
                 role="cell">
-                <a href="#324">324</a>
+                <a href="#372">372</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5217,9 +5985,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="325"
+                id="373"
                 role="cell">
-                <a href="#325">325</a>
+                <a href="#373">373</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5233,9 +6001,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="326"
+                id="374"
                 role="cell">
-                <a href="#326">326</a>
+                <a href="#374">374</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5249,9 +6017,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="327"
+                id="375"
                 role="cell">
-                <a href="#327">327</a>
+                <a href="#375">375</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5265,9 +6033,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="328"
+                id="376"
                 role="cell">
-                <a href="#328">328</a>
+                <a href="#376">376</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5281,9 +6049,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="329"
+                id="377"
                 role="cell">
-                <a href="#329">329</a>
+                <a href="#377">377</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5297,9 +6065,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="330"
+                id="378"
                 role="cell">
-                <a href="#330">330</a>
+                <a href="#378">378</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5313,9 +6081,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="331"
+                id="379"
                 role="cell">
-                <a href="#331">331</a>
+                <a href="#379">379</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5329,9 +6097,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="332"
+                id="380"
                 role="cell">
-                <a href="#332">332</a>
+                <a href="#380">380</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5345,9 +6113,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="333"
+                id="381"
                 role="cell">
-                <a href="#333">333</a>
+                <a href="#381">381</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5361,9 +6129,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="334"
+                id="382"
                 role="cell">
-                <a href="#334">334</a>
+                <a href="#382">382</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5377,9 +6145,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="335"
+                id="383"
                 role="cell">
-                <a href="#335">335</a>
+                <a href="#383">383</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5393,9 +6161,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="336"
+                id="384"
                 role="cell">
-                <a href="#336">336</a>
+                <a href="#384">384</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5409,9 +6177,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="337"
+                id="385"
                 role="cell">
-                <a href="#337">337</a>
+                <a href="#385">385</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5425,9 +6193,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="338"
+                id="386"
                 role="cell">
-                <a href="#338">338</a>
+                <a href="#386">386</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5441,9 +6209,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="339"
+                id="387"
                 role="cell">
-                <a href="#339">339</a>
+                <a href="#387">387</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5457,9 +6225,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="340"
+                id="388"
                 role="cell">
-                <a href="#340">340</a>
+                <a href="#388">388</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5473,9 +6241,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="341"
+                id="389"
                 role="cell">
-                <a href="#341">341</a>
+                <a href="#389">389</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5489,9 +6257,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="342"
+                id="390"
                 role="cell">
-                <a href="#342">342</a>
+                <a href="#390">390</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5505,9 +6273,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="343"
+                id="391"
                 role="cell">
-                <a href="#343">343</a>
+                <a href="#391">391</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5516,14 +6284,14 @@
             </div>
             <div class="column has-background-white p-0"
                  role="cell">
-                <pre class="has-background-white py-0 px-2">    stats: Option&lt;Box&lt;dyn SolverStats&gt;&gt;,</pre>
+                <pre class="has-background-white py-0 px-2">    stats: SolverStats,</pre>
             </div>
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="344"
+                id="392"
                 role="cell">
-                <a href="#344">344</a>
+                <a href="#392">392</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5537,9 +6305,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="345"
+                id="393"
                 role="cell">
-                <a href="#345">345</a>
+                <a href="#393">393</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5553,9 +6321,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="346"
+                id="394"
                 role="cell">
-                <a href="#346">346</a>
+                <a href="#394">394</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5569,9 +6337,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="347"
+                id="395"
                 role="cell">
-                <a href="#347">347</a>
+                <a href="#395">395</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5585,9 +6353,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="348"
+                id="396"
                 role="cell">
-                <a href="#348">348</a>
+                <a href="#396">396</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5601,9 +6369,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="349"
+                id="397"
                 role="cell">
-                <a href="#349">349</a>
+                <a href="#397">397</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5617,9 +6385,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="350"
+                id="398"
                 role="cell">
-                <a href="#350">350</a>
+                <a href="#398">398</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5633,9 +6401,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="351"
+                id="399"
                 role="cell">
-                <a href="#351">351</a>
+                <a href="#399">399</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5649,9 +6417,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="352"
+                id="400"
                 role="cell">
-                <a href="#352">352</a>
+                <a href="#400">400</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5665,9 +6433,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="353"
+                id="401"
                 role="cell">
-                <a href="#353">353</a>
+                <a href="#401">401</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5681,9 +6449,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="354"
+                id="402"
                 role="cell">
-                <a href="#354">354</a>
+                <a href="#402">402</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5697,9 +6465,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="355"
+                id="403"
                 role="cell">
-                <a href="#355">355</a>
+                <a href="#403">403</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5713,9 +6481,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="356"
+                id="404"
                 role="cell">
-                <a href="#356">356</a>
+                <a href="#404">404</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5729,9 +6497,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="357"
+                id="405"
                 role="cell">
-                <a href="#357">357</a>
+                <a href="#405">405</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5745,9 +6513,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="358"
+                id="406"
                 role="cell">
-                <a href="#358">358</a>
+                <a href="#406">406</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5761,9 +6529,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="359"
+                id="407"
                 role="cell">
-                <a href="#359">359</a>
+                <a href="#407">407</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5777,9 +6545,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="360"
+                id="408"
                 role="cell">
-                <a href="#360">360</a>
+                <a href="#408">408</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5793,9 +6561,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="361"
+                id="409"
                 role="cell">
-                <a href="#361">361</a>
+                <a href="#409">409</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5809,9 +6577,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="362"
+                id="410"
                 role="cell">
-                <a href="#362">362</a>
+                <a href="#410">410</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5825,9 +6593,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="363"
+                id="411"
                 role="cell">
-                <a href="#363">363</a>
+                <a href="#411">411</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5841,9 +6609,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="364"
+                id="412"
                 role="cell">
-                <a href="#364">364</a>
+                <a href="#412">412</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5857,9 +6625,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="365"
+                id="413"
                 role="cell">
-                <a href="#365">365</a>
+                <a href="#413">413</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5873,9 +6641,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="366"
+                id="414"
                 role="cell">
-                <a href="#366">366</a>
+                <a href="#414">414</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5889,9 +6657,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="367"
+                id="415"
                 role="cell">
-                <a href="#367">367</a>
+                <a href="#415">415</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5905,9 +6673,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="368"
+                id="416"
                 role="cell">
-                <a href="#368">368</a>
+                <a href="#416">416</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5921,9 +6689,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="369"
+                id="417"
                 role="cell">
-                <a href="#369">369</a>
+                <a href="#417">417</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
@@ -5937,9 +6705,9 @@
         </div><div class="columns p-0 m-0" role="row">
             <div
                 class="column is-1 is-narrow p-0 has-text-centered"
-                id="370"
+                id="418"
                 role="cell">
-                <a href="#370">370</a>
+                <a href="#418">418</a>
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
diff --git a/coverage/main/crates/conjure_core/src/stats/index.html b/coverage/main/crates/conjure_core/src/stats/index.html
new file mode 100644
index 0000000000..8a763d1d9e
--- /dev/null
+++ b/coverage/main/crates/conjure_core/src/stats/index.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en-us">
+    <head><meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Grcov report - crates&#x2F;conjure_core&#x2F;src&#x2F;stats </title>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"></head>
+    <body>
+        <div class="container">
+    <nav class="breadcrumb is-right" aria-label="breadcrumbs">
+        <ul><li><a href="../../../../index.html">top_level</a></li><li class="is-active"><a href="#">crates&#x2F;conjure_core&#x2F;src&#x2F;stats</a></li>
+        </ul>
+    </nav>
+    <nav class="level">
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Lines</p>
+            <p class="title has-text-warning">
+                <abbr title="9 / 12">75 %</abbr></p>
+        </div>
+    </div>
+
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Functions</p>
+            <p class="title has-text-danger">
+                <abbr title="2 / 9">22.22 %</abbr></p>
+        </div>
+    </div>
+
+        
+    </nav>
+
+    <table class="table is-fullwidth">
+        <thead>
+            <tr>
+                <th>File</th>
+                <th class="has-text-centered" colspan="3">Line Coverage</th>
+                <th class="has-text-centered" colspan="2">Functions</th>
+                
+            </tr>
+        </thead>
+        <tbody>
+    <tr>
+        <th><a href="mod.rs.html">mod.rs</a></th>
+        <!-- -->
+        <td class="p-2">
+            <progress
+                class="progress is-danger is-large"
+                value="50"
+                max="100">
+                50%
+            </progress>
+        </td>
+        <td class="has-text-centered has-background-danger p-2">
+            50%
+        </td>
+        <td class="has-text-centered has-background-danger p-2">
+            3 / 6
+        </td>
+        <!-- -->
+        <td class="has-text-centered has-background-danger p-2">16.67%</td>
+        <td class="has-text-centered has-background-danger p-2">1 / 6 </td>
+        <!-- -->
+        
+    </tr>
+
+    <tr>
+        <th><a href="solver_stats.rs.html">solver_stats.rs</a></th>
+        <!-- -->
+        <td class="p-2">
+            <progress
+                class="progress is-success is-large"
+                value="100"
+                max="100">
+                100%
+            </progress>
+        </td>
+        <td class="has-text-centered has-background-success p-2">
+            100%
+        </td>
+        <td class="has-text-centered has-background-success p-2">
+            6 / 6
+        </td>
+        <!-- -->
+        <td class="has-text-centered has-background-danger p-2">33.33%</td>
+        <td class="has-text-centered has-background-danger p-2">1 / 3 </td>
+        <!-- -->
+        
+    </tr>
+</tbody>
+    </table></div>
+        <footer class="footer">
+            <div class="content has-text-centered">
+                <p class="heading">Date: 2024-03-30 19:33</p>
+            </div>
+        </footer>
+    </body>
+</html>
diff --git a/coverage/main/crates/conjure_core/src/stats/mod.rs.html b/coverage/main/crates/conjure_core/src/stats/mod.rs.html
new file mode 100644
index 0000000000..aa4305fd03
--- /dev/null
+++ b/coverage/main/crates/conjure_core/src/stats/mod.rs.html
@@ -0,0 +1,409 @@
+<!DOCTYPE html>
+<html lang="en-us">
+    <head><meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Grcov report - mod.rs </title>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"></head>
+    <body>
+        <div class="container">
+    <nav class="breadcrumb is-right" aria-label="breadcrumbs">
+        <ul><li><a href="../../../../index.html">top_level</a></li><li><a href="./index.html">crates&#x2F;conjure_core&#x2F;src&#x2F;stats</a></li><li class="is-active"><a href="#">mod.rs</a></li>
+        </ul>
+    </nav>
+    <nav class="level">
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Lines</p>
+            <p class="title has-text-danger">
+                <abbr title="3 / 6">50 %</abbr></p>
+        </div>
+    </div>
+
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Functions</p>
+            <p class="title has-text-danger">
+                <abbr title="1 / 6">16.67 %</abbr></p>
+        </div>
+    </div>
+
+        
+    </nav>
+
+    <div role="table" aria-label="Coverage report"><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="1"
+                role="cell">
+                <a href="#1">1</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">mod solver_stats;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="2"
+                role="cell">
+                <a href="#2">2</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="3"
+                role="cell">
+                <a href="#3">3</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use serde::Serialize;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="4"
+                role="cell">
+                <a href="#4">4</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use serde_with::skip_serializing_none;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="5"
+                role="cell">
+                <a href="#5">5</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">pub use solver_stats::SolverStats;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="6"
+                role="cell">
+                <a href="#6">6</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="7"
+                role="cell">
+                <a href="#7">7</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[allow(dead_code)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="8"
+                role="cell">
+                <a href="#8">8</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[skip_serializing_none]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="9"
+                role="cell">
+                <a href="#9">9</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[derive(Default, Serialize, Clone)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="10"
+                role="cell">
+                <a href="#10">10</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[serde(rename_all = &quot;camelCase&quot;)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="11"
+                role="cell">
+                <a href="#11">11</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">pub struct Stats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="12"
+                role="cell">
+                <a href="#12">12</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub solver_runs: Vec&lt;SolverStats&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="13"
+                role="cell">
+                <a href="#13">13</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="14"
+                role="cell">
+                <a href="#14">14</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="15"
+                role="cell">
+                <a href="#15">15</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">impl Stats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="16"
+                role="cell">
+                <a href="#16">16</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">    pub fn new() -&gt; Stats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="17"
+                role="cell">
+                <a href="#17">17</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">        Default::default()</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="18"
+                role="cell">
+                <a href="#18">18</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-danger-light has-background-danger"
+                role="cell" aria-label="0">
+                
+            </div>
+            <div class="column has-background-danger-light p-0"
+                 role="cell">
+                <pre class="has-background-danger-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="19"
+                role="cell">
+                <a href="#19">19</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="20"
+                role="cell">
+                <a href="#20">20</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="135">
+                135
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    pub fn add_solver_run(&amp;mut self, solver_stats: SolverStats) {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="21"
+                role="cell">
+                <a href="#21">21</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="135">
+                135
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        self.solver_runs.push(solver_stats);</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="22"
+                role="cell">
+                <a href="#22">22</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="135">
+                135
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="23"
+                role="cell">
+                <a href="#23">23</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div></div>
+</div>
+        <footer class="footer">
+            <div class="content has-text-centered">
+                <p class="heading">Date: 2024-03-30 19:33</p>
+            </div>
+        </footer>
+    </body>
+</html>
diff --git a/coverage/main/crates/conjure_core/src/stats/solver_stats.rs.html b/coverage/main/crates/conjure_core/src/stats/solver_stats.rs.html
new file mode 100644
index 0000000000..ff929a6f09
--- /dev/null
+++ b/coverage/main/crates/conjure_core/src/stats/solver_stats.rs.html
@@ -0,0 +1,633 @@
+<!DOCTYPE html>
+<html lang="en-us">
+    <head><meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Grcov report - solver_stats.rs </title>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"></head>
+    <body>
+        <div class="container">
+    <nav class="breadcrumb is-right" aria-label="breadcrumbs">
+        <ul><li><a href="../../../../index.html">top_level</a></li><li><a href="./index.html">crates&#x2F;conjure_core&#x2F;src&#x2F;stats</a></li><li class="is-active"><a href="#">solver_stats.rs</a></li>
+        </ul>
+    </nav>
+    <nav class="level">
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Lines</p>
+            <p class="title has-text-success">
+                <abbr title="6 / 6">100 %</abbr></p>
+        </div>
+    </div>
+
+        <div class="level-item has-text-centered">
+        <div>
+            <p class="heading">Functions</p>
+            <p class="title has-text-danger">
+                <abbr title="1 / 3">33.33 %</abbr></p>
+        </div>
+    </div>
+
+        
+    </nav>
+
+    <div role="table" aria-label="Coverage report"><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="1"
+                role="cell">
+                <a href="#1">1</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use serde::Serialize;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="2"
+                role="cell">
+                <a href="#2">2</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use serde_with::skip_serializing_none;</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="3"
+                role="cell">
+                <a href="#3">3</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="4"
+                role="cell">
+                <a href="#4">4</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">use crate::solver::{SolverAdaptor, SolverFamily};</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="5"
+                role="cell">
+                <a href="#5">5</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="6"
+                role="cell">
+                <a href="#6">6</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[skip_serializing_none]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="7"
+                role="cell">
+                <a href="#7">7</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[derive(Default, Serialize, Clone)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="8"
+                role="cell">
+                <a href="#8">8</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[serde(rename_all = &quot;camelCase&quot;)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="9"
+                role="cell">
+                <a href="#9">9</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">#[allow(dead_code)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="10"
+                role="cell">
+                <a href="#10">10</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">pub struct SolverStats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="11"
+                role="cell">
+                <a href="#11">11</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; Wall time as measured by Conjure-oxide (not the solver).</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="12"
+                role="cell">
+                <a href="#12">12</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    #[serde(rename = &quot;conjureSolverWallTime_s&quot;)]</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="13"
+                role="cell">
+                <a href="#13">13</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub conjure_solver_wall_time_s: f64,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="14"
+                role="cell">
+                <a href="#14">14</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="15"
+                role="cell">
+                <a href="#15">15</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; This is set by Solver, not SolverAdaptor</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="16"
+                role="cell">
+                <a href="#16">16</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; The solver family used for this run.</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="17"
+                role="cell">
+                <a href="#17">17</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub solver_family: Option&lt;SolverFamily&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="18"
+                role="cell">
+                <a href="#18">18</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="19"
+                role="cell">
+                <a href="#19">19</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F;&#x2F; The solver adaptor used for this run.</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="20"
+                role="cell">
+                <a href="#20">20</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub solver_adaptor: Option&lt;String&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="21"
+                role="cell">
+                <a href="#21">21</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="22"
+                role="cell">
+                <a href="#22">22</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; NOTE (niklasdewally): these fields are copied from the list in Savile Row</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="23"
+                role="cell">
+                <a href="#23">23</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub nodes: Option&lt;u64&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="24"
+                role="cell">
+                <a href="#24">24</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub satisfiable: Option&lt;bool&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="25"
+                role="cell">
+                <a href="#25">25</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub sat_vars: Option&lt;u64&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="26"
+                role="cell">
+                <a href="#26">26</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    pub sat_clauses: Option&lt;u64&gt;,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="27"
+                role="cell">
+                <a href="#27">27</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="28"
+                role="cell">
+                <a href="#28">28</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2"></pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="29"
+                role="cell">
+                <a href="#29">29</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">impl SolverStats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="30"
+                role="cell">
+                <a href="#30">30</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">    &#x2F;&#x2F; Adds the conjure_solver_wall_time_s to the stats.</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="31"
+                role="cell">
+                <a href="#31">31</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    pub fn with_timings(self, wall_time_s: f64) -&gt; SolverStats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="32"
+                role="cell">
+                <a href="#32">32</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        SolverStats {</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="33"
+                role="cell">
+                <a href="#33">33</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">            conjure_solver_wall_time_s: wall_time_s,</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="34"
+                role="cell">
+                <a href="#34">34</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">            ..self.clone()</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="35"
+                role="cell">
+                <a href="#35">35</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">        }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="36"
+                role="cell">
+                <a href="#36">36</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
+                role="cell" aria-label="180">
+                180
+            </div>
+            <div class="column has-background-success-light p-0"
+                 role="cell">
+                <pre class="has-background-success-light py-0 px-2">    }</pre>
+            </div>
+        </div><div class="columns p-0 m-0" role="row">
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered"
+                id="37"
+                role="cell">
+                <a href="#37">37</a>
+            </div>
+            <div
+                class="column is-1 is-narrow p-0 has-text-centered has-text-white has-background-white"
+                role="cell" aria-label="no coverage">
+                
+            </div>
+            <div class="column has-background-white p-0"
+                 role="cell">
+                <pre class="has-background-white py-0 px-2">}</pre>
+            </div>
+        </div></div>
+</div>
+        <footer class="footer">
+            <div class="content has-text-centered">
+                <p class="heading">Date: 2024-03-30 19:33</p>
+            </div>
+        </footer>
+    </body>
+</html>
diff --git a/coverage/main/crates/uniplate/src/tree.rs.html b/coverage/main/crates/uniplate/src/tree.rs.html
index c9f9cbaefc..f75707b81f 100644
--- a/coverage/main/crates/uniplate/src/tree.rs.html
+++ b/coverage/main/crates/uniplate/src/tree.rs.html
@@ -647,8 +647,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="29582">
-                29582
+                role="cell" aria-label="31395">
+                31395
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -663,8 +663,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="29582">
-                29582
+                role="cell" aria-label="31395">
+                31395
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -679,8 +679,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="13242">
-                13242
+                role="cell" aria-label="14110">
+                14110
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -695,8 +695,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="13298">
-                13298
+                role="cell" aria-label="14113">
+                14113
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -711,8 +711,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="13298">
-                13298
+                role="cell" aria-label="14113">
+                14113
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -727,8 +727,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="13298">
-                13298
+                role="cell" aria-label="14113">
+                14113
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -743,8 +743,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="13298">
-                13298
+                role="cell" aria-label="14113">
+                14113
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -775,8 +775,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="28797">
-                28797
+                role="cell" aria-label="30610">
+                30610
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -807,8 +807,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="29582">
-                29582
+                role="cell" aria-label="31395">
+                31395
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -871,8 +871,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9954">
-                9954
+                role="cell" aria-label="9087">
+                9087
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -887,8 +887,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9944">
-                9944
+                role="cell" aria-label="9077">
+                9077
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -903,8 +903,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9944">
-                9944
+                role="cell" aria-label="9077">
+                9077
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -919,8 +919,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9944">
-                9944
+                role="cell" aria-label="9077">
+                9077
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -935,8 +935,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9944">
-                9944
+                role="cell" aria-label="9077">
+                9077
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -951,8 +951,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9944">
-                9944
+                role="cell" aria-label="9077">
+                9077
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -967,8 +967,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4517">
-                4517
+                role="cell" aria-label="4069">
+                4069
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -983,8 +983,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4455">
-                4455
+                role="cell" aria-label="4066">
+                4066
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -999,8 +999,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4445">
-                4445
+                role="cell" aria-label="4056">
+                4056
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1015,8 +1015,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4445">
-                4445
+                role="cell" aria-label="4056">
+                4056
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1047,8 +1047,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="1002">
-                1002
+                role="cell" aria-label="972">
+                972
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1063,8 +1063,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1079,8 +1079,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1095,8 +1095,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1111,8 +1111,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1127,8 +1127,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1143,8 +1143,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9686">
-                9686
+                role="cell" aria-label="8819">
+                8819
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1159,8 +1159,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="992">
-                992
+                role="cell" aria-label="962">
+                962
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1207,8 +1207,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9954">
-                9954
+                role="cell" aria-label="9087">
+                9087
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1335,8 +1335,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9793">
-                9793
+                role="cell" aria-label="11133">
+                11133
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1351,8 +1351,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9793">
-                9793
+                role="cell" aria-label="11133">
+                11133
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1367,8 +1367,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4361">
-                4361
+                role="cell" aria-label="5019">
+                5019
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1383,8 +1383,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4418">
-                4418
+                role="cell" aria-label="5020">
+                5020
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1399,8 +1399,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9535">
-                9535
+                role="cell" aria-label="10875">
+                10875
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1431,8 +1431,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="9793">
-                9793
+                role="cell" aria-label="11133">
+                11133
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
@@ -1991,8 +1991,8 @@
             </div>
             <div
                 class="column is-1 is-narrow p-0 has-text-centered has-text-success-light has-background-success"
-                role="cell" aria-label="4418">
-                4418
+                role="cell" aria-label="5020">
+                5020
             </div>
             <div class="column has-background-success-light p-0"
                  role="cell">
diff --git a/coverage/main/doc-coverage.json b/coverage/main/doc-coverage.json
index f8c385ae59..9637f64c02 100644
--- a/coverage/main/doc-coverage.json
+++ b/coverage/main/doc-coverage.json
@@ -1,9 +1,9 @@
-{"crates/enum_compatability_macro/src/lib.rs":{"total":2,"with_docs":2,"total_examples":2,"with_examples":1}}
+{"solvers/kissat/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0}}
 {"crates/conjure_macros/src/lib.rs":{"total":3,"with_docs":2,"total_examples":3,"with_examples":1}}
 {"crates/uniplate_derive/src/lib.rs":{"total":2,"with_docs":1,"total_examples":2,"with_examples":1}}
-{"solvers/kissat/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0}}
-{"conjure_oxide/src/find_conjure.rs":{"total":2,"with_docs":1,"total_examples":2,"with_examples":0},"conjure_oxide/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"conjure_oxide/src/utils/conjure.rs":{"total":7,"with_docs":0,"total_examples":5,"with_examples":0},"conjure_oxide/src/utils/json.rs":{"total":3,"with_docs":2,"total_examples":3,"with_examples":0},"conjure_oxide/src/utils/misc.rs":{"total":2,"with_docs":0,"total_examples":2,"with_examples":0},"conjure_oxide/src/utils/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"conjure_oxide/src/utils/testing.rs":{"total":8,"with_docs":0,"total_examples":8,"with_examples":0}}
+{"conjure_oxide/src/find_conjure.rs":{"total":2,"with_docs":1,"total_examples":2,"with_examples":0},"conjure_oxide/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"conjure_oxide/src/utils/conjure.rs":{"total":7,"with_docs":0,"total_examples":5,"with_examples":0},"conjure_oxide/src/utils/json.rs":{"total":3,"with_docs":2,"total_examples":3,"with_examples":0},"conjure_oxide/src/utils/misc.rs":{"total":2,"with_docs":0,"total_examples":2,"with_examples":0},"conjure_oxide/src/utils/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"conjure_oxide/src/utils/testing.rs":{"total":9,"with_docs":0,"total_examples":9,"with_examples":0}}
+{"crates/enum_compatability_macro/src/lib.rs":{"total":2,"with_docs":2,"total_examples":2,"with_examples":1}}
 {"/home/runner/work/conjure-oxide/conjure-oxide/target/debug/build/chuffed_rs-deaded5605d26364/out/chuffed_bindings.rs":{"total":207,"with_docs":0,"total_examples":104,"with_examples":0},"solvers/chuffed/src/lib.rs":{"total":10,"with_docs":0,"total_examples":10,"with_examples":0}}
-{"solvers/minion/src/ast.rs":{"total":98,"with_docs":11,"total_examples":12,"with_examples":0},"solvers/minion/src/error.rs":{"total":8,"with_docs":8,"total_examples":3,"with_examples":0},"solvers/minion/src/lib.rs":{"total":1,"with_docs":1,"total_examples":1,"with_examples":1}}
 {"crates/uniplate/src/biplate.rs":{"total":16,"with_docs":9,"total_examples":16,"with_examples":0},"crates/uniplate/src/lib.rs":{"total":1,"with_docs":1,"total_examples":1,"with_examples":1},"crates/uniplate/src/uniplate.rs":{"total":13,"with_docs":9,"total_examples":12,"with_examples":0}}
-{"crates/conjure_core/src/ast/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/context.rs":{"total":7,"with_docs":0,"total_examples":3,"with_examples":0},"crates/conjure_core/src/error.rs":{"total":7,"with_docs":1,"total_examples":2,"with_examples":0},"crates/conjure_core/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/metadata.rs":{"total":4,"with_docs":0,"total_examples":3,"with_examples":0},"crates/conjure_core/src/model.rs":{"total":15,"with_docs":1,"total_examples":12,"with_examples":0},"crates/conjure_core/src/parse/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/rule_engine/mod.rs":{"total":7,"with_docs":5,"total_examples":7,"with_examples":5},"crates/conjure_core/src/rules/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/solver/adaptors/mod.rs":{"total":1,"with_docs":1,"total_examples":1,"with_examples":0},"crates/conjure_core/src/solver/mod.rs":{"total":39,"with_docs":12,"total_examples":21,"with_examples":1},"crates/conjure_core/src/solver/model_modifier.rs":{"total":10,"with_docs":7,"total_examples":6,"with_examples":0},"crates/conjure_core/src/solver/states.rs":{"total":12,"with_docs":7,"total_examples":6,"with_examples":0},"crates/conjure_core/src/solver/stats.rs":{"total":3,"with_docs":0,"total_examples":3,"with_examples":0}}
+{"solvers/minion/src/ast.rs":{"total":98,"with_docs":11,"total_examples":12,"with_examples":0},"solvers/minion/src/error.rs":{"total":8,"with_docs":8,"total_examples":3,"with_examples":0},"solvers/minion/src/lib.rs":{"total":1,"with_docs":1,"total_examples":1,"with_examples":1}}
+{"crates/conjure_core/src/ast/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/context.rs":{"total":10,"with_docs":0,"total_examples":4,"with_examples":0},"crates/conjure_core/src/error.rs":{"total":7,"with_docs":1,"total_examples":2,"with_examples":0},"crates/conjure_core/src/lib.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/metadata.rs":{"total":4,"with_docs":0,"total_examples":3,"with_examples":0},"crates/conjure_core/src/model.rs":{"total":16,"with_docs":1,"total_examples":13,"with_examples":0},"crates/conjure_core/src/parse/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/rule_engine/mod.rs":{"total":7,"with_docs":5,"total_examples":7,"with_examples":5},"crates/conjure_core/src/rules/mod.rs":{"total":1,"with_docs":0,"total_examples":1,"with_examples":0},"crates/conjure_core/src/solver/adaptors/mod.rs":{"total":1,"with_docs":1,"total_examples":1,"with_examples":0},"crates/conjure_core/src/solver/mod.rs":{"total":42,"with_docs":14,"total_examples":24,"with_examples":1},"crates/conjure_core/src/solver/model_modifier.rs":{"total":10,"with_docs":7,"total_examples":6,"with_examples":0},"crates/conjure_core/src/solver/states.rs":{"total":11,"with_docs":7,"total_examples":6,"with_examples":0},"crates/conjure_core/src/stats/mod.rs":{"total":5,"with_docs":0,"total_examples":4,"with_examples":0}}
diff --git a/coverage/main/doc-coverage.txt b/coverage/main/doc-coverage.txt
index 7e0897c045..50348c78b7 100644
--- a/coverage/main/doc-coverage.txt
+++ b/coverage/main/doc-coverage.txt
@@ -1,16 +1,16 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| crates/uniplate_derive/src/lib.rs   |          1 |      50.0% |          1 |      50.0% |
+| crates/conjure_macros/src/lib.rs    |          2 |      66.7% |          1 |      33.3% |
 +-------------------------------------+------------+------------+------------+------------+
-| Total                               |          1 |      50.0% |          1 |      50.0% |
+| Total                               |          2 |      66.7% |          1 |      33.3% |
 +-------------------------------------+------------+------------+------------+------------+
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| crates/conjure_macros/src/lib.rs    |          2 |      66.7% |          1 |      33.3% |
+| solvers/kissat/src/lib.rs           |          0 |       0.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
-| Total                               |          2 |      66.7% |          1 |      33.3% |
+| Total                               |          0 |       0.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
@@ -22,9 +22,9 @@
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
 +-------------------------------------+------------+------------+------------+------------+
-| solvers/kissat/src/lib.rs           |          0 |       0.0% |          0 |       0.0% |
+| crates/uniplate_derive/src/lib.rs   |          1 |      50.0% |          1 |      50.0% |
 +-------------------------------------+------------+------------+------------+------------+
-| Total                               |          0 |       0.0% |          0 |       0.0% |
+| Total                               |          1 |      50.0% |          1 |      50.0% |
 +-------------------------------------+------------+------------+------------+------------+
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
@@ -59,7 +59,7 @@
 | crates/conjure_core/src/error.rs    |          1 |      14.3% |          0 |       0.0% |
 | crates/conjure_core/src/lib.rs      |          0 |       0.0% |          0 |       0.0% |
 | crates/conjure_core/src/metadata.rs |          0 |       0.0% |          0 |       0.0% |
-| crates/conjure_core/src/model.rs    |          1 |       6.7% |          0 |       0.0% |
+| crates/conjure_core/src/model.rs    |          1 |       6.2% |          0 |       0.0% |
 | ...core/src/parse/example_models.rs |          2 |     100.0% |          0 |       0.0% |
 | ...es/conjure_core/src/parse/mod.rs |          0 |       0.0% |          0 |       0.0% |
 | ...re_core/src/parse/parse_model.rs |          0 |       0.0% |          0 |       0.0% |
@@ -73,12 +73,13 @@
 | ...re/src/solver/adaptors/kissat.rs |          1 |     100.0% |          0 |       0.0% |
 | ...re/src/solver/adaptors/minion.rs |          1 |     100.0% |          0 |       0.0% |
 | ..._core/src/solver/adaptors/mod.rs |          1 |     100.0% |          0 |       0.0% |
-| ...s/conjure_core/src/solver/mod.rs |         12 |      30.8% |          1 |       4.8% |
+| ...s/conjure_core/src/solver/mod.rs |         14 |      33.3% |          1 |       4.2% |
 | ...ore/src/solver/model_modifier.rs |          7 |      70.0% |          0 |       0.0% |
-| ...onjure_core/src/solver/states.rs |          7 |      58.3% |          0 |       0.0% |
-| ...conjure_core/src/solver/stats.rs |          0 |       0.0% |          0 |       0.0% |
+| ...onjure_core/src/solver/states.rs |          7 |      63.6% |          0 |       0.0% |
+| ...es/conjure_core/src/stats/mod.rs |          0 |       0.0% |          0 |       0.0% |
+| ...e_core/src/stats/solver_stats.rs |          3 |      37.5% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
-| Total                               |         69 |      40.1% |          6 |       8.8% |
+| Total                               |         74 |      39.4% |          6 |       8.1% |
 +-------------------------------------+------------+------------+------------+------------+
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
@@ -91,7 +92,7 @@
 | conjure_oxide/src/utils/mod.rs      |          0 |       0.0% |          0 |       0.0% |
 | conjure_oxide/src/utils/testing.rs  |          0 |       0.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
-| Total                               |          3 |      12.5% |          0 |       0.0% |
+| Total                               |          3 |      12.0% |          0 |       0.0% |
 +-------------------------------------+------------+------------+------------+------------+
 +-------------------------------------+------------+------------+------------+------------+
 | File                                | Documented | Percentage |   Examples | Percentage |
diff --git a/coverage/main/index.html b/coverage/main/index.html
index 03d42a546f..975a21e3b5 100644
--- a/coverage/main/index.html
+++ b/coverage/main/index.html
@@ -15,7 +15,7 @@
         <div>
             <p class="heading">Lines</p>
             <p class="title has-text-danger">
-                <abbr title="4281 / 5844">73.25 %</abbr></p>
+                <abbr title="4325 / 5907">73.22 %</abbr></p>
         </div>
     </div>
 
@@ -23,7 +23,7 @@
         <div>
             <p class="heading">Functions</p>
             <p class="title has-text-danger">
-                <abbr title="500 / 2239">22.33 %</abbr></p>
+                <abbr title="507 / 2273">22.31 %</abbr></p>
         </div>
     </div>
 
@@ -70,20 +70,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="64.47368421052632"
+                value="67.85714285714286"
                 max="100">
-                64.47%
+                67.86%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            64.47%
+            67.86%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            147 / 228
+            171 / 252
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">25%</td>
-        <td class="has-text-centered has-background-danger p-2">15 / 60 </td>
+        <td class="has-text-centered has-background-danger p-2">25.4%</td>
+        <td class="has-text-centered has-background-danger p-2">16 / 63 </td>
         <!-- -->
         
     </tr>
@@ -94,16 +94,16 @@
         <td class="p-2">
             <progress
                 class="progress is-success is-large"
-                value="95.15331355093967"
+                value="95.17241379310344"
                 max="100">
-                95.15%
+                95.17%
             </progress>
         </td>
         <td class="has-text-centered has-background-success p-2">
-            95.15%
+            95.17%
         </td>
         <td class="has-text-centered has-background-success p-2">
-            962 / 1011
+            966 / 1015
         </td>
         <!-- -->
         <td class="has-text-centered has-background-success p-2">95.74%</td>
@@ -118,20 +118,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="57.46268656716418"
+                value="43.69747899159664"
                 max="100">
-                57.46%
+                43.7%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            57.46%
+            43.7%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            77 / 134
+            52 / 119
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">11.95%</td>
-        <td class="has-text-centered has-background-danger p-2">19 / 159 </td>
+        <td class="has-text-centered has-background-danger p-2">11.11%</td>
+        <td class="has-text-centered has-background-danger p-2">18 / 162 </td>
         <!-- -->
         
     </tr>
@@ -190,20 +190,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="74.2782152230971"
+                value="73.49081364829397"
                 max="100">
-                74.28%
+                73.49%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            74.28%
+            73.49%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            283 / 381
+            280 / 381
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">24.68%</td>
-        <td class="has-text-centered has-background-danger p-2">39 / 158 </td>
+        <td class="has-text-centered has-background-danger p-2">24.05%</td>
+        <td class="has-text-centered has-background-danger p-2">38 / 158 </td>
         <!-- -->
         
     </tr>
@@ -238,20 +238,20 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="66.4"
+                value="70"
                 max="100">
-                66.4%
+                70%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            66.4%
+            70%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            83 / 125
+            112 / 160
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">10.48%</td>
-        <td class="has-text-centered has-background-danger p-2">11 / 105 </td>
+        <td class="has-text-centered has-background-danger p-2">12.4%</td>
+        <td class="has-text-centered has-background-danger p-2">15 / 121 </td>
         <!-- -->
         
     </tr>
@@ -262,20 +262,44 @@
         <td class="p-2">
             <progress
                 class="progress is-danger is-large"
-                value="46.8384074941452"
+                value="47.906976744186046"
                 max="100">
-                46.84%
+                47.91%
             </progress>
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            46.84%
+            47.91%
         </td>
         <td class="has-text-centered has-background-danger p-2">
-            200 / 427
+            206 / 430
         </td>
         <!-- -->
-        <td class="has-text-centered has-background-danger p-2">11.73%</td>
-        <td class="has-text-centered has-background-danger p-2">19 / 162 </td>
+        <td class="has-text-centered has-background-danger p-2">12.73%</td>
+        <td class="has-text-centered has-background-danger p-2">21 / 165 </td>
+        <!-- -->
+        
+    </tr>
+
+    <tr>
+        <th><a href="crates&#x2F;conjure_core&#x2F;src&#x2F;stats&#x2F;index.html">crates&#x2F;conjure_core&#x2F;src&#x2F;stats</a></th>
+        <!-- -->
+        <td class="p-2">
+            <progress
+                class="progress is-warning is-large"
+                value="75"
+                max="100">
+                75%
+            </progress>
+        </td>
+        <td class="has-text-centered has-background-warning p-2">
+            75%
+        </td>
+        <td class="has-text-centered has-background-warning p-2">
+            9 / 12
+        </td>
+        <!-- -->
+        <td class="has-text-centered has-background-danger p-2">22.22%</td>
+        <td class="has-text-centered has-background-danger p-2">2 / 9 </td>
         <!-- -->
         
     </tr>
diff --git a/coverage/main/lcov.info b/coverage/main/lcov.info
index efe07b26d8..7e7e8bb29d 100644
--- a/coverage/main/lcov.info
+++ b/coverage/main/lcov.info
@@ -157,51 +157,50 @@ LF:79
 LH:58
 end_of_record
 SF:crates/conjure_core/src/parse/example_models.rs
-FN:27,conjure_core::parse::example_models::get_example_model::{closure#0}
-FN:30,conjure_core::parse::example_models::get_example_model::{closure#1}
-FN:27,conjure_core::parse::example_models::get_example_model::{closure#0}
-FN:77,conjure_core::parse::example_models::get_example_model_by_path
-FN:21,conjure_core::parse::example_models::get_example_model
-FN:27,conjure_core::parse::example_models::get_example_model::{closure#0}
-FN:30,conjure_core::parse::example_models::get_example_model::{closure#1}
-FN:30,conjure_core::parse::example_models::get_example_model::{closure#1}
-FN:21,conjure_core::parse::example_models::get_example_model
-FN:21,conjure_core::parse::example_models::get_example_model
-FN:77,conjure_core::parse::example_models::get_example_model_by_path
-FN:77,conjure_core::parse::example_models::get_example_model_by_path
-FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#0}
+FN:31,conjure_core::parse::example_models::get_example_model::{closure#1}
+FN:78,conjure_core::parse::example_models::get_example_model_by_path
+FN:28,conjure_core::parse::example_models::get_example_model::{closure#0}
+FN:28,conjure_core::parse::example_models::get_example_model::{closure#0}
+FN:31,conjure_core::parse::example_models::get_example_model::{closure#1}
+FN:22,conjure_core::parse::example_models::get_example_model
+FN:28,conjure_core::parse::example_models::get_example_model::{closure#0}
+FN:22,conjure_core::parse::example_models::get_example_model
+FN:78,conjure_core::parse::example_models::get_example_model_by_path
+FN:78,conjure_core::parse::example_models::get_example_model_by_path
+FN:22,conjure_core::parse::example_models::get_example_model
+FN:31,conjure_core::parse::example_models::get_example_model::{closure#1}
 FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#1}
-FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#0}
 FNDA:0,conjure_core::parse::example_models::get_example_model_by_path
-FNDA:0,conjure_core::parse::example_models::get_example_model
 FNDA:1,conjure_core::parse::example_models::get_example_model::{closure#0}
-FNDA:1,conjure_core::parse::example_models::get_example_model::{closure#1}
+FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#0}
 FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#1}
-FNDA:1,conjure_core::parse::example_models::get_example_model
+FNDA:0,conjure_core::parse::example_models::get_example_model
+FNDA:0,conjure_core::parse::example_models::get_example_model::{closure#0}
 FNDA:0,conjure_core::parse::example_models::get_example_model
 FNDA:0,conjure_core::parse::example_models::get_example_model_by_path
 FNDA:1,conjure_core::parse::example_models::get_example_model_by_path
+FNDA:1,conjure_core::parse::example_models::get_example_model
+FNDA:1,conjure_core::parse::example_models::get_example_model::{closure#1}
 FNF:12
 FNH:4
 BRF:0
 BRH:0
-DA:21,45
-DA:23,45
+DA:22,45
 DA:24,45
-DA:27,244185
-DA:28,244185
-DA:29,244185
-DA:30,206565
-DA:31,225
-DA:33,30
+DA:25,45
+DA:28,245640
+DA:29,245640
+DA:30,245640
+DA:31,207915
+DA:32,225
 DA:34,30
-DA:35,244155
-DA:41,45
-DA:42,15
+DA:35,30
+DA:36,245610
+DA:42,45
 DA:43,15
 DA:44,15
 DA:45,15
-DA:46,30
+DA:46,15
 DA:47,30
 DA:48,30
 DA:49,30
@@ -210,16 +209,16 @@ DA:51,30
 DA:52,30
 DA:53,30
 DA:54,30
-DA:57,30
-DA:62,30
-DA:64,30
-DA:65,45
-DA:77,30
+DA:55,30
+DA:58,30
+DA:63,30
+DA:65,30
+DA:66,45
 DA:78,30
 DA:79,30
 DA:80,30
 DA:81,30
-DA:82,15
+DA:82,30
 DA:83,15
 DA:84,15
 DA:85,15
@@ -234,185 +233,201 @@ DA:93,15
 DA:94,15
 DA:95,15
 DA:96,15
-DA:99,15
-DA:104,15
-DA:106,15
-DA:107,30
+DA:97,15
+DA:100,15
+DA:105,15
+DA:107,15
+DA:108,30
 LF:53
 LH:53
 end_of_record
 SF:conjure_oxide/tests/generated_tests.rs
-FN:81,generated_tests::assert_conjure_present
-FN:13,generated_tests::main
-FN:23,generated_tests::integration_test
-FN:15,generated_tests::main::{closure#0}
+FN:28,generated_tests::integration_test
+FN:91,generated_tests::assert_conjure_present
+FN:17,generated_tests::main
+FN:19,generated_tests::main::{closure#0}
+FNDA:1,generated_tests::integration_test
 FNDA:1,generated_tests::assert_conjure_present
 FNDA:0,generated_tests::main
-FNDA:1,generated_tests::integration_test
 FNDA:0,generated_tests::main::{closure#0}
 FNF:4
 FNH:2
 BRF:0
 BRH:0
-DA:13,0
-DA:14,0
-DA:15,0
-DA:16,0
 DA:17,0
 DA:18,0
 DA:19,0
+DA:20,0
 DA:21,0
-DA:23,9
-DA:24,9
-DA:25,9
-DA:26,9
-DA:27,9
-DA:28,0
-DA:29,0
-DA:30,0
-DA:31,0
+DA:22,0
+DA:23,0
+DA:25,0
+DA:28,9
+DA:29,9
+DA:30,9
+DA:31,9
 DA:32,9
-DA:35,9
-DA:36,9
+DA:33,9
+DA:34,0
+DA:35,0
+DA:36,0
 DA:37,0
 DA:38,9
-DA:40,9
 DA:41,9
 DA:42,9
 DA:43,0
 DA:44,9
 DA:46,9
+DA:47,9
+DA:48,9
 DA:49,9
 DA:50,9
-DA:51,9
-DA:52,0
-DA:53,9
-DA:55,9
-DA:56,9
+DA:51,0
+DA:52,9
+DA:54,9
 DA:57,9
-DA:58,0
+DA:58,9
 DA:59,9
+DA:60,0
 DA:61,9
+DA:63,9
 DA:64,9
 DA:65,9
-DA:66,9
-DA:67,0
-DA:68,9
-DA:70,9
-DA:71,9
-DA:72,0
+DA:66,0
+DA:67,9
+DA:69,9
+DA:72,9
 DA:73,9
-DA:75,9
-DA:77,9
+DA:74,9
+DA:75,0
+DA:76,9
 DA:78,9
-DA:81,1
-DA:82,1
-DA:83,1
-LF:54
-LH:36
+DA:79,9
+DA:80,0
+DA:81,9
+DA:83,9
+DA:85,9
+DA:87,9
+DA:88,9
+DA:91,1
+DA:92,1
+DA:93,1
+LF:58
+LH:40
 end_of_record
 SF:conjure_oxide/src/utils/conjure.rs
-FN:83,conjure_oxide::utils::conjure::minion_solutions_to_json
-FN:29,conjure_oxide::utils::conjure::parse_essence_file
-FN:83,conjure_oxide::utils::conjure::minion_solutions_to_json
-FN:15,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
-FN:24,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FN:72,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FN:61,conjure_oxide::utils::conjure::get_minion_solutions
-FN:61,conjure_oxide::utils::conjure::get_minion_solutions
-FN:29,conjure_oxide::utils::conjure::parse_essence_file
-FN:24,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FN:61,conjure_oxide::utils::conjure::get_minion_solutions
-FN:72,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FN:15,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
-FN:24,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FN:83,conjure_oxide::utils::conjure::minion_solutions_to_json
-FN:29,conjure_oxide::utils::conjure::parse_essence_file
-FN:72,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FN:15,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
+FN:16,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
+FN:16,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
+FN:93,conjure_oxide::utils::conjure::minion_solutions_to_json
+FN:30,conjure_oxide::utils::conjure::parse_essence_file
+FN:30,conjure_oxide::utils::conjure::parse_essence_file
+FN:78,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
+FN:16,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
+FN:25,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
+FN:78,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
+FN:25,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
+FN:30,conjure_oxide::utils::conjure::parse_essence_file
+FN:25,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
+FN:66,conjure_oxide::utils::conjure::get_minion_solutions
+FN:93,conjure_oxide::utils::conjure::minion_solutions_to_json
+FN:93,conjure_oxide::utils::conjure::minion_solutions_to_json
+FN:66,conjure_oxide::utils::conjure::get_minion_solutions
+FN:66,conjure_oxide::utils::conjure::get_minion_solutions
+FN:78,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
+FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
+FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
 FNDA:1,conjure_oxide::utils::conjure::minion_solutions_to_json
 FNDA:0,conjure_oxide::utils::conjure::parse_essence_file
-FNDA:0,conjure_oxide::utils::conjure::minion_solutions_to_json
-FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
-FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions
-FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions
 FNDA:1,conjure_oxide::utils::conjure::parse_essence_file
+FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
+FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
 FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FNDA:1,conjure_oxide::utils::conjure::get_minion_solutions
 FNDA:1,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
 FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
-FNDA:0,conjure_oxide::utils::conjure::minion_solutions_to_json
 FNDA:0,conjure_oxide::utils::conjure::parse_essence_file
+FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::convert::From<conjure_core::error::Error>>::from
+FNDA:1,conjure_oxide::utils::conjure::get_minion_solutions
+FNDA:0,conjure_oxide::utils::conjure::minion_solutions_to_json
+FNDA:0,conjure_oxide::utils::conjure::minion_solutions_to_json
+FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions
+FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions
 FNDA:0,conjure_oxide::utils::conjure::get_minion_solutions::{closure#0}
-FNDA:0,<conjure_oxide::utils::conjure::EssenceParseError as core::fmt::Display>::fmt
 FNF:18
 FNH:4
 BRF:0
 BRH:0
-DA:15,0
-DA:24,0
+DA:16,0
 DA:25,0
 DA:26,0
-DA:29,36
-DA:30,36
-DA:31,36
-DA:32,36
-DA:33,36
-DA:34,36
-DA:35,36
-DA:37,36
-DA:38,0
-DA:41,36
-DA:42,0
+DA:27,0
+DA:30,45
+DA:31,45
+DA:32,45
+DA:33,45
+DA:34,45
+DA:35,45
+DA:36,45
+DA:37,45
+DA:38,45
+DA:39,45
+DA:40,45
+DA:42,45
 DA:43,0
-DA:44,0
-DA:45,36
-DA:47,36
-DA:48,36
+DA:46,45
+DA:47,0
+DA:48,0
 DA:49,0
-DA:50,0
-DA:51,0
-DA:52,0
-DA:53,0
-DA:57,36
-DA:58,36
-DA:59,36
-DA:61,36
-DA:62,36
-DA:63,36
-DA:64,36
-DA:65,36
-DA:67,36
-DA:68,36
-DA:69,36
-DA:70,36
-DA:71,36
-DA:72,140
-DA:73,140
-DA:74,140
-DA:75,140
-DA:76,140
-DA:79,36
-DA:80,36
-DA:81,36
-DA:83,36
-DA:84,36
-DA:85,176
-DA:86,140
-DA:87,520
-DA:88,380
-DA:89,380
-DA:90,0
-DA:92,380
-DA:94,140
-DA:96,36
-DA:97,36
-DA:98,36
-LF:59
-LH:45
+DA:50,45
+DA:52,45
+DA:53,45
+DA:54,0
+DA:55,0
+DA:56,0
+DA:57,0
+DA:58,0
+DA:62,45
+DA:63,45
+DA:64,45
+DA:66,45
+DA:67,45
+DA:68,45
+DA:69,45
+DA:70,45
+DA:72,45
+DA:73,45
+DA:74,45
+DA:75,45
+DA:76,45
+DA:77,45
+DA:78,175
+DA:79,175
+DA:80,175
+DA:81,175
+DA:82,175
+DA:83,45
+DA:84,45
+DA:85,45
+DA:86,45
+DA:87,45
+DA:88,45
+DA:89,45
+DA:90,45
+DA:91,45
+DA:93,45
+DA:94,45
+DA:95,220
+DA:96,175
+DA:97,650
+DA:98,475
+DA:99,475
+DA:100,0
+DA:102,475
+DA:104,175
+DA:106,45
+DA:107,45
+DA:108,45
+LF:70
+LH:56
 end_of_record
 SF:solvers/chuffed/tests/dummy_test.rs
 FN:2,dummy_test::dummy
@@ -471,54 +486,54 @@ LF:31
 LH:31
 end_of_record
 SF:crates/conjure_core/src/rule_engine/resolve_rules.rs
+FN:45,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
+FN:70,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
+FN:90,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FN:70,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
 FN:15,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
+FN:90,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FN:150,conjure_core::rule_engine::resolve_rules::get_rules_vec
-FN:152,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
+FN:29,conjure_core::rule_engine::resolve_rules::get_rule_set
+FN:45,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
 FN:150,conjure_core::rule_engine::resolve_rules::get_rules_vec
-FN:90,conjure_core::rule_engine::resolve_rules::get_rule_priorities
+FN:29,conjure_core::rule_engine::resolve_rules::get_rule_set
 FN:15,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
-FN:128,conjure_core::rule_engine::resolve_rules::rule_cmp
-FN:152,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
-FN:70,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
 FN:70,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
+FN:150,conjure_core::rule_engine::resolve_rules::get_rules_vec
 FN:45,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
-FN:29,conjure_core::rule_engine::resolve_rules::get_rule_set
-FN:15,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
-FN:29,conjure_core::rule_engine::resolve_rules::get_rule_set
 FN:90,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FN:128,conjure_core::rule_engine::resolve_rules::rule_cmp
-FN:45,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
-FN:45,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
+FN:128,conjure_core::rule_engine::resolve_rules::rule_cmp
+FN:128,conjure_core::rule_engine::resolve_rules::rule_cmp
+FN:152,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
+FN:15,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
+FN:152,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
 FN:29,conjure_core::rule_engine::resolve_rules::get_rule_set
 FN:152,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
-FN:90,conjure_core::rule_engine::resolve_rules::get_rule_priorities
-FN:128,conjure_core::rule_engine::resolve_rules::rule_cmp
-FN:150,conjure_core::rule_engine::resolve_rules::get_rules_vec
+FNDA:1,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
 FNDA:0,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
+FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_priorities
+FNDA:1,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
 FNDA:0,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
+FNDA:1,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec
-FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
+FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_set
+FNDA:0,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
 FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec
-FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_priorities
+FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_set
 FNDA:0,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
-FNDA:0,conjure_core::rule_engine::resolve_rules::rule_cmp
-FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
 FNDA:0,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
-FNDA:1,conjure_core::rule_engine::resolve_rules::resolve_rule_sets
+FNDA:1,conjure_core::rule_engine::resolve_rules::get_rules_vec
 FNDA:0,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
-FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_set
-FNDA:0,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
-FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_set
 FNDA:0,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FNDA:0,conjure_core::rule_engine::resolve_rules::rule_cmp
-FNDA:0,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
-FNDA:1,conjure_core::rule_engine::resolve_rules::rule_sets_by_names
-FNDA:1,conjure_core::rule_engine::resolve_rules::get_rule_set
-FNDA:1,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
-FNDA:1,conjure_core::rule_engine::resolve_rules::get_rule_priorities
 FNDA:1,conjure_core::rule_engine::resolve_rules::rule_cmp
-FNDA:1,conjure_core::rule_engine::resolve_rules::get_rules_vec
+FNDA:0,conjure_core::rule_engine::resolve_rules::rule_cmp
+FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
+FNDA:0,<conjure_core::rule_engine::resolve_rules::ResolveRulesError as core::fmt::Display>::fmt
+FNDA:1,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
+FNDA:1,conjure_core::rule_engine::resolve_rules::get_rule_set
+FNDA:0,conjure_core::rule_engine::resolve_rules::get_rules_vec::{closure#0}
 FNF:24
 FNH:7
 BRF:0
@@ -574,23 +589,23 @@ DA:109,4290
 DA:110,4290
 DA:112,165
 DA:113,165
-DA:128,19305
-DA:129,19305
-DA:130,19305
-DA:131,19305
-DA:132,19305
-DA:133,19305
-DA:134,19305
-DA:135,19305
-DA:136,19305
-DA:137,17160
-DA:138,2145
-DA:139,2145
-DA:140,2145
-DA:141,19305
+DA:128,18855
+DA:129,18855
+DA:130,18855
+DA:131,18855
+DA:132,18855
+DA:133,18855
+DA:134,18855
+DA:135,18855
+DA:136,18855
+DA:137,16320
+DA:138,2535
+DA:139,2535
+DA:140,2535
+DA:141,18855
 DA:150,165
 DA:151,165
-DA:152,19305
+DA:152,18855
 DA:153,165
 DA:154,165
 LF:70
@@ -598,47 +613,47 @@ LH:61
 end_of_record
 SF:conjure_oxide/src/utils/json.rs
 FN:32,conjure_oxide::utils::json::sort_json_variables
+FN:68,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FN:68,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FN:48,conjure_oxide::utils::json::sort_json_object
+FN:53,conjure_oxide::utils::json::sort_json_object::{closure#0}
 FN:53,conjure_oxide::utils::json::sort_json_object::{closure#0}
-FN:7,conjure_oxide::utils::json::json_value_cmp
-FN:62,conjure_oxide::utils::json::sort_json_object::{closure#1}
-FN:7,conjure_oxide::utils::json::json_value_cmp
 FN:32,conjure_oxide::utils::json::sort_json_variables
 FN:62,conjure_oxide::utils::json::sort_json_object::{closure#1}
-FN:68,conjure_oxide::utils::json::sort_json_object::{closure#2}
-FN:62,conjure_oxide::utils::json::sort_json_object::{closure#1}
 FN:7,conjure_oxide::utils::json::json_value_cmp
-FN:53,conjure_oxide::utils::json::sort_json_object::{closure#0}
-FN:48,conjure_oxide::utils::json::sort_json_object
-FN:32,conjure_oxide::utils::json::sort_json_variables
 FN:48,conjure_oxide::utils::json::sort_json_object
+FN:7,conjure_oxide::utils::json::json_value_cmp
+FN:7,conjure_oxide::utils::json::json_value_cmp
 FN:68,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FN:62,conjure_oxide::utils::json::sort_json_object::{closure#1}
+FN:62,conjure_oxide::utils::json::sort_json_object::{closure#1}
 FN:48,conjure_oxide::utils::json::sort_json_object
-FN:68,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FN:32,conjure_oxide::utils::json::sort_json_variables
 FN:53,conjure_oxide::utils::json::sort_json_object::{closure#0}
 FNDA:0,conjure_oxide::utils::json::sort_json_variables
+FNDA:1,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FNDA:0,conjure_oxide::utils::json::sort_json_object
+FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#0}
 FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#0}
+FNDA:0,conjure_oxide::utils::json::sort_json_variables
+FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#1}
 FNDA:1,conjure_oxide::utils::json::json_value_cmp
-FNDA:1,conjure_oxide::utils::json::sort_json_object::{closure#1}
+FNDA:1,conjure_oxide::utils::json::sort_json_object
+FNDA:0,conjure_oxide::utils::json::json_value_cmp
 FNDA:0,conjure_oxide::utils::json::json_value_cmp
-FNDA:1,conjure_oxide::utils::json::sort_json_variables
-FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#1}
 FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#2}
 FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#1}
-FNDA:0,conjure_oxide::utils::json::json_value_cmp
-FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#0}
-FNDA:0,conjure_oxide::utils::json::sort_json_object
-FNDA:0,conjure_oxide::utils::json::sort_json_variables
+FNDA:1,conjure_oxide::utils::json::sort_json_object::{closure#1}
 FNDA:0,conjure_oxide::utils::json::sort_json_object
-FNDA:1,conjure_oxide::utils::json::sort_json_object::{closure#2}
-FNDA:1,conjure_oxide::utils::json::sort_json_object
-FNDA:0,conjure_oxide::utils::json::sort_json_object::{closure#2}
+FNDA:1,conjure_oxide::utils::json::sort_json_variables
 FNDA:1,conjure_oxide::utils::json::sort_json_object::{closure#0}
 FNF:18
 FNH:6
 BRF:0
 BRH:0
-DA:7,468
-DA:8,468
+DA:7,615
+DA:8,615
 DA:9,0
 DA:10,0
 DA:11,0
@@ -646,140 +661,140 @@ DA:12,0
 DA:13,0
 DA:14,0
 DA:15,0
-DA:17,116
-DA:18,116
-DA:19,116
-DA:20,116
-DA:21,116
+DA:17,135
+DA:18,135
+DA:19,135
+DA:20,135
+DA:21,135
 DA:22,0
 DA:24,0
-DA:26,352
-DA:28,468
-DA:32,72
-DA:33,72
-DA:34,72
-DA:35,72
-DA:36,72
-DA:37,72
+DA:26,480
+DA:28,615
+DA:32,90
+DA:33,90
+DA:34,90
+DA:35,90
+DA:36,90
+DA:37,90
 DA:39,0
-DA:41,72
-DA:48,7860
-DA:49,7860
-DA:50,3572
-DA:51,3572
-DA:52,3572
-DA:53,4196
-DA:54,4196
-DA:55,72
-DA:57,4124
-DA:59,4196
-DA:60,3572
-DA:61,3572
-DA:62,3572
-DA:63,3572
-DA:65,1428
-DA:66,1428
-DA:67,1428
-DA:68,3592
-DA:69,1428
-DA:70,1428
-DA:71,1428
-DA:72,72
-DA:73,1356
-DA:75,1428
-DA:77,2860
-DA:79,7860
+DA:41,90
+DA:48,10230
+DA:49,10230
+DA:50,4600
+DA:51,4600
+DA:52,4600
+DA:53,5560
+DA:54,5560
+DA:55,90
+DA:57,5470
+DA:59,5560
+DA:60,4600
+DA:61,4600
+DA:62,4600
+DA:63,4600
+DA:65,1875
+DA:66,1875
+DA:67,1875
+DA:68,4535
+DA:69,1875
+DA:70,1875
+DA:71,1875
+DA:72,90
+DA:73,1785
+DA:75,1875
+DA:77,3755
+DA:79,10230
 LF:52
 LH:42
 end_of_record
 SF:crates/conjure_core/src/metadata.rs
-FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:17,<conjure_core::metadata::Metadata>::new
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
 FN:23,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:17,<conjure_core::metadata::Metadata>::new
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
+FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:17,<conjure_core::metadata::Metadata>::new
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:23,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:11,<conjure_core::metadata::Metadata as core::default::Default>::default
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:23,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:23,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:23,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
+FN:17,<conjure_core::metadata::Metadata>::new
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:5,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:17,<conjure_core::metadata::Metadata>::new
+FN:17,<conjure_core::metadata::Metadata>::new
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<conjure_core::metadata::Metadata as core::default::Default>::default
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<conjure_core::metadata::Metadata as core::default::Default>::default
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::metadata::Metadata as core::default::Default>::default
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::metadata::Metadata>::new
-FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<conjure_core::metadata::Metadata>::new
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:1,<conjure_core::metadata::Metadata>::new
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::metadata::Metadata as core::default::Default>::default
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::metadata::Metadata as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::metadata::Metadata>::new
+FNDA:1,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::metadata::Metadata as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<conjure_core::metadata::Metadata>::new
+FNDA:0,<conjure_core::metadata::Metadata>::new
 FNF:41
 FNH:4
 BRF:0
 BRH:0
-DA:5,2416
+DA:5,3020
 DA:11,0
 DA:12,0
 DA:13,0
@@ -856,682 +871,682 @@ LF:49
 LH:7
 end_of_record
 SF:crates/conjure_core/src/ast/expressions.rs
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_eq
-FN:15,<conjure_core::ast::expressions::Expression>::is_lt
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_not
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
-FN:15,<conjure_core::ast::expressions::Expression>::is_and
-FN:15,<conjure_core::ast::expressions::Expression>::is_constant
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
-FN:15,<conjure_core::ast::expressions::Expression>::is_eq
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression>::is_neq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_constant
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_reference
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_leq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
 FN:15,<conjure_core::ast::expressions::Expression>::is_or
-FN:132,conjure_core::ast::expressions::display_expressions
-FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_eq
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:15,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
+FN:95,<conjure_core::ast::expressions::Expression>::bounds
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FN:15,<conjure_core::ast::expressions::Expression>::is_leq
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
-FN:15,<conjure_core::ast::expressions::Expression>::is_not
-FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
-FN:15,<conjure_core::ast::expressions::Expression>::is_or
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FN:15,<conjure_core::ast::expressions::Expression>::is_geq
+FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
+FN:15,<conjure_core::ast::expressions::Expression>::is_constant
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
 FN:15,<conjure_core::ast::expressions::Expression>::is_min
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum
+FN:15,<conjure_core::ast::expressions::Expression>::is_leq
+FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
-FN:15,<conjure_core::ast::expressions::Expression>::is_gt
 FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
+FN:15,<conjure_core::ast::expressions::Expression>::is_and
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_min
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:95,<conjure_core::ast::expressions::Expression>::bounds
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_eq
-FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FN:15,<conjure_core::ast::expressions::Expression>::is_lt
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_lt
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
+FN:15,<conjure_core::ast::expressions::Expression>::is_constant
+FN:15,<conjure_core::ast::expressions::Expression>::is_gt
+FN:15,<conjure_core::ast::expressions::Expression>::is_or
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_gt
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_eq
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:95,<conjure_core::ast::expressions::Expression>::bounds
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_and
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FN:132,conjure_core::ast::expressions::display_expressions
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_constant
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FN:15,<conjure_core::ast::expressions::Expression>::is_reference
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum
+FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
+FN:15,<conjure_core::ast::expressions::Expression>::is_min
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
+FN:15,<conjure_core::ast::expressions::Expression>::is_not
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
-FN:138,conjure_core::ast::expressions::display_expressions::{closure#0}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
-FN:15,<conjure_core::ast::expressions::Expression>::is_gt
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
 FN:152,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FN:15,<conjure_core::ast::expressions::Expression>::is_not
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:152,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FN:15,<conjure_core::ast::expressions::Expression>::is_reference
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_reference
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
-FN:15,<conjure_core::ast::expressions::Expression>::is_all_diff
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_leq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FN:138,conjure_core::ast::expressions::display_expressions::{closure#0}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_geq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_constant
 FN:138,conjure_core::ast::expressions::display_expressions::{closure#0}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FN:15,<conjure_core::ast::expressions::Expression>::is_leq
+FN:15,<conjure_core::ast::expressions::Expression>::is_lt
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
+FN:15,<conjure_core::ast::expressions::Expression>::is_geq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
-FN:15,<conjure_core::ast::expressions::Expression>::is_gt
+FN:15,<conjure_core::ast::expressions::Expression>::is_lt
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_leq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_and
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
+FN:138,conjure_core::ast::expressions::display_expressions::{closure#0}
+FN:15,<conjure_core::ast::expressions::Expression>::is_gt
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_leq
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
+FN:15,<conjure_core::ast::expressions::Expression>::is_leq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_min
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FN:15,<conjure_core::ast::expressions::Expression>::is_neq
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum
-FN:132,conjure_core::ast::expressions::display_expressions
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_geq
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
-FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
-FN:15,<conjure_core::ast::expressions::Expression>::is_or
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:138,conjure_core::ast::expressions::display_expressions::{closure#0}
+FN:152,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:152,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FN:15,<conjure_core::ast::expressions::Expression>::is_not
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FN:132,conjure_core::ast::expressions::display_expressions
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
 FN:15,<conjure_core::ast::expressions::Expression>::is_neq
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_geq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
-FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
-FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FN:15,<conjure_core::ast::expressions::Expression>::is_reference
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_neq
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FN:95,<conjure_core::ast::expressions::Expression>::bounds
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
 FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
+FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:124,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum
-FN:15,<conjure_core::ast::expressions::Expression>::is_reference
+FN:15,<conjure_core::ast::expressions::Expression>::is_and
 FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FN:97,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FN:15,<conjure_core::ast::expressions::Expression>::is_lt
-FN:15,<conjure_core::ast::expressions::Expression>::is_sum_geq
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:120,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:95,<conjure_core::ast::expressions::Expression>::bounds
-FN:132,conjure_core::ast::expressions::display_expressions
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_geq
+FN:15,<conjure_core::ast::expressions::Expression>::is_eq
+FN:15,<conjure_core::ast::expressions::Expression>::is_ineq
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
-FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<conjure_core::ast::expressions::Expression>::is_min
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
+FN:15,<conjure_core::ast::expressions::Expression>::is_sum
+FN:95,<conjure_core::ast::expressions::Expression>::bounds
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:152,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_nothing
 FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression>::is_neq
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::expressions::Expression>::is_and
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:123,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression>::is_or
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FN:15,<conjure_core::ast::expressions::Expression>::is_not
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
+FN:132,conjure_core::ast::expressions::display_expressions
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FN:15,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:15,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FN:15,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
 FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
-FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
-FNDA:1,<conjure_core::ast::expressions::Expression>::is_constant
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_constant
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_neq
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_leq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_or
-FNDA:0,conjure_core::ast::expressions::display_expressions
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
+FNDA:1,<conjure_core::ast::expressions::Expression>::bounds
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_leq
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_nothing
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_or
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_geq
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_constant
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_min
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_leq
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_nothing
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_gt
 FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_nothing
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_min
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
-FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
+FNDA:1,<conjure_core::ast::expressions::Expression>::is_constant
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_gt
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_or
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_gt
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
+FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FNDA:0,conjure_core::ast::expressions::display_expressions
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_constant
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_min
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
-FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_gt
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
 FNDA:0,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_all_diff
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_constant
+FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_leq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_geq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
-FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_leq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#21}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_gt
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:1,<conjure_core::ast::expressions::Expression>::is_nothing
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#24}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#26}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_leq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_min
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_neq
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
-FNDA:0,conjure_core::ast::expressions::display_expressions
-FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_geq
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#14}
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_or
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,conjure_core::ast::expressions::display_expressions::{closure#0}
+FNDA:0,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#15}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#4}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FNDA:0,conjure_core::ast::expressions::display_expressions
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
 FNDA:0,<conjure_core::ast::expressions::Expression>::is_neq
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#25}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#8}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_geq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
-FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_neq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#10}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_eq
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_leq
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#6}
 FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_reference
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#0}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#3}
 FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#18}
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_lt
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum_geq
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_nothing
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<conjure_core::ast::expressions::Expression>::bounds
-FNDA:0,conjure_core::ast::expressions::display_expressions
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#16}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
-FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#23}
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#1}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::expressions::Expression>::is_and
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#17}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#1}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#3}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#5}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#0}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_geq
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_eq
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_ineq
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_min
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#11}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_sum
+FNDA:0,<conjure_core::ast::expressions::Expression>::bounds
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::ast::expressions::Expression as core::fmt::Display>::fmt
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<conjure_core::ast::expressions::Expression>::is_nothing
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#13}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_neq
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#12}
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:1,<conjure_core::ast::expressions::Expression>::bounds::{closure#2}
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_or
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#2}
+FNDA:0,<conjure_core::ast::expressions::Expression>::is_not
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#19}
+FNDA:0,conjure_core::ast::expressions::display_expressions
+FNDA:0,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::expressions::Expression as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#9}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#20}
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#22}
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::uniplate::{closure#7}
 FNF:338
 FNH:38
 BRF:0
@@ -2080,87 +2095,87 @@ LF:368
 LH:160
 end_of_record
 SF:crates/conjure_core/src/ast/variables.rs
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:13,<conjure_core::ast::variables::DecisionVariable>::new
-FN:13,<conjure_core::ast::variables::DecisionVariable>::new
-FN:19,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:13,<conjure_core::ast::variables::DecisionVariable>::new
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:13,<conjure_core::ast::variables::DecisionVariable>::new
+FN:19,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
 FN:19,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:13,<conjure_core::ast::variables::DecisionVariable>::new
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:19,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:13,<conjure_core::ast::variables::DecisionVariable>::new
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:7,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:1,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::variables::DecisionVariable>::new
-FNDA:0,<conjure_core::ast::variables::DecisionVariable>::new
-FNDA:0,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:1,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:1,<conjure_core::ast::variables::DecisionVariable>::new
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:1,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:1,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::variables::DecisionVariable>::new
+FNDA:0,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<conjure_core::ast::variables::DecisionVariable>::new
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<conjure_core::ast::variables::DecisionVariable as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:1,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:1,<conjure_core::ast::variables::DecisionVariable>::new
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::ast::variables::DecisionVariable as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNF:38
 FNH:4
 BRF:0
 BRH:0
-DA:7,328
+DA:7,410
 DA:13,75
 DA:14,75
 DA:15,75
@@ -2290,35 +2305,35 @@ LF:73
 LH:73
 end_of_record
 SF:conjure_oxide/src/find_conjure.rs
-FN:9,conjure_oxide::find_conjure::conjure_executable
-FN:9,conjure_oxide::find_conjure::conjure_executable
 FN:25,conjure_oxide::find_conjure::conjure_executable::{closure#0}
 FN:9,conjure_oxide::find_conjure::conjure_executable
+FN:9,conjure_oxide::find_conjure::conjure_executable
 FN:25,conjure_oxide::find_conjure::conjure_executable::{closure#0}
 FN:25,conjure_oxide::find_conjure::conjure_executable::{closure#0}
-FNDA:0,conjure_oxide::find_conjure::conjure_executable
-FNDA:1,conjure_oxide::find_conjure::conjure_executable
+FN:9,conjure_oxide::find_conjure::conjure_executable
 FNDA:0,conjure_oxide::find_conjure::conjure_executable::{closure#0}
 FNDA:0,conjure_oxide::find_conjure::conjure_executable
+FNDA:0,conjure_oxide::find_conjure::conjure_executable
 FNDA:0,conjure_oxide::find_conjure::conjure_executable::{closure#0}
 FNDA:0,conjure_oxide::find_conjure::conjure_executable::{closure#0}
+FNDA:1,conjure_oxide::find_conjure::conjure_executable
 FNF:6
 FNH:1
 BRF:0
 BRH:0
-DA:9,4
-DA:10,4
-DA:11,4
-DA:12,4
-DA:13,4
-DA:15,4
+DA:9,5
+DA:10,5
+DA:11,5
+DA:12,5
+DA:13,5
+DA:15,5
 DA:16,0
-DA:17,4
-DA:18,4
-DA:19,4
-DA:20,4
-DA:21,4
-DA:22,4
+DA:17,5
+DA:18,5
+DA:19,5
+DA:20,5
+DA:21,5
+DA:22,5
 DA:23,0
 DA:24,0
 DA:25,0
@@ -2328,13 +2343,13 @@ DA:28,0
 DA:29,0
 DA:30,0
 DA:32,0
-DA:34,4
-DA:35,4
-DA:36,4
-DA:37,4
-DA:38,4
-DA:40,4
-DA:41,4
+DA:34,5
+DA:35,5
+DA:36,5
+DA:37,5
+DA:38,5
+DA:40,5
+DA:41,5
 DA:42,0
 DA:44,0
 DA:45,0
@@ -2345,15 +2360,15 @@ DA:49,0
 DA:50,0
 DA:51,0
 DA:53,0
-DA:55,4
+DA:55,5
 DA:56,0
 DA:57,0
 DA:58,0
 DA:59,0
 DA:60,0
-DA:61,4
-DA:62,4
-DA:63,4
+DA:61,5
+DA:62,5
+DA:63,5
 LF:48
 LH:23
 end_of_record
@@ -2430,68 +2445,68 @@ LF:7
 LH:0
 end_of_record
 SF:crates/conjure_core/src/rule_engine/rule_set.rs
-FN:154,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
-FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
-FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
-FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<_>
-FN:159,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FN:82,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
-FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
-FN:89,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
 FN:159,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FN:65,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
 FN:82,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
 FN:154,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
 FN:140,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
-FN:140,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
-FN:89,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
-FN:159,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
+FN:65,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
 FN:47,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
 FN:65,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
 FN:89,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
-FN:65,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
-FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
-FN:65,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
+FN:89,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
 FN:47,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
-FN:82,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FN:47,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
+FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
 FN:140,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
+FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FN:29,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
+FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
 FN:154,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
-FN:47,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<_>
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FN:159,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
+FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
+FN:82,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FN:148,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<_>
+FN:89,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FN:82,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FN:154,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
+FN:114,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
+FN:159,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
+FN:140,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
 FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_dependencies
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
+FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
-FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::new
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
 FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::get_rules
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
+FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::hash::Hash>::hash::<_>
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_rules
+FNDA:1,<conjure_core::rule_engine::rule_set::RuleSet>::with_dependencies
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet>::resolve_dependencies
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::fmt::Display>::fmt::{closure#0}
+FNDA:0,<conjure_core::rule_engine::rule_set::RuleSet as core::cmp::PartialEq>::eq
 FNF:30
-FNH:7
+FNH:6
 BRF:0
 BRH:0
 DA:29,0
@@ -2567,9 +2582,9 @@ DA:129,45
 DA:130,45
 DA:135,135
 DA:136,135
-DA:140,15
-DA:141,15
-DA:142,15
+DA:140,0
+DA:141,0
+DA:142,0
 DA:148,945
 DA:149,945
 DA:150,945
@@ -2593,437 +2608,437 @@ DA:170,0
 DA:171,0
 DA:172,0
 LF:98
-LH:61
+LH:58
 end_of_record
 SF:crates/conjure_core/src/rules/base.rs
-FN:28,conjure_core::rules::base::remove_nothings::remove_nothings
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FN:291,conjure_core::rules::base::remove_trivial_or
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
 FN:425,conjure_core::rules::base::min_to_var
-FN:189,conjure_core::rules::base::unwrap_nested_or
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
 FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
-FN:291,conjure_core::rules::base::remove_trivial_or
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
-FN:311,conjure_core::rules::base::remove_constants_from_or
+FN:255,conjure_core::rules::base::remove_double_negation
 FN:389,conjure_core::rules::base::evaluate_constant_not
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
+FN:255,conjure_core::rules::base::remove_double_negation
+FN:142,conjure_core::rules::base::unwrap_sum
 FN:152,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_152_0
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
+FN:222,conjure_core::rules::base::unwrap_nested_and
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
 FN:385,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_385_0
-FN:389,conjure_core::rules::base::evaluate_constant_not
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
 FN:218,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_218_0
-FN:421,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_421_0
-FN:425,conjure_core::rules::base::min_to_var
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
-FN:87,conjure_core::rules::base::empty_to_nothing
 FN:484,conjure_core::rules::base::distribute_or_over_and
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
-FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
+FN:421,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_421_0
 FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FN:156,conjure_core::rules::base::flatten_nested_sum
-FN:109,conjure_core::rules::base::sum_constants
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FN:480,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_480_0
-FN:189,conjure_core::rules::base::unwrap_nested_or
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
 FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
-FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
 FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
-FN:389,conjure_core::rules::base::evaluate_constant_not
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
 FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FN:307,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_307_0
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
 FN:28,conjure_core::rules::base::remove_nothings::remove_nothings
-FN:350,conjure_core::rules::base::remove_constants_from_and
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
-FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FN:222,conjure_core::rules::base::unwrap_nested_and
-FN:27,conjure_core::rules::base::remove_nothings
-FN:484,conjure_core::rules::base::distribute_or_over_and
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
-FN:138,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_138_0
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FN:109,conjure_core::rules::base::sum_constants
 FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
-FN:23,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_23_0
-FN:255,conjure_core::rules::base::remove_double_negation
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
-FN:484,conjure_core::rules::base::distribute_or_over_and
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
 FN:222,conjure_core::rules::base::unwrap_nested_and
-FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
 FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FN:480,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_480_0
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
 FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FN:255,conjure_core::rules::base::remove_double_negation
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
 FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
-FN:189,conjure_core::rules::base::unwrap_nested_or
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
-FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
+FN:28,conjure_core::rules::base::remove_nothings::remove_nothings
+FN:307,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_307_0
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FN:156,conjure_core::rules::base::flatten_nested_sum
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
 FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FN:109,conjure_core::rules::base::sum_constants
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
 FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
+FN:27,conjure_core::rules::base::remove_nothings
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
 FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FN:311,conjure_core::rules::base::remove_constants_from_or
-FN:142,conjure_core::rules::base::unwrap_sum
-FN:425,conjure_core::rules::base::min_to_var
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
 FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
-FN:105,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_105_0
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FN:138,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_138_0
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FN:350,conjure_core::rules::base::remove_constants_from_and
 FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
-FN:346,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_346_0
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
-FN:109,conjure_core::rules::base::sum_constants
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
-FN:222,conjure_core::rules::base::unwrap_nested_and
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
-FN:287,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_287_0
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FN:87,conjure_core::rules::base::empty_to_nothing
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
+FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
+FN:23,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_23_0
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
 FN:272,conjure_core::rules::base::remove_trivial_and
-FN:83,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_83_0
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
+FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FN:311,conjure_core::rules::base::remove_constants_from_or
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FN:156,conjure_core::rules::base::flatten_nested_sum
 FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
-FN:251,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_251_0
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FN:255,conjure_core::rules::base::remove_double_negation
+FN:87,conjure_core::rules::base::empty_to_nothing
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
 FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
-FN:272,conjure_core::rules::base::remove_trivial_and
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
-FN:27,conjure_core::rules::base::remove_nothings
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FN:109,conjure_core::rules::base::sum_constants
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
+FN:291,conjure_core::rules::base::remove_trivial_or
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
 FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
-FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
+FN:28,conjure_core::rules::base::remove_nothings::remove_nothings
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
+FN:105,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_105_0
+FN:425,conjure_core::rules::base::min_to_var
+FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
+FN:346,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_346_0
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
+FN:425,conjure_core::rules::base::min_to_var
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
 FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
+FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
+FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
 FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
-FN:268,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_268_0
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FN:272,conjure_core::rules::base::remove_trivial_and
+FN:189,conjure_core::rules::base::unwrap_nested_or
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FN:291,conjure_core::rules::base::remove_trivial_or
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
+FN:287,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_287_0
+FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
+FN:83,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_83_0
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
 FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
+FN:251,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_251_0
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
+FN:142,conjure_core::rules::base::unwrap_sum
+FN:389,conjure_core::rules::base::evaluate_constant_not
 FN:311,conjure_core::rules::base::remove_constants_from_or
-FN:272,conjure_core::rules::base::remove_trivial_and
-FN:185,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_185_0
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
 FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
-FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FN:291,conjure_core::rules::base::remove_trivial_or
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FN:138,rust_out::main
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
-FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
-FN:28,conjure_core::rules::base::remove_nothings::remove_nothings
-FN:156,conjure_core::rules::base::flatten_nested_sum
+FN:389,conjure_core::rules::base::evaluate_constant_not
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
+FN:272,conjure_core::rules::base::remove_trivial_and
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FN:255,conjure_core::rules::base::remove_double_negation
+FN:268,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_268_0
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
+FN:484,conjure_core::rules::base::distribute_or_over_and
+FN:27,conjure_core::rules::base::remove_nothings
 FN:350,conjure_core::rules::base::remove_constants_from_and
-FN:87,conjure_core::rules::base::empty_to_nothing
-FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
-FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
 FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
-FN:27,conjure_core::rules::base::remove_nothings
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
 FN:142,conjure_core::rules::base::unwrap_sum
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FN:185,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_185_0
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
+FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
+FN:350,conjure_core::rules::base::remove_constants_from_and
 FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
-FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
-FN:424,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
 FN:87,conjure_core::rules::base::empty_to_nothing
-FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
-FN:142,conjure_core::rules::base::unwrap_sum
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
+FN:138,rust_out::main
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FN:484,conjure_core::rules::base::distribute_or_over_and
+FN:290,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
+FN:27,conjure_core::rules::base::remove_nothings
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FN:222,conjure_core::rules::base::unwrap_nested_and
+FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FN:485,conjure_core::rules::base::distribute_or_over_and::find_and
 FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FN:86,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
 FN:156,conjure_core::rules::base::flatten_nested_sum
-FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
 FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FN:189,conjure_core::rules::base::unwrap_nested_or
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FN:109,conjure_core::rules::base::sum_constants
+FN:310,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FN:108,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
+FN:291,conjure_core::rules::base::remove_trivial_or
 FN:26,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
-FN:350,conjure_core::rules::base::remove_constants_from_and
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
 FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FN:189,conjure_core::rules::base::unwrap_nested_or
 FN:388,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FN:349,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FN:15,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FN:311,conjure_core::rules::base::remove_constants_from_or
+FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FN:254,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
 FN:271,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FN:188,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
-FN:155,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
-FN:221,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FN:48,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
-FNDA:0,conjure_core::rules::base::remove_nothings::remove_nothings
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_trivial_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::min_to_var
-FNDA:0,conjure_core::rules::base::unwrap_nested_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FN:483,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:141,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::min_to_var
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_trivial_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_constants_from_or
+FNDA:1,conjure_core::rules::base::remove_double_negation
 FNDA:0,conjure_core::rules::base::evaluate_constant_not
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
+FNDA:0,conjure_core::rules::base::remove_double_negation
+FNDA:0,conjure_core::rules::base::unwrap_sum
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_152_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::remove_nothings::get_lhs_rhs
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::unwrap_nested_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_385_0
-FNDA:0,conjure_core::rules::base::evaluate_constant_not
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_218_0
+FNDA:1,conjure_core::rules::base::distribute_or_over_and
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_421_0
-FNDA:1,conjure_core::rules::base::min_to_var
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
-FNDA:1,conjure_core::rules::base::empty_to_nothing
-FNDA:0,conjure_core::rules::base::distribute_or_over_and
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::distribute_or_over_and::find_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::remove_nothings::remove_nothings
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::unwrap_nested_and
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FNDA:0,conjure_core::rules::base::flatten_nested_sum
-FNDA:0,conjure_core::rules::base::sum_constants
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_480_0
-FNDA:0,conjure_core::rules::base::unwrap_nested_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
+FNDA:1,conjure_core::rules::base::remove_nothings::remove_nothings
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_307_0
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::flatten_nested_sum
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::base::evaluate_constant_not
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FNDA:0,conjure_core::rules::base::sum_constants
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::remove_nothings
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_307_0
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::base::remove_nothings::remove_nothings
-FNDA:1,conjure_core::rules::base::remove_constants_from_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::distribute_or_over_and::find_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::unwrap_nested_and
-FNDA:0,conjure_core::rules::base::remove_nothings
-FNDA:1,conjure_core::rules::base::distribute_or_over_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_138_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FNDA:1,conjure_core::rules::base::remove_constants_from_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
-FNDA:0,conjure_core::rules::base::sum_constants
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:1,conjure_core::rules::base::empty_to_nothing
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
+FNDA:1,conjure_core::rules::base::distribute_or_over_and::find_and
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_23_0
-FNDA:1,conjure_core::rules::base::remove_double_negation
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
-FNDA:0,conjure_core::rules::base::distribute_or_over_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
-FNDA:1,conjure_core::rules::base::unwrap_nested_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FNDA:0,conjure_core::rules::base::remove_double_negation
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::remove_trivial_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::distribute_or_over_and::find_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FNDA:0,conjure_core::rules::base::remove_constants_from_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FNDA:1,conjure_core::rules::base::flatten_nested_sum
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::empty_to_nothing
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::sum_constants
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::remove_trivial_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::base::unwrap_nested_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
 FNDA:0,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::remove_nothings::remove_nothings
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::base::remove_constants_from_or
-FNDA:0,conjure_core::rules::base::unwrap_sum
-FNDA:0,conjure_core::rules::base::min_to_var
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_105_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
+FNDA:0,conjure_core::rules::base::min_to_var
+FNDA:0,conjure_core::rules::base::remove_nothings::get_lhs_rhs
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_346_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::base::sum_constants
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::unwrap_nested_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
+FNDA:0,conjure_core::rules::base::min_to_var
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_287_0
-FNDA:0,conjure_core::rules::base::remove_trivial_and
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_83_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_251_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_double_negation
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::base::remove_trivial_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_nothings
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FNDA:0,conjure_core::rules::base::remove_trivial_and
+FNDA:0,conjure_core::rules::base::unwrap_nested_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::remove_trivial_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_287_0
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_83_0
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_268_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_251_0
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
+FNDA:1,conjure_core::rules::base::unwrap_sum
+FNDA:1,conjure_core::rules::base::evaluate_constant_not
 FNDA:0,conjure_core::rules::base::remove_constants_from_or
-FNDA:0,conjure_core::rules::base::remove_trivial_and
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_185_0
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::base::remove_trivial_or
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FNDA:1,rust_out::main
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
-FNDA:0,conjure_core::rules::base::remove_nothings::remove_nothings
-FNDA:0,conjure_core::rules::base::flatten_nested_sum
+FNDA:0,conjure_core::rules::base::evaluate_constant_not
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
+FNDA:0,conjure_core::rules::base::remove_trivial_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck
+FNDA:0,conjure_core::rules::base::remove_double_negation
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_268_0
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::distribute_or_over_and
+FNDA:0,conjure_core::rules::base::remove_nothings
 FNDA:0,conjure_core::rules::base::remove_constants_from_and
-FNDA:0,conjure_core::rules::base::empty_to_nothing
-FNDA:1,conjure_core::rules::base::distribute_or_over_and::find_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::unwrap_sum
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck
-FNDA:1,conjure_core::rules::base::remove_nothings
-FNDA:1,conjure_core::rules::base::unwrap_sum
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_base_rs_185_0
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::remove_constants_from_and
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_MIN_TO_VAR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck
 FNDA:0,conjure_core::rules::base::empty_to_nothing
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::unwrap_sum
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}
+FNDA:1,rust_out::main
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::distribute_or_over_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_OR::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::remove_nothings
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::unwrap_nested_and
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::distribute_or_over_and::find_and
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::base::flatten_nested_sum
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EMPTY_TO_NOTHING::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::flatten_nested_sum
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::base::unwrap_nested_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck
+FNDA:1,conjure_core::rules::base::sum_constants
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SUM_CONSTANTS::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::remove_trivial_or
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_NOTHINGS::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::remove_constants_from_and
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::unwrap_nested_or
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_EVALUATE_CONSTANT_NOT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_CONSTANTS_FROM_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_SET_BASE::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::base::remove_constants_from_or
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_DOUBLE_NEGATION::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_REMOVE_TRIVIAL_AND::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_OR::__typecheck
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_FLATTEN_NESTED_SUM::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_NESTED_AND::__typecheck
-FNDA:0,conjure_core::rules::base::remove_nothings::get_lhs_rhs
-FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_DISTRIBUTE_OR_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::base::CONJURE_GEN_RULE_UNWRAP_SUM::__typecheck::{closure#0}
 FNF:214
 FNH:33
 BRF:0
@@ -3385,366 +3400,417 @@ LF:353
 LH:292
 end_of_record
 SF:conjure_oxide/src/utils/testing.rs
-FN:18,conjure_oxide::utils::testing::assert_eq_any_order::<_>
-FN:51,conjure_oxide::utils::testing::save_model_json
-FN:90,conjure_oxide::utils::testing::minion_solutions_from_json
-FN:51,conjure_oxide::utils::testing::save_model_json
-FN:75,conjure_oxide::utils::testing::read_model_json
-FN:90,conjure_oxide::utils::testing::minion_solutions_from_json
-FN:18,conjure_oxide::utils::testing::assert_eq_any_order::<_>
-FN:128,conjure_oxide::utils::testing::save_minion_solutions_json
-FN:39,conjure_oxide::utils::testing::serialise_model
-FN:153,conjure_oxide::utils::testing::read_minion_solutions_json
-FN:153,conjure_oxide::utils::testing::read_minion_solutions_json
-FN:39,conjure_oxide::utils::testing::serialise_model
-FN:153,conjure_oxide::utils::testing::read_minion_solutions_json
-FN:39,conjure_oxide::utils::testing::serialise_model
-FN:51,conjure_oxide::utils::testing::save_model_json
-FN:75,conjure_oxide::utils::testing::read_model_json
-FN:128,conjure_oxide::utils::testing::save_minion_solutions_json
-FN:18,conjure_oxide::utils::testing::assert_eq_any_order::<_>
-FN:75,conjure_oxide::utils::testing::read_model_json
-FN:128,conjure_oxide::utils::testing::save_minion_solutions_json
-FN:90,conjure_oxide::utils::testing::minion_solutions_from_json
+FN:173,conjure_oxide::utils::testing::read_minion_solutions_json
+FN:53,conjure_oxide::utils::testing::save_model_json
+FN:41,conjure_oxide::utils::testing::serialise_model
+FN:20,conjure_oxide::utils::testing::assert_eq_any_order::<_>
+FN:77,conjure_oxide::utils::testing::save_stats_json
+FN:20,conjure_oxide::utils::testing::assert_eq_any_order::<_>
+FN:148,conjure_oxide::utils::testing::save_minion_solutions_json
+FN:77,conjure_oxide::utils::testing::save_stats_json
+FN:41,conjure_oxide::utils::testing::serialise_model
+FN:20,conjure_oxide::utils::testing::assert_eq_any_order::<_>
+FN:53,conjure_oxide::utils::testing::save_model_json
+FN:110,conjure_oxide::utils::testing::minion_solutions_from_json
+FN:148,conjure_oxide::utils::testing::save_minion_solutions_json
+FN:110,conjure_oxide::utils::testing::minion_solutions_from_json
+FN:173,conjure_oxide::utils::testing::read_minion_solutions_json
+FN:77,conjure_oxide::utils::testing::save_stats_json
+FN:95,conjure_oxide::utils::testing::read_model_json
+FN:53,conjure_oxide::utils::testing::save_model_json
+FN:95,conjure_oxide::utils::testing::read_model_json
+FN:148,conjure_oxide::utils::testing::save_minion_solutions_json
+FN:110,conjure_oxide::utils::testing::minion_solutions_from_json
+FN:41,conjure_oxide::utils::testing::serialise_model
+FN:95,conjure_oxide::utils::testing::read_model_json
+FN:173,conjure_oxide::utils::testing::read_minion_solutions_json
+FNDA:0,conjure_oxide::utils::testing::read_minion_solutions_json
+FNDA:1,conjure_oxide::utils::testing::save_model_json
+FNDA:0,conjure_oxide::utils::testing::serialise_model
+FNDA:0,conjure_oxide::utils::testing::assert_eq_any_order::<_>
+FNDA:0,conjure_oxide::utils::testing::save_stats_json
+FNDA:0,conjure_oxide::utils::testing::assert_eq_any_order::<_>
+FNDA:1,conjure_oxide::utils::testing::save_minion_solutions_json
+FNDA:0,conjure_oxide::utils::testing::save_stats_json
+FNDA:1,conjure_oxide::utils::testing::serialise_model
 FNDA:0,conjure_oxide::utils::testing::assert_eq_any_order::<_>
 FNDA:0,conjure_oxide::utils::testing::save_model_json
 FNDA:0,conjure_oxide::utils::testing::minion_solutions_from_json
+FNDA:0,conjure_oxide::utils::testing::save_minion_solutions_json
+FNDA:0,conjure_oxide::utils::testing::minion_solutions_from_json
+FNDA:0,conjure_oxide::utils::testing::read_minion_solutions_json
+FNDA:1,conjure_oxide::utils::testing::save_stats_json
+FNDA:0,conjure_oxide::utils::testing::read_model_json
 FNDA:0,conjure_oxide::utils::testing::save_model_json
 FNDA:0,conjure_oxide::utils::testing::read_model_json
-FNDA:0,conjure_oxide::utils::testing::minion_solutions_from_json
-FNDA:0,conjure_oxide::utils::testing::assert_eq_any_order::<_>
 FNDA:0,conjure_oxide::utils::testing::save_minion_solutions_json
+FNDA:0,conjure_oxide::utils::testing::minion_solutions_from_json
 FNDA:0,conjure_oxide::utils::testing::serialise_model
-FNDA:0,conjure_oxide::utils::testing::read_minion_solutions_json
-FNDA:0,conjure_oxide::utils::testing::read_minion_solutions_json
-FNDA:1,conjure_oxide::utils::testing::serialise_model
-FNDA:1,conjure_oxide::utils::testing::read_minion_solutions_json
-FNDA:0,conjure_oxide::utils::testing::serialise_model
-FNDA:1,conjure_oxide::utils::testing::save_model_json
 FNDA:1,conjure_oxide::utils::testing::read_model_json
-FNDA:0,conjure_oxide::utils::testing::save_minion_solutions_json
-FNDA:0,conjure_oxide::utils::testing::assert_eq_any_order::<_>
-FNDA:0,conjure_oxide::utils::testing::read_model_json
-FNDA:1,conjure_oxide::utils::testing::save_minion_solutions_json
-FNDA:0,conjure_oxide::utils::testing::minion_solutions_from_json
-FNF:21
-FNH:5
+FNDA:1,conjure_oxide::utils::testing::read_minion_solutions_json
+FNF:24
+FNH:6
 BRF:0
 BRH:0
-DA:18,0
-DA:19,0
+DA:20,0
 DA:21,0
-DA:22,0
 DA:23,0
 DA:24,0
 DA:25,0
+DA:26,0
 DA:27,0
-DA:28,0
 DA:29,0
 DA:30,0
 DA:31,0
+DA:32,0
 DA:33,0
-DA:34,0
 DA:35,0
+DA:36,0
 DA:37,0
-DA:39,72
-DA:43,72
-DA:46,72
-DA:48,72
-DA:49,72
-DA:51,72
-DA:52,72
-DA:53,72
-DA:54,72
-DA:55,72
-DA:56,72
-DA:57,72
-DA:58,72
-DA:60,72
-DA:61,72
-DA:62,72
-DA:63,72
-DA:65,72
-DA:66,0
-DA:67,0
+DA:39,0
+DA:41,90
+DA:45,90
+DA:48,90
+DA:50,90
+DA:51,90
+DA:53,90
+DA:54,90
+DA:55,90
+DA:56,90
+DA:57,90
+DA:58,90
+DA:59,90
+DA:60,90
+DA:62,90
+DA:63,90
+DA:64,90
+DA:65,90
+DA:67,90
 DA:68,0
 DA:69,0
-DA:70,72
-DA:72,72
-DA:73,72
-DA:75,72
-DA:76,72
-DA:77,72
-DA:78,72
-DA:79,72
-DA:80,72
-DA:81,72
-DA:82,72
-DA:83,72
-DA:85,72
-DA:87,72
-DA:88,72
-DA:90,0
-DA:91,0
-DA:92,0
-DA:93,0
-DA:95,0
-DA:96,0
-DA:97,0
-DA:99,0
-DA:101,0
-DA:102,0
-DA:103,0
-DA:104,0
-DA:105,0
-DA:107,0
-DA:108,0
-DA:109,0
+DA:70,0
+DA:71,0
+DA:72,90
+DA:74,90
+DA:75,90
+DA:77,45
+DA:78,45
+DA:79,45
+DA:80,45
+DA:81,45
+DA:82,45
+DA:83,45
+DA:84,45
+DA:87,45
+DA:89,45
+DA:90,45
+DA:92,45
+DA:93,45
+DA:95,90
+DA:96,90
+DA:97,90
+DA:98,90
+DA:99,90
+DA:100,90
+DA:101,90
+DA:102,90
+DA:103,90
+DA:105,90
+DA:107,90
+DA:108,90
 DA:110,0
 DA:111,0
 DA:112,0
 DA:113,0
 DA:115,0
 DA:116,0
+DA:117,0
 DA:119,0
+DA:121,0
 DA:122,0
+DA:123,0
+DA:124,0
 DA:125,0
-DA:126,0
-DA:128,36
-DA:129,36
-DA:130,36
-DA:131,36
-DA:132,36
-DA:133,36
-DA:134,36
-DA:136,36
-DA:138,36
-DA:139,36
-DA:140,36
-DA:141,36
-DA:143,36
-DA:144,0
+DA:127,0
+DA:128,0
+DA:129,0
+DA:130,0
+DA:131,0
+DA:132,0
+DA:133,0
+DA:135,0
+DA:136,0
+DA:139,0
+DA:142,0
 DA:145,0
 DA:146,0
-DA:147,0
-DA:148,36
-DA:150,36
-DA:151,36
-DA:153,36
-DA:154,36
-DA:155,36
-DA:156,36
-DA:157,36
-DA:158,36
-DA:159,36
-DA:161,36
-DA:162,36
-DA:164,36
-DA:165,36
-LF:110
-LH:60
+DA:148,45
+DA:149,45
+DA:150,45
+DA:151,45
+DA:152,45
+DA:153,45
+DA:154,45
+DA:156,45
+DA:158,45
+DA:159,45
+DA:160,45
+DA:161,45
+DA:163,45
+DA:164,0
+DA:165,0
+DA:166,0
+DA:167,0
+DA:168,45
+DA:170,45
+DA:171,45
+DA:173,45
+DA:174,45
+DA:175,45
+DA:176,45
+DA:177,45
+DA:178,45
+DA:179,45
+DA:181,45
+DA:182,45
+DA:184,45
+DA:185,45
+LF:123
+LH:73
 end_of_record
 SF:crates/conjure_core/src/solver/mod.rs
-FN:235,<conjure_core::solver::Solver<_>>::get_family
-FN:251,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
-FN:113,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FN:309,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:113,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FN:113,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
-FN:199,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:244,<conjure_core::solver::Solver<_>>::new
+FN:261,<conjure_core::solver::Solver<_>>::load_model
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FN:255,<conjure_core::solver::Solver<_>>::get_family
 FN:59,rust_out::main::_doctest_main_crates_conjure_core_src_solver_mod_rs_24_0::{closure#0}
-FN:113,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FN:225,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:113,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FN:199,<_ as conjure_core::solver::SolverAdaptor>::init_solver
-FN:309,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FN:199,<_ as conjure_core::solver::SolverAdaptor>::init_solver
-FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
-FN:113,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:241,<conjure_core::solver::Solver<_>>::load_model
-FN:225,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:113,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FN:113,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
-FN:277,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
-FN:113,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FN:113,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:251,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:309,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
-FN:277,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
-FN:235,<conjure_core::solver::Solver<_>>::get_family
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:364,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:272,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
+FN:117,<conjure_core::solver::SolverFamilyIter>::get
+FN:117,<conjure_core::solver::SolverFamilyIter>::get
+FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FN:261,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FN:357,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FN:340,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
+FN:255,<conjure_core::solver::Solver<_>>::get_family
+FN:117,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FN:214,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:244,<conjure_core::solver::Solver<_>>::new
+FN:117,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FN:117,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
+FN:214,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
+FN:203,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FN:340,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::stats
+FN:203,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FN:357,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FN:117,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FN:261,<conjure_core::solver::Solver<_>>::load_model
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:214,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:272,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
+FN:272,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
+FN:117,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
+FN:261,<conjure_core::solver::Solver<_>>::load_model
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:117,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
+FN:117,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FN:255,<conjure_core::solver::Solver<_>>::get_family
+FN:214,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:117,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FN:117,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
+FN:244,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:117,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FN:340,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::stats
+FN:209,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FN:117,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FN:244,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
+FN:357,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FN:244,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
+FN:345,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
+FN:214,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:340,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
+FN:203,<_ as conjure_core::solver::SolverAdaptor>::init_solver
+FN:364,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:261,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FN:209,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FN:345,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:272,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
+FN:117,<conjure_core::solver::SolverFamilyIter>::get
+FN:209,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:345,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FN:203,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
+FN:214,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
+FN:340,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
+FN:364,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FN:203,<_ as conjure_core::solver::SolverAdaptor>::init_solver
 FN:25,rust_out::main
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:316,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FN:316,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FN:251,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:113,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
-FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
-FN:199,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
-FN:225,<conjure_core::solver::Solver<_>>::new
-FN:113,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:113,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FN:241,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FN:244,<conjure_core::solver::Solver<_>>::new
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:117,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FN:345,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FN:117,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FN:117,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:25,rust_out::main::_doctest_main_crates_conjure_core_src_solver_mod_rs_24_0
-FN:241,<conjure_core::solver::Solver<_>>::load_model
-FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:251,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
-FN:113,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FN:113,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
-FN:113,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:113,<conjure_core::solver::SolverFamilyIter>::get
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:241,<conjure_core::solver::Solver<_>>::load_model
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FN:225,<conjure_core::solver::Solver<_>>::new
-FN:251,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
-FN:251,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
-FN:225,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FN:225,<conjure_core::solver::Solver<_>>::new
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FN:277,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
-FN:199,<_ as conjure_core::solver::SolverAdaptor>::init_solver
-FN:241,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
-FN:113,<conjure_core::solver::SolverFamilyIter>::get
-FN:113,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FN:235,<conjure_core::solver::Solver<_>>::get_family
-FN:113,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
-FN:113,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
-FN:113,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:241,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
-FN:113,<conjure_core::solver::SolverFamilyIter>::get
-FN:316,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FN:199,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
-FNDA:0,<conjure_core::solver::Solver<_>>::get_family
-FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:117,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
+FN:261,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FN:117,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
+FN:117,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:272,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
+FN:345,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FN:117,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FN:117,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FN:203,<_ as conjure_core::solver::SolverAdaptor>::init_solver
+FN:117,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:305,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FN:272,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::solver::Solver<_>>::new
+FNDA:0,<conjure_core::solver::Solver<_>>::load_model
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
-FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FNDA:0,<conjure_core::solver::Solver<_>>::get_family
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_solver_mod_rs_24_0::{closure#0}
-FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::init_solver
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::init_solver
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
-FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::solver::Solver<_>>::load_model
-FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
+FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FNDA:0,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FNDA:0,<conjure_core::solver::SolverFamilyIter>::get
+FNDA:0,<conjure_core::solver::SolverFamilyIter>::get
 FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
 FNDA:0,<conjure_core::solver::Solver<_>>::get_family
+FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:1,rust_out::main
+FNDA:0,<conjure_core::solver::Solver<_>>::new
+FNDA:0,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FNDA:0,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
 FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
-FNDA:0,<conjure_core::solver::Solver<_>>::new
-FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::stats
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FNDA:0,<conjure_core::solver::Solver<_>>::load_model
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_solver_mod_rs_24_0
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
 FNDA:0,<conjure_core::solver::Solver<_>>::load_model
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::next
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
-FNDA:0,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
-FNDA:0,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FNDA:0,<conjure_core::solver::Solver<_>>::get_family
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::fmt::Debug>::fmt
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::clone::Clone>::clone
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::solver::SolverFamilyIter>::get
-FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::solver::Solver<_>>::load_model
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
-FNDA:0,<conjure_core::solver::Solver<_>>::new
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
+FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::stats
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
 FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FNDA:0,<conjure_core::solver::Solver<_>>::new
-FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
-FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::wall_time_s
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::new
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
 FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::init_solver
+FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FNDA:1,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
 FNDA:0,<conjure_core::solver::SolverFamilyIter>::get
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::get_name
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
 FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
-FNDA:0,<conjure_core::solver::Solver<_>>::get_family
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::size_hint
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::add_adaptor_info_to_stats
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::exact_size::ExactSizeIterator>::len
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::stats
+FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::init_solver
+FNDA:1,rust_out::main
+FNDA:0,<conjure_core::solver::Solver<_>>::new
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FNDA:0,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_solver_mod_rs_24_0
 FNDA:0,<conjure_core::solver::SolverFamily as core::convert::TryFrom<&str>>::try_from
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::iterator::Iterator>::nth
+FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
+FNDA:0,<conjure_core::solver::SolverFamilyIter as core::iter::traits::double_ended::DoubleEndedIterator>::next_back
 FNDA:0,<conjure_core::solver::SolverFamily as strum::IntoEnumIterator>::iter
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion>>::load_model
-FNDA:0,<conjure_core::solver::SolverFamilyIter>::get
-FNDA:0,<conjure_core::solver::SolverError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::init_solver
-FNF:99
-FNH:11
+FNDA:0,<conjure_core::solver::Solver<conjure_core::solver::adaptors::minion::Minion, conjure_core::solver::states::ModelLoaded>>::solve
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ExecutionSuccess>>::save_stats_to_context
+FNDA:0,<conjure_core::solver::SolverFamily as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::solver::SolverFamily as core::str::traits::FromStr>::from_str
+FNDA:0,<_ as conjure_core::solver::SolverAdaptor>::init_solver
+FNDA:0,<<conjure_core::solver::SolverFamily as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve_mut
+FNDA:0,<conjure_core::solver::Solver<_, conjure_core::solver::states::ModelLoaded>>::solve
+FNF:115
+FNH:15
 BRF:0
 BRH:0
 DA:25,1
@@ -3790,218 +3856,253 @@ DA:64,1
 DA:65,1
 DA:66,1
 DA:67,1
-DA:113,0
-DA:199,45
-DA:225,45
-DA:226,45
-DA:227,45
-DA:228,45
-DA:229,45
-DA:230,45
-DA:231,45
-DA:232,45
-DA:233,45
-DA:235,0
-DA:236,0
-DA:237,0
-DA:241,45
-DA:242,45
-DA:243,45
-DA:244,45
-DA:245,45
-DA:246,45
-DA:247,45
-DA:251,45
-DA:252,45
-DA:253,45
-DA:254,45
-DA:255,45
-DA:256,45
-DA:257,45
-DA:258,45
-DA:259,45
-DA:260,45
-DA:261,45
-DA:262,45
-DA:263,45
-DA:264,45
-DA:265,45
-DA:266,45
-DA:267,45
-DA:268,45
-DA:269,45
-DA:270,45
-DA:271,45
-DA:272,45
-DA:273,0
-DA:275,45
-DA:277,0
-DA:278,0
-DA:279,0
-DA:280,0
-DA:281,0
-DA:282,0
-DA:283,0
-DA:284,0
-DA:285,0
-DA:286,0
-DA:287,0
-DA:288,0
-DA:289,0
-DA:290,0
-DA:291,0
-DA:292,0
-DA:293,0
-DA:294,0
-DA:295,0
-DA:296,0
-DA:297,0
-DA:298,0
-DA:299,0
+DA:117,0
+DA:203,56
+DA:209,0
+DA:210,0
+DA:211,0
+DA:214,56
+DA:215,56
+DA:216,56
+DA:217,56
+DA:218,56
+DA:219,56
+DA:220,56
+DA:244,56
+DA:245,56
+DA:246,56
+DA:247,56
+DA:248,56
+DA:249,56
+DA:250,56
+DA:251,56
+DA:252,56
+DA:253,56
+DA:255,0
+DA:256,0
+DA:257,0
+DA:261,56
+DA:262,56
+DA:263,56
+DA:264,56
+DA:265,56
+DA:266,56
+DA:267,56
+DA:268,56
+DA:272,56
+DA:273,56
+DA:274,56
+DA:275,56
+DA:276,56
+DA:277,56
+DA:278,56
+DA:279,56
+DA:280,56
+DA:281,56
+DA:282,56
+DA:283,56
+DA:284,56
+DA:285,56
+DA:286,56
+DA:287,56
+DA:288,56
+DA:289,56
+DA:290,56
+DA:291,56
+DA:292,56
+DA:293,56
+DA:294,56
+DA:295,56
+DA:296,56
+DA:297,56
+DA:298,56
+DA:299,56
 DA:301,0
+DA:303,56
 DA:305,0
 DA:306,0
 DA:307,0
+DA:308,0
 DA:309,0
 DA:310,0
 DA:311,0
+DA:312,0
+DA:313,0
+DA:314,0
+DA:315,0
 DA:316,0
-LF:119
-LH:83
+DA:317,0
+DA:318,0
+DA:319,0
+DA:320,0
+DA:321,0
+DA:322,0
+DA:323,0
+DA:324,0
+DA:325,0
+DA:326,0
+DA:327,0
+DA:328,0
+DA:329,0
+DA:330,0
+DA:331,0
+DA:332,0
+DA:334,0
+DA:336,0
+DA:340,45
+DA:341,45
+DA:342,45
+DA:345,45
+DA:346,45
+DA:347,45
+DA:348,45
+DA:349,45
+DA:350,45
+DA:351,45
+DA:352,45
+DA:353,45
+DA:354,45
+DA:355,45
+DA:357,0
+DA:358,0
+DA:359,0
+DA:364,0
+LF:154
+LH:112
 end_of_record
 SF:crates/conjure_core/src/solver/adaptors/sat_common.rs
-FN:37,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FN:289,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
-FN:74,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
-FN:37,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FN:205,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
 FN:141,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
-FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FN:234,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
-FN:29,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
-FN:249,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
-FN:85,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FN:90,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
 FN:289,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
 FN:37,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FN:284,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FN:289,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
+FN:85,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FN:141,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
+FN:117,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FN:29,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
 FN:74,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
+FN:272,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
+FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
 FN:85,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
 FN:90,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FN:154,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
+FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FN:315,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FN:205,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
+FN:218,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
+FN:74,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
+FN:249,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
+FN:315,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
 FN:284,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
-FN:141,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
-FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FN:205,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
 FN:154,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
-FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
-FN:90,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FN:249,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
+FN:272,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
+FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
+FN:37,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
+FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FN:117,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<_>
+FN:154,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
+FN:234,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
 FN:321,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
 FN:284,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
-FN:234,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FN:90,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FN:289,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
 FN:249,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
-FN:272,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FN:315,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FN:205,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
 FN:218,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
-FN:272,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FN:85,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
-FN:154,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
-FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
-FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
-FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FN:29,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
 FN:29,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
-FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
-FN:117,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
-FN:186,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FN:321,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FN:205,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
-FN:315,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FN:141,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
+FN:289,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FN:234,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
+FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FN:74,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
 FN:315,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FN:198,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FN:117,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FN:85,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FN:90,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
 FN:321,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FN:218,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
+FN:154,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
 FN:272,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FN:234,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
 FN:218,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
-FN:74,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
-FN:110,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<_>
-FN:117,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
+FN:249,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FN:130,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
+FN:102,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FN:37,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
+FN:284,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FNDA:0,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
+FNDA:0,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<_>
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
 FNDA:0,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FNDA:0,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::new
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<i32>
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_reference_index
 FNDA:0,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_not
-FNDA:0,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::as_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFError as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
 FNDA:0,<i32 as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_reference
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_index
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_name
 FNDA:0,<&conjure_core::ast::symbol_table::Name as conjure_core::solver::adaptors::sat_common::HasVariable>::has_variable
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::clause_to_expression
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_flat_expression
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
 FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_or
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::get_variables
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::has_variable::<_>
-FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_clause
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::handle_and
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_expression
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::add_variable
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel>::from_conjure
+FNDA:0,<conjure_core::solver::adaptors::sat_common::CNFModel as core::default::Default>::default
 FNF:66
 FNH:0
 BRF:0
@@ -4168,191 +4269,193 @@ LF:158
 LH:0
 end_of_record
 SF:crates/conjure_core/src/model.rs
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:47,<conjure_core::model::Model>::add_variable
-FN:59,<conjure_core::model::Model>::set_constraints
-FN:96,<conjure_core::model::Model as core::default::Default>::default
-FN:42,<conjure_core::model::Model>::get_domain
-FN:96,<conjure_core::model::Model as core::default::Default>::default
-FN:12,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FN:88,<conjure_core::model::Model>::gensym
-FN:42,<conjure_core::model::Model>::get_domain
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:69,<conjure_core::model::Model>::set_context
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FN:23,<conjure_core::model::Model>::new
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:69,<conjure_core::model::Model>::set_context
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:43,<conjure_core::model::Model>::get_domain::{closure#0}
-FN:81,<conjure_core::model::Model>::add_constraints
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:36,<conjure_core::model::Model>::update_domain
-FN:43,<conjure_core::model::Model>::get_domain::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
-FN:51,<conjure_core::model::Model>::get_constraints_vec
-FN:43,<conjure_core::model::Model>::get_domain::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:88,<conjure_core::model::Model>::gensym
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:47,<conjure_core::model::Model>::add_variable
-FN:51,<conjure_core::model::Model>::get_constraints_vec
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:47,<conjure_core::model::Model>::add_variable
-FN:73,<conjure_core::model::Model>::add_constraint
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:73,<conjure_core::model::Model>::add_constraint
-FN:96,<conjure_core::model::Model as core::default::Default>::default
-FN:12,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
-FN:51,<conjure_core::model::Model>::get_constraints_vec
-FN:73,<conjure_core::model::Model>::add_constraint
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FN:81,<conjure_core::model::Model>::add_constraints
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:88,<conjure_core::model::Model>::gensym
-FN:23,<conjure_core::model::Model>::new
-FN:69,<conjure_core::model::Model>::set_context
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:36,<conjure_core::model::Model>::update_domain
-FN:36,<conjure_core::model::Model>::update_domain
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FN:59,<conjure_core::model::Model>::set_constraints
-FN:12,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
-FN:81,<conjure_core::model::Model>::add_constraints
-FN:12,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:59,<conjure_core::model::Model>::set_constraints
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
-FN:42,<conjure_core::model::Model>::get_domain
-FN:23,<conjure_core::model::Model>::new
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FN:12,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:1,<conjure_core::model::Model>::add_variable
-FNDA:0,<conjure_core::model::Model>::set_constraints
-FNDA:0,<conjure_core::model::Model as core::default::Default>::default
-FNDA:0,<conjure_core::model::Model>::get_domain
-FNDA:0,<conjure_core::model::Model as core::default::Default>::default
-FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<conjure_core::model::Model>::gensym
-FNDA:0,<conjure_core::model::Model>::get_domain
-FNDA:1,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:14,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:55,<conjure_core::model::Model>::add_variable
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:44,<conjure_core::model::Model>::update_domain
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FN:40,<conjure_core::model::Model>::new_empty
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:44,<conjure_core::model::Model>::update_domain
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:27,<conjure_core::model::Model>::new
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FN:50,<conjure_core::model::Model>::get_domain
+FN:14,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:14,<conjure_core::model::Model as core::cmp::PartialEq>::eq
+FN:67,<conjure_core::model::Model>::set_constraints
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:50,<conjure_core::model::Model>::get_domain
+FN:89,<conjure_core::model::Model>::add_constraints
+FN:67,<conjure_core::model::Model>::set_constraints
+FN:77,<conjure_core::model::Model>::set_context
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:40,<conjure_core::model::Model>::new_empty
+FN:81,<conjure_core::model::Model>::add_constraint
+FN:51,<conjure_core::model::Model>::get_domain::{closure#0}
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
+FN:77,<conjure_core::model::Model>::set_context
+FN:51,<conjure_core::model::Model>::get_domain::{closure#0}
+FN:81,<conjure_core::model::Model>::add_constraint
+FN:27,<conjure_core::model::Model>::new
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:51,<conjure_core::model::Model>::get_domain::{closure#0}
+FN:14,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
+FN:55,<conjure_core::model::Model>::add_variable
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
+FN:50,<conjure_core::model::Model>::get_domain
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:14,<conjure_core::model::Model as core::cmp::PartialEq>::eq
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:96,<conjure_core::model::Model>::gensym
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:67,<conjure_core::model::Model>::set_constraints
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:55,<conjure_core::model::Model>::add_variable
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:81,<conjure_core::model::Model>::add_constraint
+FN:27,<conjure_core::model::Model>::new
+FN:96,<conjure_core::model::Model>::gensym
+FN:89,<conjure_core::model::Model>::add_constraints
+FN:14,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
+FN:59,<conjure_core::model::Model>::get_constraints_vec
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:96,<conjure_core::model::Model>::gensym
+FN:40,<conjure_core::model::Model>::new_empty
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:59,<conjure_core::model::Model>::get_constraints_vec
+FN:44,<conjure_core::model::Model>::update_domain
+FN:14,<conjure_core::model::Model as core::cmp::PartialEq>::eq
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
+FN:14,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
+FN:89,<conjure_core::model::Model>::add_constraints
+FN:14,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:77,<conjure_core::model::Model>::set_context
+FN:59,<conjure_core::model::Model>::get_constraints_vec
+FN:14,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
 FNDA:1,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::model::Model>::add_variable
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<conjure_core::model::Model>::update_domain
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::model::Model>::new_empty
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<conjure_core::model::Model>::set_context
+FNDA:0,<conjure_core::model::Model>::update_domain
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FNDA:1,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<conjure_core::model::Model>::new
+FNDA:1,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::model::Model>::get_domain
+FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
+FNDA:1,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::model::Model as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::model::Model>::set_constraints
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::model::Model>::get_domain
+FNDA:1,<conjure_core::model::Model>::add_constraints
+FNDA:0,<conjure_core::model::Model>::set_constraints
 FNDA:0,<conjure_core::model::Model>::set_context
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FNDA:1,<conjure_core::model::Model>::new_empty
+FNDA:0,<conjure_core::model::Model>::add_constraint
 FNDA:0,<conjure_core::model::Model>::get_domain::{closure#0}
-FNDA:1,<conjure_core::model::Model>::add_constraints
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<serde_json::de::MapAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:1,<conjure_core::model::Model>::update_domain
+FNDA:0,<conjure_core::model::Model>::set_context
 FNDA:0,<conjure_core::model::Model>::get_domain::{closure#0}
+FNDA:0,<conjure_core::model::Model>::add_constraint
+FNDA:1,<conjure_core::model::Model>::new
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
-FNDA:1,<conjure_core::model::Model>::get_constraints_vec
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<conjure_core::model::Model>::get_domain::{closure#0}
-FNDA:1,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::model::Model>::gensym
-FNDA:1,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
+FNDA:0,<conjure_core::model::Model>::add_variable
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>::{closure#0}
+FNDA:0,<conjure_core::model::Model>::get_domain
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:1,<conjure_core::model::Model as core::cmp::PartialEq>::eq
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::model::Model>::add_variable
-FNDA:0,<conjure_core::model::Model>::get_constraints_vec
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<conjure_core::model::Model>::gensym
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
+FNDA:1,<conjure_core::model::Model>::set_constraints
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:1,<conjure_core::model::Model>::add_variable
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::model::Model>::add_variable
-FNDA:0,<conjure_core::model::Model>::add_constraint
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<conjure_core::model::Model>::add_constraint
-FNDA:1,<conjure_core::model::Model as core::default::Default>::default
+FNDA:0,<conjure_core::model::Model>::new
+FNDA:1,<conjure_core::model::Model>::gensym
+FNDA:0,<conjure_core::model::Model>::add_constraints
 FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
 FNDA:0,<conjure_core::model::Model>::get_constraints_vec
-FNDA:0,<conjure_core::model::Model>::add_constraint
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FNDA:0,<conjure_core::model::Model>::add_constraints
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<conjure_core::model::Model>::gensym
-FNDA:0,<conjure_core::model::Model>::new
-FNDA:0,<conjure_core::model::Model>::set_context
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::model::Model>::update_domain
-FNDA:0,<conjure_core::model::Model>::update_domain
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<serde_json::de::MapKey<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<conjure_core::model::Model>::gensym
+FNDA:0,<conjure_core::model::Model>::new_empty
 FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::<_>
-FNDA:1,<conjure_core::model::Model>::set_constraints
-FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:1,<conjure_core::model::Model>::get_constraints_vec
+FNDA:1,<conjure_core::model::Model>::update_domain
+FNDA:0,<conjure_core::model::Model as core::cmp::PartialEq>::eq
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<_>::{closure#0}
+FNDA:1,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<serde_json::value::ser::Serializer>
 FNDA:0,<conjure_core::model::Model>::add_constraints
-FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:1,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::model::Model>::set_constraints
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::model::Model as serde::ser::Serialize>::serialize::__SerializeWith as serde::ser::Serialize>::serialize::<_>
-FNDA:0,<conjure_core::model::Model>::get_domain
-FNDA:1,<conjure_core::model::Model>::new
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_seq::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<_>
-FNF:88
-FNH:13
+FNDA:0,<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::model::Model>::set_context
+FNDA:0,<conjure_core::model::Model>::get_constraints_vec
+FNDA:0,<<<conjure_core::model::Model as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_map::__DeserializeWith as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNF:91
+FNH:14
 BRF:0
 BRH:0
-DA:12,360
-DA:23,6900
-DA:24,6900
-DA:25,6900
-DA:26,6900
+DA:14,630
 DA:27,6900
 DA:28,6900
 DA:29,6900
@@ -4361,55 +4464,59 @@ DA:31,6900
 DA:32,6900
 DA:33,6900
 DA:34,6900
-DA:36,15
-DA:37,15
-DA:38,15
-DA:39,15
-DA:40,15
-DA:42,0
-DA:43,0
-DA:44,0
-DA:47,375
-DA:48,375
-DA:49,375
-DA:51,360
-DA:52,360
-DA:53,120
-DA:54,180
-DA:55,60
-DA:57,360
-DA:59,180
-DA:60,180
-DA:61,0
+DA:35,6900
+DA:36,6900
+DA:37,6900
+DA:38,6900
+DA:40,6840
+DA:41,6840
+DA:42,6840
+DA:44,15
+DA:45,15
+DA:46,15
+DA:47,15
+DA:48,15
+DA:50,0
+DA:51,0
+DA:52,0
+DA:55,375
+DA:56,375
+DA:57,375
+DA:59,360
+DA:60,360
+DA:61,120
 DA:62,180
-DA:63,150
-DA:64,150
-DA:65,30
-DA:66,30
+DA:63,60
+DA:65,360
 DA:67,180
+DA:68,180
 DA:69,0
-DA:70,0
-DA:71,0
-DA:73,0
-DA:74,0
-DA:75,0
-DA:76,0
+DA:70,180
+DA:71,150
+DA:72,150
+DA:73,30
+DA:74,30
+DA:75,180
 DA:77,0
 DA:78,0
 DA:79,0
-DA:81,180
-DA:82,180
-DA:83,180
-DA:84,180
-DA:85,180
-DA:88,75
-DA:89,75
-DA:90,75
-DA:91,75
-DA:92,75
-DA:96,6840
-DA:97,6840
-DA:98,6840
+DA:81,0
+DA:82,0
+DA:83,0
+DA:84,0
+DA:85,0
+DA:86,0
+DA:87,0
+DA:89,180
+DA:90,180
+DA:91,180
+DA:92,180
+DA:93,180
+DA:96,75
+DA:97,75
+DA:98,75
+DA:99,75
+DA:100,75
 LF:62
 LH:48
 end_of_record
@@ -4534,77 +4641,77 @@ LH:20
 end_of_record
 SF:crates/conjure_core/src/rules/cnf.rs
 FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
 FN:42,rust_out::main::_doctest_main_crates_conjure_core_src_rules_cnf_rs_42_0
-FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
 FN:42,rust_out::main
 FN:18,rust_out::main::_doctest_main_crates_conjure_core_src_rules_cnf_rs_18_0
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
-FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
-FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
 FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
 FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FN:46,conjure_core::rules::cnf::distribute_not_over_or
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
 FN:46,conjure_core::rules::cnf::distribute_not_over_or
-FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
 FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
+FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FN:22,conjure_core::rules::cnf::distribute_not_over_and
-FN:22,conjure_core::rules::cnf::distribute_not_over_and
+FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
+FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FN:46,conjure_core::rules::cnf::distribute_not_over_or
-FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
+FN:22,conjure_core::rules::cnf::distribute_not_over_and
+FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
+FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
 FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
 FN:45,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
-FN:22,conjure_core::rules::cnf::distribute_not_over_and
 FN:12,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
+FN:22,conjure_core::rules::cnf::distribute_not_over_and
+FN:21,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FN:46,conjure_core::rules::cnf::distribute_not_over_or
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_cnf_rs_42_0
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
 FNDA:1,rust_out::main
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_cnf_rs_18_0
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::cnf::distribute_not_over_or
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::distribute_not_over_or
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FNDA:0,conjure_core::rules::cnf::distribute_not_over_and
-FNDA:1,conjure_core::rules::cnf::distribute_not_over_and
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck
 FNDA:1,conjure_core::rules::cnf::distribute_not_over_or
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::cnf::distribute_not_over_and
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_OR::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::cnf::distribute_not_over_and
 FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_SET_CNF::__typecheck
+FNDA:1,conjure_core::rules::cnf::distribute_not_over_and
+FNDA:0,conjure_core::rules::cnf::CONJURE_GEN_RULE_DISTRIBUTE_NOT_OVER_AND::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::cnf::distribute_not_over_or
 FNF:36
 FNH:5
 BRF:0
@@ -4646,87 +4753,87 @@ LF:33
 LH:30
 end_of_record
 SF:crates/conjure_core/src/ast/constants.rs
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:24,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:33,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:24,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:24,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:33,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
 FN:14,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:14,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:24,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FN:33,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:14,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:24,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
 FN:33,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:1,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:14,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:5,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:0,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
 FNDA:1,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FNDA:0,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
-FNDA:1,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<bool as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
 FNDA:0,<conjure_core::ast::constants::Constant as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<i32 as core::convert::TryFrom<conjure_core::ast::constants::Constant>>::try_from
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::constants::Constant as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNF:38
 FNH:5
 BRF:0
 BRH:0
-DA:5,552
+DA:5,690
 DA:14,1110
 DA:15,1110
 DA:16,1065
@@ -4884,296 +4991,296 @@ LF:84
 LH:84
 end_of_record
 SF:crates/conjure_core/src/rules/minion.rs
-FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FN:196,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_196_0
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
 FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
-FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
 FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
-FN:176,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_176_0
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
 FN:276,conjure_core::rules::minion::eq_to_leq_geq
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
-FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FN:15,conjure_core::rules::minion::is_nested_sum
 FN:67,conjure_core::rules::minion::flatten_sum_geq
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
-FN:160,conjure_core::rules::minion::lt_to_ineq
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FN:196,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_196_0
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
+FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
+FN:139,conjure_core::rules::minion::sumeq_to_minion
 FN:109,conjure_core::rules::minion::sum_eq_to_sumeq
-FN:27,conjure_core::rules::minion::sum_to_vector
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
+FN:176,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_176_0
+FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
+FN:200,conjure_core::rules::minion::geq_to_ineq
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
 FN:139,conjure_core::rules::minion::sumeq_to_minion
+FN:109,conjure_core::rules::minion::sum_eq_to_sumeq
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
 FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
+FN:160,conjure_core::rules::minion::lt_to_ineq
 FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
-FN:109,conjure_core::rules::minion::sum_eq_to_sumeq
+FN:200,conjure_core::rules::minion::geq_to_ineq
 FN:276,conjure_core::rules::minion::eq_to_leq_geq
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
 FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
-FN:180,conjure_core::rules::minion::gt_to_ineq
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FN:67,conjure_core::rules::minion::flatten_sum_geq
-FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
+FN:15,conjure_core::rules::minion::is_nested_sum
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FN:200,conjure_core::rules::minion::geq_to_ineq
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FN:160,conjure_core::rules::minion::lt_to_ineq
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
+FN:27,conjure_core::rules::minion::sum_to_vector
+FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
 FN:156,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_156_0
 FN:135,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_135_0
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
 FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FN:276,conjure_core::rules::minion::eq_to_leq_geq
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:67,conjure_core::rules::minion::flatten_sum_geq
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
 FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FN:180,conjure_core::rules::minion::gt_to_ineq
+FN:220,conjure_core::rules::minion::leq_to_ineq
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
 FN:105,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_105_0
 FN:130,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_130_0
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
+FN:139,conjure_core::rules::minion::sumeq_to_minion
+FN:160,conjure_core::rules::minion::lt_to_ineq
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FN:220,conjure_core::rules::minion::leq_to_ineq
+FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
 FN:265,conjure_core::rules::minion::neq_to_alldiff
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:27,conjure_core::rules::minion::sum_to_vector
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:180,conjure_core::rules::minion::gt_to_ineq
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FN:109,conjure_core::rules::minion::sum_eq_to_sumeq
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
 FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FN:200,conjure_core::rules::minion::geq_to_ineq
+FN:67,conjure_core::rules::minion::flatten_sum_geq
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
+FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
-FN:200,conjure_core::rules::minion::geq_to_ineq
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FN:276,conjure_core::rules::minion::eq_to_leq_geq
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:15,conjure_core::rules::minion::is_nested_sum
+FN:27,conjure_core::rules::minion::sum_to_vector
 FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FN:160,conjure_core::rules::minion::lt_to_ineq
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
 FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
-FN:220,conjure_core::rules::minion::leq_to_ineq
-FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FN:180,conjure_core::rules::minion::gt_to_ineq
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
 FN:15,conjure_core::rules::minion::is_nested_sum
-FN:265,conjure_core::rules::minion::neq_to_alldiff
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:88,conjure_core::rules::minion::sum_leq_to_sumleq
-FN:265,conjure_core::rules::minion::neq_to_alldiff
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
 FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FN:220,conjure_core::rules::minion::leq_to_ineq
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
+FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FN:196,rust_out::main
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
+FN:180,conjure_core::rules::minion::gt_to_ineq
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:15,conjure_core::rules::minion::is_nested_sum
+FN:27,conjure_core::rules::minion::sum_to_vector
 FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
 FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FN:160,conjure_core::rules::minion::lt_to_ineq
-FN:67,conjure_core::rules::minion::flatten_sum_geq
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:87,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
 FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
 FN:63,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_63_0
-FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
-FN:139,conjure_core::rules::minion::sumeq_to_minion
-FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
-FN:200,conjure_core::rules::minion::geq_to_ineq
-FN:138,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FN:216,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_216_0
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
+FN:159,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:219,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FN:179,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FN:220,conjure_core::rules::minion::leq_to_ineq
-FN:27,conjure_core::rules::minion::sum_to_vector
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
+FN:180,conjure_core::rules::minion::gt_to_ineq
+FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FN:216,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_216_0
+FN:275,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FN:264,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
+FN:265,conjure_core::rules::minion::neq_to_alldiff
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
+FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
+FN:66,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
 FN:84,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_84_0
-FN:109,conjure_core::rules::minion::sum_eq_to_sumeq
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
 FN:108,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FN:199,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FN:139,conjure_core::rules::minion::sumeq_to_minion
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_196_0
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
+FN:13,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FN:265,conjure_core::rules::minion::neq_to_alldiff
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
-FNDA:1,conjure_core::rules::minion::sum_leq_to_sumleq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_176_0
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
 FNDA:1,conjure_core::rules::minion::eq_to_leq_geq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::is_nested_sum
 FNDA:0,conjure_core::rules::minion::flatten_sum_geq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::lt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_196_0
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::sum_leq_to_sumleq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::sumeq_to_minion
+FNDA:0,conjure_core::rules::minion::sum_eq_to_sumeq
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_176_0
+FNDA:1,conjure_core::rules::minion::sum_leq_to_sumleq
+FNDA:0,conjure_core::rules::minion::geq_to_ineq
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::sumeq_to_minion
 FNDA:1,conjure_core::rules::minion::sum_eq_to_sumeq
-FNDA:0,conjure_core::rules::minion::sum_to_vector
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::minion::sumeq_to_minion
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::lt_to_ineq
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
-FNDA:0,conjure_core::rules::minion::sum_eq_to_sumeq
+FNDA:0,conjure_core::rules::minion::geq_to_ineq
 FNDA:0,conjure_core::rules::minion::eq_to_leq_geq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::gt_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::minion::flatten_sum_geq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::is_nested_sum
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::minion::geq_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::minion::lt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::sum_to_vector
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_156_0
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_135_0
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::eq_to_leq_geq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::flatten_sum_geq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::gt_to_ineq
+FNDA:0,conjure_core::rules::minion::leq_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_105_0
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_130_0
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
+FNDA:1,conjure_core::rules::minion::sumeq_to_minion
+FNDA:0,conjure_core::rules::minion::lt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::leq_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
 FNDA:1,conjure_core::rules::minion::neq_to_alldiff
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::minion::sum_to_vector
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::gt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::sum_eq_to_sumeq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::geq_to_ineq
+FNDA:1,conjure_core::rules::minion::flatten_sum_geq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::sum_leq_to_sumleq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:1,conjure_core::rules::minion::geq_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::eq_to_leq_geq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::is_nested_sum
+FNDA:0,conjure_core::rules::minion::sum_to_vector
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::minion::lt_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::sum_leq_to_sumleq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
-FNDA:0,conjure_core::rules::minion::leq_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::is_nested_sum
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}
-FNDA:1,conjure_core::rules::minion::gt_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck
-FNDA:1,conjure_core::rules::minion::is_nested_sum
-FNDA:0,conjure_core::rules::minion::neq_to_alldiff
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::sum_leq_to_sumleq
-FNDA:0,conjure_core::rules::minion::neq_to_alldiff
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::leq_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:1,rust_out::main
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
+FNDA:1,conjure_core::rules::minion::gt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:1,conjure_core::rules::minion::is_nested_sum
+FNDA:1,conjure_core::rules::minion::sum_to_vector
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FNDA:0,conjure_core::rules::minion::lt_to_ineq
-FNDA:0,conjure_core::rules::minion::flatten_sum_geq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_LEQ_TO_SUMLEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_63_0
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::sumeq_to_minion
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::geq_to_ineq
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUMEQ_TO_MINION::__typecheck
-FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_216_0
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_LEQ_TO_INEQ::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GT_TO_INEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:1,conjure_core::rules::minion::leq_to_ineq
-FNDA:0,conjure_core::rules::minion::sum_to_vector
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
+FNDA:0,conjure_core::rules::minion::gt_to_ineq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_216_0
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_EQ_TO_LEQ_GEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_NEQ_TO_ALLDIFF::__typecheck
+FNDA:0,conjure_core::rules::minion::neq_to_alldiff
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_FLATTEN_SUM_GEQ::__typecheck::{closure#0}::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rules_minion_rs_84_0
-FNDA:0,conjure_core::rules::minion::sum_eq_to_sumeq
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SUM_EQ_TO_SUMEQ::__typecheck
-FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_GEQ_TO_INEQ::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::minion::sumeq_to_minion
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::minion::CONJURE_GEN_RULE_SET_MINION::__typecheck
+FNDA:0,conjure_core::rules::minion::neq_to_alldiff
 FNF:145
 FNH:22
 BRF:0
@@ -5429,40 +5536,40 @@ end_of_record
 SF:crates/conjure_core/src/solver/adaptors/kissat.rs
 FN:39,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FN:47,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
-FN:60,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
-FN:55,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FN:39,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FN:33,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
-FN:39,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
+FN:33,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
 FN:60,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
-FN:55,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FN:60,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
 FN:47,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
 FN:24,<conjure_core::solver::adaptors::kissat::Kissat>::new
-FN:33,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
+FN:55,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
+FN:60,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
 FN:55,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FN:33,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
 FN:24,<conjure_core::solver::adaptors::kissat::Kissat>::new
-FN:24,<conjure_core::solver::adaptors::kissat::Kissat>::new
+FN:55,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FN:47,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
+FN:24,<conjure_core::solver::adaptors::kissat::Kissat>::new
+FN:39,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat>::new
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::get_family
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as core::default::Default>::default
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat>::new
-FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat>::new
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::load_model
 FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve_mut
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat>::new
+FNDA:0,<conjure_core::solver::adaptors::kissat::Kissat as conjure_core::solver::SolverAdaptor>::solve
 FNF:18
 FNH:0
 BRF:0
@@ -6490,112 +6597,112 @@ LF:138
 LH:133
 end_of_record
 SF:crates/conjure_core/src/rule_engine/mod.rs
-FN:222,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
 FN:193,conjure_core::rule_engine::get_rule_set_by_name
 FN:160,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck
+FN:193,conjure_core::rule_engine::get_rule_set_by_name
 FN:146,conjure_core::rule_engine::get_rule_by_name::{closure#0}
-FN:117,conjure_core::rule_engine::get_rules
-FN:117,conjure_core::rule_engine::get_rules
 FN:206,rust_out::main
-FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
+FN:40,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FN:103,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}
 FN:103,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck
 FN:103,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FN:63,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
 FN:63,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FN:40,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FN:34,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0
 FN:160,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck::{closure#0}::{closure#0}
 FN:159,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
 FN:159,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FN:146,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FN:193,conjure_core::rule_engine::get_rule_set_by_name
+FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FN:41,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::identity
-FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
-FN:213,conjure_core::rule_engine::get_rule_sets_for_solver_family
+FN:145,conjure_core::rule_engine::get_rule_by_name
 FN:222,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
 FN:172,conjure_core::rule_engine::get_rule_sets
+FN:222,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FN:172,conjure_core::rule_engine::get_rule_sets
+FN:213,conjure_core::rule_engine::get_rule_sets_for_solver_family
+FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
+FN:117,conjure_core::rule_engine::get_rules
 FN:40,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck
+FN:213,conjure_core::rule_engine::get_rule_sets_for_solver_family
+FN:145,conjure_core::rule_engine::get_rule_by_name
+FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FN:155,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0
+FN:117,conjure_core::rule_engine::get_rules
 FN:206,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_205_0
-FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
-FN:145,conjure_core::rule_engine::get_rule_by_name
+FN:146,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
 FN:185,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
+FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FN:181,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0
-FN:146,conjure_core::rule_engine::get_rule_by_name::{closure#0}
 FN:185,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FN:172,conjure_core::rule_engine::get_rule_sets
-FN:213,conjure_core::rule_engine::get_rule_sets_for_solver_family
 FN:60,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0
-FN:172,conjure_core::rule_engine::get_rule_sets
-FN:222,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FN:117,conjure_core::rule_engine::get_rules
 FN:213,conjure_core::rule_engine::get_rule_sets_for_solver_family
-FN:193,conjure_core::rule_engine::get_rule_set_by_name
+FN:172,conjure_core::rule_engine::get_rule_sets
 FN:160,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck::{closure#0}
 FN:63,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FN:117,conjure_core::rule_engine::get_rules
 FN:185,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FN:145,conjure_core::rule_engine::get_rule_by_name
-FN:193,conjure_core::rule_engine::get_rule_set_by_name
-FN:145,conjure_core::rule_engine::get_rule_by_name
 FN:104,rust_out::identity
 FN:40,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}
-FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
+FN:145,conjure_core::rule_engine::get_rule_by_name
+FN:146,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FN:222,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
 FN:159,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FN:218,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
-FN:196,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_set_by_name
+FNDA:0,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
+FNDA:1,conjure_core::rule_engine::get_rule_set_by_name
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck
+FNDA:0,conjure_core::rule_engine::get_rule_set_by_name
 FNDA:0,conjure_core::rule_engine::get_rule_by_name::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rules
-FNDA:1,conjure_core::rule_engine::get_rules
 FNDA:1,rust_out::main
-FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
+FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FNDA:0,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}
 FNDA:0,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck
 FNDA:0,rust_out::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck::{closure#0}::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FNDA:0,conjure_core::rule_engine::get_rule_set_by_name
+FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::identity
-FNDA:0,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family
-FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rule_engine::get_rule_by_name
+FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rule_engine::get_rule_sets
+FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rule_engine::get_rule_sets
+FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family
+FNDA:0,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
+FNDA:0,conjure_core::rule_engine::get_rules
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck
+FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family
+FNDA:0,conjure_core::rule_engine::get_rule_by_name
+FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0
+FNDA:1,conjure_core::rule_engine::get_rules
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_205_0
-FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_by_name
+FNDA:0,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FNDA:1,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck
+FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0
-FNDA:1,conjure_core::rule_engine::get_rule_by_name::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FNDA:1,conjure_core::rule_engine::get_rule_sets
-FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family
 FNDA:1,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0
-FNDA:0,conjure_core::rule_engine::get_rule_sets
-FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rule_engine::get_rules
 FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family
-FNDA:1,conjure_core::rule_engine::get_rule_set_by_name
+FNDA:1,conjure_core::rule_engine::get_rule_sets
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_ANOTHERRULESET::__typecheck::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_59_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rules
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_180_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_by_name
-FNDA:0,conjure_core::rule_engine::get_rule_set_by_name
-FNDA:1,conjure_core::rule_engine::get_rule_by_name
 FNDA:0,rust_out::identity
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_33_0::CONJURE_GEN_RULE_IDENTITY::__typecheck::{closure#0}
-FNDA:1,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
+FNDA:1,conjure_core::rule_engine::get_rule_by_name
+FNDA:1,conjure_core::rule_engine::get_rule_by_name::{closure#0}
+FNDA:1,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}::{closure#0}
 FNDA:0,rust_out::main::_doctest_main_crates_conjure_core_src_rule_engine_mod_rs_154_0::CONJURE_GEN_RULE_SET_MYRULESET::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_sets_for_solver_family::{closure#0}
-FNDA:0,conjure_core::rule_engine::get_rule_set_by_name::{closure#0}
 FNF:53
 FNH:15
 BRF:0
@@ -6885,6 +6992,32 @@ DA:190,8
 LF:129
 LH:125
 end_of_record
+SF:crates/conjure_core/src/stats/mod.rs
+FN:16,<conjure_core::stats::Stats>::new
+FN:16,<conjure_core::stats::Stats>::new
+FN:20,<conjure_core::stats::Stats>::add_solver_run
+FN:20,<conjure_core::stats::Stats>::add_solver_run
+FN:16,<conjure_core::stats::Stats>::new
+FN:20,<conjure_core::stats::Stats>::add_solver_run
+FNDA:0,<conjure_core::stats::Stats>::new
+FNDA:0,<conjure_core::stats::Stats>::new
+FNDA:0,<conjure_core::stats::Stats>::add_solver_run
+FNDA:1,<conjure_core::stats::Stats>::add_solver_run
+FNDA:0,<conjure_core::stats::Stats>::new
+FNDA:0,<conjure_core::stats::Stats>::add_solver_run
+FNF:6
+FNH:1
+BRF:0
+BRH:0
+DA:16,0
+DA:17,0
+DA:18,0
+DA:20,135
+DA:21,135
+DA:22,135
+LF:6
+LH:3
+end_of_record
 SF:crates/conjure_macros/src/lib.rs
 FN:151,rust_out::main::_doctest_main_crates_conjure_macros_src_lib_rs_151_0
 FN:82,conjure_rules_proc_macro::parse_parenthesized::<syn::path::Path>
@@ -7148,18 +7281,18 @@ LF:35
 LH:0
 end_of_record
 SF:crates/conjure_core/src/solver/model_modifier.rs
+FN:27,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
 FN:23,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FN:27,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
 FN:23,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FN:23,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FN:27,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
-FN:27,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
+FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
 FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
 FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_constraint
 FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
-FNDA:0,<_ as conjure_core::solver::model_modifier::ModelModifier>::add_variable
 FNF:6
 FNH:0
 BRF:0
@@ -7174,164 +7307,170 @@ LF:6
 LH:0
 end_of_record
 SF:crates/conjure_core/src/solver/adaptors/minion.rs
-FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
-FN:41,conjure_core::solver::adaptors::minion::minion_rs_callback
-FN:215,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FN:297,conjure_core::solver::adaptors::minion::read_vars
-FN:330,conjure_core::solver::adaptors::minion::read_const
-FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
-FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
-FN:317,conjure_core::solver::adaptors::minion::_read_ref
-FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
-FN:306,conjure_core::solver::adaptors::minion::read_var
-FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
-FN:251,conjure_core::solver::adaptors::minion::parse_expr
-FN:116,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FN:330,conjure_core::solver::adaptors::minion::read_const
-FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
-FN:317,conjure_core::solver::adaptors::minion::_read_ref
-FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
-FN:215,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FN:156,conjure_core::solver::adaptors::minion::parse_vars
-FN:156,conjure_core::solver::adaptors::minion::parse_vars
-FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FN:251,conjure_core::solver::adaptors::minion::parse_expr
-FN:143,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
-FN:330,conjure_core::solver::adaptors::minion::read_const
-FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
-FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
-FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FN:231,conjure_core::solver::adaptors::minion::_try_add_var
 FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FN:306,conjure_core::solver::adaptors::minion::read_var
+FN:321,conjure_core::solver::adaptors::minion::_read_ref
 FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
-FN:41,conjure_core::solver::adaptors::minion::minion_rs_callback
-FN:181,conjure_core::solver::adaptors::minion::_parse_intdomain_var
-FN:227,conjure_core::solver::adaptors::minion::_try_add_var
-FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
-FN:259,conjure_core::solver::adaptors::minion::read_expr
-FN:291,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
-FN:291,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FN:227,conjure_core::solver::adaptors::minion::_try_add_var
+FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
+FN:245,conjure_core::solver::adaptors::minion::parse_exprs
 FN:143,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
-FN:306,conjure_core::solver::adaptors::minion::read_var
-FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
-FN:317,conjure_core::solver::adaptors::minion::_read_ref
-FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FN:181,conjure_core::solver::adaptors::minion::_parse_intdomain_var
-FN:291,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FN:169,conjure_core::solver::adaptors::minion::parse_var
-FN:259,conjure_core::solver::adaptors::minion::read_expr
-FN:297,conjure_core::solver::adaptors::minion::read_vars
-FN:215,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FN:181,conjure_core::solver::adaptors::minion::_parse_intdomain_var
 FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
-FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FN:241,conjure_core::solver::adaptors::minion::parse_exprs
+FN:245,conjure_core::solver::adaptors::minion::parse_exprs
+FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FN:295,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
+FN:185,conjure_core::solver::adaptors::minion::_parse_intdomain_var
+FN:255,conjure_core::solver::adaptors::minion::parse_expr
+FN:295,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
+FN:185,conjure_core::solver::adaptors::minion::_parse_intdomain_var
+FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
+FN:219,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FN:155,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
+FN:160,conjure_core::solver::adaptors::minion::parse_vars
+FN:231,conjure_core::solver::adaptors::minion::_try_add_var
+FN:173,conjure_core::solver::adaptors::minion::parse_var
+FN:310,conjure_core::solver::adaptors::minion::read_var
+FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
+FN:173,conjure_core::solver::adaptors::minion::parse_var
+FN:334,conjure_core::solver::adaptors::minion::read_const
 FN:143,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
-FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
-FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
+FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FN:255,conjure_core::solver::adaptors::minion::parse_expr
 FN:116,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FN:227,conjure_core::solver::adaptors::minion::_try_add_var
-FN:340,conjure_core::solver::adaptors::minion::_name_to_string
-FN:169,conjure_core::solver::adaptors::minion::parse_var
-FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
-FN:297,conjure_core::solver::adaptors::minion::read_vars
+FN:301,conjure_core::solver::adaptors::minion::read_vars
 FN:116,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FN:340,conjure_core::solver::adaptors::minion::_name_to_string
-FN:340,conjure_core::solver::adaptors::minion::_name_to_string
+FN:301,conjure_core::solver::adaptors::minion::read_vars
+FN:301,conjure_core::solver::adaptors::minion::read_vars
+FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FN:219,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
 FN:41,conjure_core::solver::adaptors::minion::minion_rs_callback
-FN:241,conjure_core::solver::adaptors::minion::parse_exprs
-FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
-FN:156,conjure_core::solver::adaptors::minion::parse_vars
-FN:251,conjure_core::solver::adaptors::minion::parse_expr
-FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
-FN:241,conjure_core::solver::adaptors::minion::parse_exprs
-FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
-FN:259,conjure_core::solver::adaptors::minion::read_expr
-FN:169,conjure_core::solver::adaptors::minion::parse_var
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion>::new
-FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback
-FNDA:1,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FNDA:1,conjure_core::solver::adaptors::minion::read_vars
-FNDA:1,conjure_core::solver::adaptors::minion::read_const
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FN:344,conjure_core::solver::adaptors::minion::_name_to_string
+FN:116,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
+FN:219,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FN:155,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
+FN:263,conjure_core::solver::adaptors::minion::read_expr
+FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
+FN:334,conjure_core::solver::adaptors::minion::read_const
+FN:41,conjure_core::solver::adaptors::minion::minion_rs_callback
+FN:344,conjure_core::solver::adaptors::minion::_name_to_string
+FN:255,conjure_core::solver::adaptors::minion::parse_expr
+FN:155,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
+FN:245,conjure_core::solver::adaptors::minion::parse_exprs
+FN:263,conjure_core::solver::adaptors::minion::read_expr
+FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FN:310,conjure_core::solver::adaptors::minion::read_var
+FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
+FN:173,conjure_core::solver::adaptors::minion::parse_var
+FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
+FN:86,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
+FN:151,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FN:160,conjure_core::solver::adaptors::minion::parse_vars
+FN:310,conjure_core::solver::adaptors::minion::read_var
+FN:93,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FN:105,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FN:160,conjure_core::solver::adaptors::minion::parse_vars
+FN:321,conjure_core::solver::adaptors::minion::_read_ref
+FN:295,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
+FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
+FN:185,conjure_core::solver::adaptors::minion::_parse_intdomain_var
+FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
+FN:321,conjure_core::solver::adaptors::minion::_read_ref
+FN:143,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FN:334,conjure_core::solver::adaptors::minion::read_const
+FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
+FN:41,conjure_core::solver::adaptors::minion::minion_rs_callback
+FN:44,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
+FN:344,conjure_core::solver::adaptors::minion::_name_to_string
+FN:263,conjure_core::solver::adaptors::minion::read_expr
+FN:135,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
+FN:77,<conjure_core::solver::adaptors::minion::Minion>::new
+FN:231,conjure_core::solver::adaptors::minion::_try_add_var
+FNDA:0,conjure_core::solver::adaptors::minion::_try_add_var
+FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
 FNDA:1,conjure_core::solver::adaptors::minion::_read_ref
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
-FNDA:0,conjure_core::solver::adaptors::minion::read_var
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::parse_expr
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FNDA:0,conjure_core::solver::adaptors::minion::read_const
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::_read_ref
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
 FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
-FNDA:0,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FNDA:1,conjure_core::solver::adaptors::minion::parse_vars
+FNDA:0,conjure_core::solver::adaptors::minion::parse_exprs
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::parse_exprs
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
+FNDA:1,conjure_core::solver::adaptors::minion::_parse_intdomain_var
+FNDA:0,conjure_core::solver::adaptors::minion::parse_expr
+FNDA:0,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::_parse_intdomain_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
+FNDA:1,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
 FNDA:0,conjure_core::solver::adaptors::minion::parse_vars
-FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FNDA:1,conjure_core::solver::adaptors::minion::parse_expr
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:1,conjure_core::solver::adaptors::minion::_try_add_var
+FNDA:0,conjure_core::solver::adaptors::minion::parse_var
+FNDA:0,conjure_core::solver::adaptors::minion::read_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
+FNDA:1,conjure_core::solver::adaptors::minion::parse_var
 FNDA:0,conjure_core::solver::adaptors::minion::read_const
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion>::new
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FNDA:1,conjure_core::solver::adaptors::minion::parse_expr
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
+FNDA:0,conjure_core::solver::adaptors::minion::read_vars
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
+FNDA:1,conjure_core::solver::adaptors::minion::read_vars
+FNDA:0,conjure_core::solver::adaptors::minion::read_vars
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
 FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FNDA:0,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback
+FNDA:0,conjure_core::solver::adaptors::minion::_name_to_string
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
+FNDA:0,conjure_core::solver::adaptors::minion::_parse_booldomain_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
+FNDA:0,conjure_core::solver::adaptors::minion::read_expr
 FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::read_var
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
+FNDA:1,conjure_core::solver::adaptors::minion::read_const
 FNDA:1,conjure_core::solver::adaptors::minion::minion_rs_callback
-FNDA:0,conjure_core::solver::adaptors::minion::_parse_intdomain_var
-FNDA:0,conjure_core::solver::adaptors::minion::_try_add_var
-FNDA:1,<conjure_core::solver::adaptors::minion::Minion>::new
+FNDA:0,conjure_core::solver::adaptors::minion::_name_to_string
+FNDA:0,conjure_core::solver::adaptors::minion::parse_expr
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_name
+FNDA:1,conjure_core::solver::adaptors::minion::parse_exprs
 FNDA:1,conjure_core::solver::adaptors::minion::read_expr
-FNDA:0,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
-FNDA:0,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FNDA:1,conjure_core::solver::adaptors::minion::_try_add_var
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FNDA:0,conjure_core::solver::adaptors::minion::read_var
+FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::parse_var
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion>::new
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
+FNDA:1,<conjure_core::solver::adaptors::minion::Minion>::new
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::get_family
+FNDA:1,conjure_core::solver::adaptors::minion::parse_vars
 FNDA:1,conjure_core::solver::adaptors::minion::read_var
 FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::parse_vars
 FNDA:0,conjure_core::solver::adaptors::minion::_read_ref
-FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::_parse_intdomain_var
 FNDA:1,conjure_core::solver::adaptors::minion::read_expr::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::parse_var
-FNDA:0,conjure_core::solver::adaptors::minion::read_expr
-FNDA:0,conjure_core::solver::adaptors::minion::read_vars
-FNDA:0,conjure_core::solver::adaptors::minion::_parse_booldomain_var
-FNDA:1,conjure_core::solver::adaptors::minion::_parse_intdomain_var
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as core::default::Default>::default
-FNDA:1,conjure_core::solver::adaptors::minion::parse_exprs
-FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
 FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::_parse_intdomain_var
 FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FNDA:0,conjure_core::solver::adaptors::minion::_try_add_var
-FNDA:0,conjure_core::solver::adaptors::minion::_name_to_string
-FNDA:0,conjure_core::solver::adaptors::minion::parse_var
+FNDA:0,conjure_core::solver::adaptors::minion::_read_ref
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::load_model
+FNDA:0,conjure_core::solver::adaptors::minion::read_const
 FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::read_vars
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#1}
-FNDA:0,conjure_core::solver::adaptors::minion::_name_to_string
-FNDA:1,conjure_core::solver::adaptors::minion::_name_to_string
 FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback
-FNDA:0,conjure_core::solver::adaptors::minion::parse_exprs
-FNDA:1,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::parse_vars
-FNDA:0,conjure_core::solver::adaptors::minion::parse_expr
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}
-FNDA:0,conjure_core::solver::adaptors::minion::parse_exprs
-FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve::{closure#0}::{closure#0}
+FNDA:0,conjure_core::solver::adaptors::minion::minion_rs_callback::{closure#0}
+FNDA:1,conjure_core::solver::adaptors::minion::_name_to_string
 FNDA:0,conjure_core::solver::adaptors::minion::read_expr
-FNDA:1,conjure_core::solver::adaptors::minion::parse_var
-FNF:78
-FNH:19
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion as conjure_core::solver::SolverAdaptor>::solve_mut
+FNDA:0,<conjure_core::solver::adaptors::minion::Minion>::new
+FNDA:0,conjure_core::solver::adaptors::minion::_try_add_var
+FNF:81
+FNH:21
 BRF:0
 BRH:0
 DA:41,585
@@ -7421,60 +7560,59 @@ DA:146,180
 DA:147,180
 DA:148,180
 DA:149,180
-DA:151,0
-DA:152,0
-DA:153,0
+DA:151,180
+DA:152,180
+DA:153,180
+DA:155,180
 DA:156,180
 DA:157,180
-DA:158,180
-DA:159,180
-DA:163,465
-DA:164,465
-DA:166,180
-DA:167,180
-DA:169,465
-DA:170,465
-DA:171,465
-DA:172,465
+DA:160,180
+DA:161,180
+DA:162,180
+DA:163,180
+DA:167,465
+DA:168,465
+DA:170,180
+DA:171,180
 DA:173,465
 DA:174,465
-DA:175,360
-DA:176,105
-DA:177,0
-DA:179,465
-DA:181,360
-DA:182,360
-DA:183,360
-DA:184,360
+DA:175,465
+DA:176,465
+DA:177,465
+DA:178,465
+DA:179,360
+DA:180,105
+DA:181,0
+DA:183,465
 DA:185,360
 DA:186,360
 DA:187,360
 DA:188,360
-DA:189,0
-DA:190,0
-DA:191,0
-DA:192,0
+DA:189,360
+DA:190,360
+DA:191,360
+DA:192,360
 DA:193,0
-DA:194,360
-DA:196,360
-DA:197,360
+DA:194,0
+DA:195,0
+DA:196,0
+DA:197,0
 DA:198,360
-DA:199,360
+DA:200,360
 DA:201,360
 DA:202,360
-DA:203,0
-DA:205,0
-DA:206,0
-DA:208,360
-DA:209,360
-DA:210,360
-DA:211,360
+DA:203,360
+DA:205,360
+DA:206,360
+DA:207,0
+DA:209,0
+DA:210,0
 DA:212,360
 DA:213,360
-DA:215,105
-DA:216,105
-DA:217,105
-DA:218,105
+DA:214,360
+DA:215,360
+DA:216,360
+DA:217,360
 DA:219,105
 DA:220,105
 DA:221,105
@@ -7482,10 +7620,10 @@ DA:222,105
 DA:223,105
 DA:224,105
 DA:225,105
-DA:227,465
-DA:228,465
-DA:229,465
-DA:230,465
+DA:226,105
+DA:227,105
+DA:228,105
+DA:229,105
 DA:231,465
 DA:232,465
 DA:233,465
@@ -7495,154 +7633,178 @@ DA:236,465
 DA:237,465
 DA:238,465
 DA:239,465
-DA:241,180
-DA:242,180
-DA:243,180
-DA:244,180
-DA:245,675
-DA:246,675
+DA:240,465
+DA:241,465
+DA:242,465
+DA:243,465
+DA:245,180
+DA:246,180
+DA:247,180
 DA:248,180
-DA:249,180
-DA:251,675
-DA:252,675
-DA:253,675
-DA:254,675
+DA:249,675
+DA:250,675
+DA:252,180
+DA:253,180
 DA:255,675
 DA:256,675
 DA:257,675
-DA:259,1275
-DA:260,1275
-DA:261,45
-DA:262,45
-DA:263,45
-DA:265,30
-DA:266,30
-DA:267,30
-DA:269,870
-DA:270,870
-DA:271,870
-DA:272,870
-DA:274,0
-DA:275,0
-DA:276,0
-DA:285,30
-DA:286,30
-DA:288,300
-DA:289,300
-DA:290,300
-DA:291,600
+DA:258,675
+DA:259,675
+DA:260,675
+DA:261,675
+DA:263,1275
+DA:264,1275
+DA:265,45
+DA:266,45
+DA:267,45
+DA:269,30
+DA:270,30
+DA:271,30
+DA:273,870
+DA:274,870
+DA:275,870
+DA:276,870
+DA:278,0
+DA:279,0
+DA:280,0
+DA:289,30
+DA:290,30
 DA:292,300
-DA:294,0
-DA:296,1275
-DA:297,105
-DA:298,105
-DA:299,390
-DA:300,285
-DA:301,285
-DA:303,105
-DA:304,105
-DA:306,2100
-DA:307,2100
-DA:308,2100
-DA:309,1950
-DA:310,150
-DA:311,150
-DA:312,0
-DA:315,2100
-DA:317,2100
-DA:318,2100
-DA:319,1950
-DA:320,150
-DA:321,150
-DA:322,150
-DA:323,150
+DA:293,300
+DA:294,300
+DA:295,600
+DA:296,300
+DA:298,0
+DA:300,1275
+DA:301,105
+DA:302,105
+DA:303,390
+DA:304,285
+DA:305,285
+DA:307,105
+DA:308,105
+DA:310,2100
+DA:311,2100
+DA:312,2100
+DA:313,1950
+DA:314,150
+DA:315,150
+DA:316,0
+DA:319,2100
+DA:321,2100
+DA:322,2100
+DA:323,1950
 DA:324,150
-DA:326,1950
-DA:327,1950
-DA:328,2100
-DA:330,1020
-DA:331,1020
-DA:332,1020
-DA:333,0
-DA:334,0
-DA:335,0
-DA:336,0
-DA:338,1020
-DA:340,2415
-DA:341,2415
-DA:342,1515
-DA:343,900
+DA:325,150
+DA:326,150
+DA:327,150
+DA:328,150
+DA:330,1950
+DA:331,1950
+DA:332,2100
+DA:334,1020
+DA:335,1020
+DA:336,1020
+DA:337,0
+DA:338,0
+DA:339,0
+DA:340,0
+DA:342,1020
+DA:344,2415
 DA:345,2415
-LF:239
-LH:200
+DA:346,1515
+DA:347,900
+DA:349,2415
+LF:242
+LH:206
+end_of_record
+SF:crates/conjure_core/src/stats/solver_stats.rs
+FN:31,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FN:31,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FN:31,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FNDA:0,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FNDA:0,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FNDA:1,<conjure_core::stats::solver_stats::SolverStats>::with_timings
+FNF:3
+FNH:1
+BRF:0
+BRH:0
+DA:31,180
+DA:32,180
+DA:33,180
+DA:34,180
+DA:35,180
+DA:36,180
+LF:6
+LH:6
 end_of_record
 SF:crates/conjure_core/src/rule_engine/rule.rs
+FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
 FN:62,<conjure_core::rule_engine::rule::Reduction>::with_top
-FN:71,<conjure_core::rule_engine::rule::Reduction>::apply
-FN:53,<conjure_core::rule_engine::rule::Reduction>::with_symbols
-FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
-FN:10,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FN:53,<conjure_core::rule_engine::rule::Reduction>::with_symbols
 FN:119,<conjure_core::rule_engine::rule::Rule>::apply
+FN:35,<conjure_core::rule_engine::rule::Reduction>::new
 FN:44,<conjure_core::rule_engine::rule::Reduction>::pure
 FN:10,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
-FN:107,<conjure_core::rule_engine::rule::Rule>::new
-FN:10,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FN:119,<conjure_core::rule_engine::rule::Rule>::apply
-FN:44,<conjure_core::rule_engine::rule::Reduction>::pure
-FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
-FN:71,<conjure_core::rule_engine::rule::Reduction>::apply
-FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
+FN:53,<conjure_core::rule_engine::rule::Reduction>::with_symbols
+FN:62,<conjure_core::rule_engine::rule::Reduction>::with_top
 FN:107,<conjure_core::rule_engine::rule::Rule>::new
-FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<_>
-FN:35,<conjure_core::rule_engine::rule::Reduction>::new
 FN:35,<conjure_core::rule_engine::rule::Reduction>::new
 FN:125,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
-FN:35,<conjure_core::rule_engine::rule::Reduction>::new
+FN:44,<conjure_core::rule_engine::rule::Reduction>::pure
+FN:71,<conjure_core::rule_engine::rule::Reduction>::apply
 FN:71,<conjure_core::rule_engine::rule::Reduction>::apply
+FN:119,<conjure_core::rule_engine::rule::Rule>::apply
+FN:35,<conjure_core::rule_engine::rule::Reduction>::new
 FN:125,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
 FN:53,<conjure_core::rule_engine::rule::Reduction>::with_symbols
+FN:10,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
+FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FN:10,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
+FN:107,<conjure_core::rule_engine::rule::Rule>::new
+FN:107,<conjure_core::rule_engine::rule::Rule>::new
+FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
 FN:62,<conjure_core::rule_engine::rule::Reduction>::with_top
-FN:62,<conjure_core::rule_engine::rule::Reduction>::with_top
-FN:125,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
 FN:119,<conjure_core::rule_engine::rule::Rule>::apply
-FN:107,<conjure_core::rule_engine::rule::Rule>::new
+FN:139,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<_>
 FN:44,<conjure_core::rule_engine::rule::Reduction>::pure
+FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FN:53,<conjure_core::rule_engine::rule::Reduction>::with_symbols
+FN:125,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
+FN:131,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FN:71,<conjure_core::rule_engine::rule::Reduction>::apply
+FNDA:1,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_top
-FNDA:1,<conjure_core::rule_engine::rule::Reduction>::apply
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_symbols
-FNDA:1,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
-FNDA:0,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_symbols
 FNDA:0,<conjure_core::rule_engine::rule::Rule>::apply
-FNDA:1,<conjure_core::rule_engine::rule::Reduction>::pure
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::new
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::pure
 FNDA:0,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_symbols
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_top
 FNDA:0,<conjure_core::rule_engine::rule::Rule>::new
-FNDA:0,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
-FNDA:1,<conjure_core::rule_engine::rule::Rule>::apply
+FNDA:1,<conjure_core::rule_engine::rule::Reduction>::new
+FNDA:0,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::pure
-FNDA:0,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FNDA:0,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::apply
-FNDA:1,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
-FNDA:0,<conjure_core::rule_engine::rule::Rule>::new
-FNDA:0,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<_>
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::new
+FNDA:1,<conjure_core::rule_engine::rule::Reduction>::apply
+FNDA:0,<conjure_core::rule_engine::rule::Rule>::apply
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::new
 FNDA:0,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
-FNDA:1,<conjure_core::rule_engine::rule::Reduction>::new
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::apply
-FNDA:0,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_symbols
+FNDA:0,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
+FNDA:1,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::rule_engine::rule::ApplicationError as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::rule_engine::rule::Rule>::new
+FNDA:0,<conjure_core::rule_engine::rule::Rule>::new
+FNDA:0,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<std::hash::random::DefaultHasher>
 FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_top
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_top
+FNDA:1,<conjure_core::rule_engine::rule::Rule>::apply
+FNDA:0,<conjure_core::rule_engine::rule::Rule as core::hash::Hash>::hash::<_>
+FNDA:1,<conjure_core::rule_engine::rule::Reduction>::pure
+FNDA:0,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::with_symbols
 FNDA:0,<conjure_core::rule_engine::rule::Rule as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rule::Rule>::apply
-FNDA:0,<conjure_core::rule_engine::rule::Rule>::new
-FNDA:0,<conjure_core::rule_engine::rule::Reduction>::pure
+FNDA:0,<conjure_core::rule_engine::rule::Rule as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::rule_engine::rule::Reduction>::apply
 FNF:33
 FNH:6
 BRF:0
@@ -7708,12 +7870,12 @@ DA:121,770670
 DA:125,0
 DA:126,0
 DA:127,0
-DA:131,39870
-DA:132,39870
-DA:133,39870
-DA:139,61935
-DA:140,61935
-DA:141,61935
+DA:131,39420
+DA:132,39420
+DA:133,39420
+DA:139,61035
+DA:140,61035
+DA:141,61035
 LF:67
 LH:34
 end_of_record
@@ -8014,53 +8176,53 @@ DA:35,785
 DA:36,785
 DA:37,785
 DA:38,785
-DA:39,29582
-DA:40,29582
-DA:41,13242
-DA:42,13298
-DA:43,13298
-DA:44,13298
-DA:45,13298
+DA:39,31395
+DA:40,31395
+DA:41,14110
+DA:42,14113
+DA:43,14113
+DA:44,14113
+DA:45,14113
 DA:46,785
-DA:47,28797
+DA:47,30610
 DA:48,785
-DA:49,29582
+DA:49,31395
 DA:50,785
 DA:51,785
 DA:52,785
-DA:53,9954
-DA:54,9944
-DA:55,9944
-DA:56,9944
-DA:57,9944
-DA:58,9944
-DA:59,4517
-DA:60,4455
-DA:61,4445
-DA:62,4445
+DA:53,9087
+DA:54,9077
+DA:55,9077
+DA:56,9077
+DA:57,9077
+DA:58,9077
+DA:59,4069
+DA:60,4066
+DA:61,4056
+DA:62,4056
 DA:63,785
-DA:64,1002
-DA:65,9686
-DA:66,9686
-DA:67,9686
-DA:68,9686
-DA:69,9686
-DA:70,9686
-DA:71,992
+DA:64,972
+DA:65,8819
+DA:66,8819
+DA:67,8819
+DA:68,8819
+DA:69,8819
+DA:70,8819
+DA:71,962
 DA:72,785
 DA:73,785
-DA:74,9954
+DA:74,9087
 DA:75,785
 DA:76,785
 DA:77,785
 DA:78,785
 DA:79,785
-DA:82,9793
-DA:83,9793
-DA:84,4361
-DA:85,4418
-DA:86,9535
-DA:88,9793
+DA:82,11133
+DA:83,11133
+DA:84,5019
+DA:85,5020
+DA:86,10875
+DA:88,11133
 DA:93,2
 DA:94,2
 DA:95,2
@@ -8073,7 +8235,7 @@ DA:101,2
 DA:102,5160
 DA:103,2
 DA:104,2
-DA:123,4418
+DA:123,5020
 DA:133,1
 DA:134,1
 DA:135,1
@@ -8091,42 +8253,42 @@ LF:80
 LH:77
 end_of_record
 SF:crates/conjure_core/src/rule_engine/rewrite.rs
-FN:36,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
-FN:117,conjure_core::rule_engine::rewrite::choose_rewrite
-FN:117,conjure_core::rule_engine::rewrite::choose_rewrite
-FN:36,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
-FN:47,conjure_core::rule_engine::rewrite::rewrite_model
 FN:47,conjure_core::rule_engine::rewrite::rewrite_model
+FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
+FN:28,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
 FN:90,conjure_core::rule_engine::rewrite::apply_all_rules
+FN:47,conjure_core::rule_engine::rewrite::rewrite_model
+FN:36,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
+FN:28,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
+FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
 FN:117,conjure_core::rule_engine::rewrite::choose_rewrite
 FN:90,conjure_core::rule_engine::rewrite::apply_all_rules
-FN:90,conjure_core::rule_engine::rewrite::apply_all_rules
-FN:28,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
-FN:28,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
 FN:47,conjure_core::rule_engine::rewrite::rewrite_model
-FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
 FN:36,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
-FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
-FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
+FN:117,conjure_core::rule_engine::rewrite::choose_rewrite
+FN:36,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
+FN:90,conjure_core::rule_engine::rewrite::apply_all_rules
 FN:28,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
+FN:117,conjure_core::rule_engine::rewrite::choose_rewrite
+FN:64,conjure_core::rule_engine::rewrite::rewrite_iteration
+FNDA:0,conjure_core::rule_engine::rewrite::rewrite_model
+FNDA:0,conjure_core::rule_engine::rewrite::rewrite_iteration
+FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
+FNDA:1,conjure_core::rule_engine::rewrite::apply_all_rules
+FNDA:0,conjure_core::rule_engine::rewrite::rewrite_model
 FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
+FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
+FNDA:1,conjure_core::rule_engine::rewrite::rewrite_iteration
 FNDA:0,conjure_core::rule_engine::rewrite::choose_rewrite
-FNDA:0,conjure_core::rule_engine::rewrite::choose_rewrite
-FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
-FNDA:0,conjure_core::rule_engine::rewrite::rewrite_model
-FNDA:1,conjure_core::rule_engine::rewrite::rewrite_model
 FNDA:0,conjure_core::rule_engine::rewrite::apply_all_rules
+FNDA:1,conjure_core::rule_engine::rewrite::rewrite_model
+FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
 FNDA:1,conjure_core::rule_engine::rewrite::choose_rewrite
+FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
 FNDA:0,conjure_core::rule_engine::rewrite::apply_all_rules
-FNDA:1,conjure_core::rule_engine::rewrite::apply_all_rules
 FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
-FNDA:0,conjure_core::rule_engine::rewrite::rewrite_model
-FNDA:1,conjure_core::rule_engine::rewrite::rewrite_iteration
-FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::convert::From<conjure_core::rule_engine::resolve_rules::ResolveRulesError>>::from
-FNDA:0,conjure_core::rule_engine::rewrite::rewrite_iteration
+FNDA:0,conjure_core::rule_engine::rewrite::choose_rewrite
 FNDA:0,conjure_core::rule_engine::rewrite::rewrite_iteration
-FNDA:0,<conjure_core::rule_engine::rewrite::RewriteError as core::fmt::Display>::fmt
 FNF:18
 FNH:4
 BRF:0
@@ -8198,228 +8360,228 @@ LF:63
 LH:54
 end_of_record
 SF:crates/conjure_core/src/rules/constant.rs
-FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FN:24,conjure_core::rules::constant::eval_constant
-FN:113,conjure_core::rules::constant::flat_op::<i32, bool>
-FN:97,conjure_core::rules::constant::vec_op::<i32, i32>
 FN:34,conjure_core::rules::constant::eval_constant::{closure#5}
-FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
+FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
 FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:122,conjure_core::rules::constant::unwrap_expr::<i32>
-FN:113,conjure_core::rules::constant::flat_op::<i32, bool>
-FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
 FN:11,conjure_core::rules::constant::apply_eval_constant
+FN:70,conjure_core::rules::constant::un_op::<bool, bool>
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
+FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
+FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
+FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
+FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
+FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
+FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
+FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
+FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
+FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
+FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
+FN:97,conjure_core::rules::constant::vec_op::<i32, i32>
+FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
+FN:16,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
+FN:122,conjure_core::rules::constant::unwrap_expr::<i32>
 FN:29,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
-FN:61,conjure_core::rules::constant::eval_constant::{closure#14}
 FN:78,conjure_core::rules::constant::bin_op::<i32, bool>
+FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
 FN:16,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
+FN:53,conjure_core::rules::constant::eval_constant::{closure#12}
+FN:53,conjure_core::rules::constant::eval_constant::{closure#12}
+FN:33,conjure_core::rules::constant::eval_constant::{closure#4}
+FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
+FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
+FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
+FN:32,conjure_core::rules::constant::eval_constant::{closure#3}
+FN:113,conjure_core::rules::constant::flat_op::<i32, bool>
+FN:34,conjure_core::rules::constant::eval_constant::{closure#5}
 FN:31,conjure_core::rules::constant::eval_constant::{closure#2}
 FN:40,conjure_core::rules::constant::eval_constant::{closure#8}
-FN:24,conjure_core::rules::constant::eval_constant
 FN:122,conjure_core::rules::constant::unwrap_expr::<i32>
+FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
 FN:37,conjure_core::rules::constant::eval_constant::{closure#7}
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
 FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:34,conjure_core::rules::constant::eval_constant::{closure#5}
-FN:32,conjure_core::rules::constant::eval_constant::{closure#3}
-FN:33,conjure_core::rules::constant::eval_constant::{closure#4}
+FN:24,conjure_core::rules::constant::eval_constant
+FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
+FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
+FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
+FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
+FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FN:122,conjure_core::rules::constant::unwrap_expr::<i32>
+FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
+FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
 FN:16,conjure_core::rules::constant::apply_eval_constant::{closure#0}
 FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
 FN:97,conjure_core::rules::constant::vec_op::<i32, i32>
-FN:32,conjure_core::rules::constant::eval_constant::{closure#3}
-FN:70,conjure_core::rules::constant::un_op::<bool, bool>
-FN:105,conjure_core::rules::constant::opt_vec_op::<i32, i32>
-FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
-FN:40,conjure_core::rules::constant::eval_constant::{closure#8}
-FN:122,conjure_core::rules::constant::unwrap_expr::<i32>
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
+FN:113,conjure_core::rules::constant::flat_op::<i32, bool>
 FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FN:34,conjure_core::rules::constant::eval_constant::{closure#5}
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
-FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
-FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
 FN:33,conjure_core::rules::constant::eval_constant::{closure#4}
-FN:37,conjure_core::rules::constant::eval_constant::{closure#7}
-FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
-FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
-FN:24,conjure_core::rules::constant::eval_constant
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
 FN:78,conjure_core::rules::constant::bin_op::<i32, bool>
-FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FN:29,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
-FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
-FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
-FN:105,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FN:97,conjure_core::rules::constant::vec_op::<i32, i32>
 FN:113,conjure_core::rules::constant::flat_op::<i32, bool>
+FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
+FN:29,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
 FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
 FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FN:53,conjure_core::rules::constant::eval_constant::{closure#12}
-FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
-FN:11,conjure_core::rules::constant::apply_eval_constant
-FN:122,conjure_core::rules::constant::unwrap_expr::<bool>
-FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
-FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
-FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
-FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
-FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
+FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
+FN:32,conjure_core::rules::constant::eval_constant::{closure#3}
+FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
+FN:70,conjure_core::rules::constant::un_op::<bool, bool>
 FN:40,conjure_core::rules::constant::eval_constant::{closure#8}
+FN:61,conjure_core::rules::constant::eval_constant::{closure#14}
 FN:78,conjure_core::rules::constant::bin_op::<i32, bool>
-FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
-FN:43,conjure_core::rules::constant::eval_constant::{closure#9}
-FN:70,conjure_core::rules::constant::un_op::<bool, bool>
+FN:61,conjure_core::rules::constant::eval_constant::{closure#14}
+FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
 FN:105,conjure_core::rules::constant::opt_vec_op::<i32, i32>
-FN:33,conjure_core::rules::constant::eval_constant::{closure#4}
-FN:29,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
+FN:97,conjure_core::rules::constant::vec_op::<bool, bool>
 FN:37,conjure_core::rules::constant::eval_constant::{closure#7}
-FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
-FN:53,conjure_core::rules::constant::eval_constant::{closure#12}
-FN:87,conjure_core::rules::constant::tern_op::<i32, bool>
-FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
-FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
 FN:31,conjure_core::rules::constant::eval_constant::{closure#2}
-FN:8,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
-FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
-FN:61,conjure_core::rules::constant::eval_constant::{closure#14}
-FN:29,conjure_core::rules::constant::eval_constant::{closure#1}
-FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FN:11,conjure_core::rules::constant::apply_eval_constant
+FN:105,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FN:24,conjure_core::rules::constant::eval_constant
+FN:33,conjure_core::rules::constant::eval_constant::{closure#4}
+FN:40,conjure_core::rules::constant::eval_constant::{closure#8}
+FN:24,conjure_core::rules::constant::eval_constant
 FN:32,conjure_core::rules::constant::eval_constant::{closure#3}
-FN:31,conjure_core::rules::constant::eval_constant::{closure#2}
-FN:16,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FN:49,conjure_core::rules::constant::eval_constant::{closure#11}
+FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
 FN:70,conjure_core::rules::constant::un_op::<bool, bool>
-FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FN:97,conjure_core::rules::constant::vec_op::<i32, i32>
 FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FN:78,conjure_core::rules::constant::bin_op::<bool, bool>
-FN:28,conjure_core::rules::constant::eval_constant::{closure#0}
-FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
 FN:61,conjure_core::rules::constant::eval_constant::{closure#14}
+FN:29,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
+FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FN:11,conjure_core::rules::constant::apply_eval_constant
+FN:56,conjure_core::rules::constant::eval_constant::{closure#13}
 FN:53,conjure_core::rules::constant::eval_constant::{closure#12}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FNDA:0,conjure_core::rules::constant::eval_constant
-FNDA:1,conjure_core::rules::constant::flat_op::<i32, bool>
-FNDA:1,conjure_core::rules::constant::vec_op::<i32, i32>
+FN:40,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FN:34,conjure_core::rules::constant::eval_constant::{closure#5}
+FN:105,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FN:46,conjure_core::rules::constant::eval_constant::{closure#10}
+FN:31,conjure_core::rules::constant::eval_constant::{closure#2}
+FN:11,conjure_core::rules::constant::apply_eval_constant
+FN:37,conjure_core::rules::constant::eval_constant::{closure#7}
+FN:35,conjure_core::rules::constant::eval_constant::{closure#6}
+FN:10,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#5}
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#0}
+FNDA:0,conjure_core::rules::constant::bin_op::<bool, bool>
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::unwrap_expr::<i32>
-FNDA:0,conjure_core::rules::constant::flat_op::<i32, bool>
+FNDA:1,conjure_core::rules::constant::apply_eval_constant
+FNDA:0,conjure_core::rules::constant::un_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
+FNDA:0,conjure_core::rules::constant::unwrap_expr::<bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#6}
-FNDA:0,conjure_core::rules::constant::apply_eval_constant
+FNDA:0,conjure_core::rules::constant::bin_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::tern_op::<i32, bool>
+FNDA:1,conjure_core::rules::constant::bin_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::vec_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#6}
+FNDA:0,conjure_core::rules::constant::vec_op::<bool, bool>
+FNDA:1,conjure_core::rules::constant::vec_op::<i32, i32>
+FNDA:1,conjure_core::rules::constant::unwrap_expr::<bool>
+FNDA:0,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}
+FNDA:0,conjure_core::rules::constant::unwrap_expr::<i32>
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#14}
 FNDA:0,conjure_core::rules::constant::bin_op::<i32, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
 FNDA:0,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#9}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#12}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#12}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#4}
+FNDA:0,conjure_core::rules::constant::unwrap_expr::<bool>
+FNDA:1,conjure_core::rules::constant::tern_op::<i32, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
+FNDA:1,conjure_core::rules::constant::flat_op::<i32, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#5}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#2}
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#8}
-FNDA:1,conjure_core::rules::constant::eval_constant
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}
 FNDA:1,conjure_core::rules::constant::unwrap_expr::<i32>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#7}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#6}
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#5}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#4}
+FNDA:1,conjure_core::rules::constant::eval_constant
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#1}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
+FNDA:0,conjure_core::rules::constant::unwrap_expr::<i32>
+FNDA:0,conjure_core::rules::constant::tern_op::<i32, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
 FNDA:0,conjure_core::rules::constant::apply_eval_constant::{closure#0}
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
 FNDA:0,conjure_core::rules::constant::vec_op::<i32, i32>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
-FNDA:0,conjure_core::rules::constant::un_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::opt_vec_op::<i32, i32>
-FNDA:0,conjure_core::rules::constant::unwrap_expr::<bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}
-FNDA:0,conjure_core::rules::constant::unwrap_expr::<i32>
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#9}
+FNDA:0,conjure_core::rules::constant::flat_op::<i32, bool>
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#5}
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
-FNDA:0,conjure_core::rules::constant::vec_op::<bool, bool>
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#4}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#7}
-FNDA:1,conjure_core::rules::constant::tern_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FNDA:1,conjure_core::rules::constant::bin_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
-FNDA:0,conjure_core::rules::constant::eval_constant
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
 FNDA:0,conjure_core::rules::constant::bin_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
-FNDA:0,conjure_core::rules::constant::unwrap_expr::<bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
-FNDA:1,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FNDA:0,conjure_core::rules::constant::vec_op::<i32, i32>
 FNDA:0,conjure_core::rules::constant::flat_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#12}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}
-FNDA:1,conjure_core::rules::constant::apply_eval_constant
-FNDA:1,conjure_core::rules::constant::unwrap_expr::<bool>
-FNDA:0,conjure_core::rules::constant::vec_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
-FNDA:1,conjure_core::rules::constant::eval_constant::{closure#1}
-FNDA:1,conjure_core::rules::constant::vec_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}
-FNDA:0,conjure_core::rules::constant::tern_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}
-FNDA:1,conjure_core::rules::constant::bin_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#6}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#9}
-FNDA:0,conjure_core::rules::constant::un_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::opt_vec_op::<i32, i32>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#4}
 FNDA:1,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#7}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#12}
-FNDA:0,conjure_core::rules::constant::tern_op::<i32, bool>
-FNDA:0,conjure_core::rules::constant::bin_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#2}
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_SET_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
+FNDA:0,conjure_core::rules::constant::un_op::<bool, bool>
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#8}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#14}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}
+FNDA:1,conjure_core::rules::constant::bin_op::<i32, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#14}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
+FNDA:0,conjure_core::rules::constant::opt_vec_op::<i32, i32>
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
-FNDA:0,conjure_core::rules::constant::apply_eval_constant
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
+FNDA:1,conjure_core::rules::constant::vec_op::<bool, bool>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#7}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#2}
-FNDA:0,conjure_core::rules::constant::apply_eval_constant::{closure#0}
+FNDA:0,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FNDA:0,conjure_core::rules::constant::eval_constant
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#4}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}
+FNDA:0,conjure_core::rules::constant::eval_constant
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#3}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#11}
+FNDA:1,conjure_core::rules::constant::eval_constant::{closure#0}
 FNDA:0,conjure_core::rules::constant::un_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}::{closure#0}
-FNDA:0,conjure_core::rules::constant::vec_op::<i32, i32>
 FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck
-FNDA:0,conjure_core::rules::constant::bin_op::<bool, bool>
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#0}
-FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#14}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#1}::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FNDA:0,conjure_core::rules::constant::apply_eval_constant
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#13}
 FNDA:0,conjure_core::rules::constant::eval_constant::{closure#12}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#8}::{closure#0}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#5}
+FNDA:1,conjure_core::rules::constant::opt_vec_op::<i32, i32>
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#10}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#2}
+FNDA:0,conjure_core::rules::constant::apply_eval_constant
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#7}
+FNDA:0,conjure_core::rules::constant::eval_constant::{closure#6}
+FNDA:0,conjure_core::rules::constant::CONJURE_GEN_RULE_APPLY_EVAL_CONSTANT::__typecheck::{closure#0}
 FNF:111
 FNH:18
 BRF:0
@@ -8517,166 +8679,166 @@ LF:89
 LH:73
 end_of_record
 SF:crates/conjure_core/src/ast/domains.rs
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:17,<conjure_core::ast::domains::Domain>::min_i32
-FN:17,<conjure_core::ast::domains::Domain>::min_i32
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:57,<conjure_core::ast::domains::Domain>::min_max_i32
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:57,<conjure_core::ast::domains::Domain>::min_max_i32
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:17,<conjure_core::ast::domains::Domain>::min_i32
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FN:57,<conjure_core::ast::domains::Domain>::min_max_i32
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:37,<conjure_core::ast::domains::Domain>::max_i32
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:37,<conjure_core::ast::domains::Domain>::max_i32
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:57,<conjure_core::ast::domains::Domain>::min_max_i32
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FN:37,<conjure_core::ast::domains::Domain>::max_i32
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:17,<conjure_core::ast::domains::Domain>::min_i32
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FN:17,<conjure_core::ast::domains::Domain>::min_i32
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FN:57,<conjure_core::ast::domains::Domain>::min_max_i32
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
 FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FN:37,<conjure_core::ast::domains::Domain>::max_i32
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FN:37,<conjure_core::ast::domains::Domain>::max_i32
+FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:9,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:3,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:3,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<conjure_core::ast::domains::Domain>::min_max_i32
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<conjure_core::ast::domains::Domain>::min_i32
-FNDA:0,<conjure_core::ast::domains::Domain>::min_i32
-FNDA:1,<conjure_core::ast::domains::Domain>::min_max_i32
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:1,<conjure_core::ast::domains::Domain>::min_max_i32
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<conjure_core::ast::domains::Domain>::min_i32
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::domains::Domain>::min_max_i32
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
 FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:1,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:1,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::ast::domains::Domain>::max_i32
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<conjure_core::ast::domains::Domain>::min_max_i32
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<conjure_core::ast::domains::Domain>::max_i32
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::ast::domains::Domain>::max_i32
 FNDA:0,<conjure_core::ast::domains::Domain>::min_i32
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FNDA:0,<conjure_core::ast::domains::Domain>::min_i32
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
-FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
 FNDA:1,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<conjure_core::ast::domains::Domain>::min_max_i32
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:1,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<i32> as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<_> as serde::de::Visitor>::visit_seq::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<conjure_core::ast::domains::Domain>::max_i32
+FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<conjure_core::ast::domains::Domain>::max_i32
+FNDA:1,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
 FNDA:1,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::visit_seq::<serde_json::de::SeqAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::ast::domains::Domain as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::expecting
+FNDA:0,<<<conjure_core::ast::domains::Range<_> as serde::de::Deserialize>::deserialize::__Visitor<_> as serde::de::Visitor>::visit_enum::__Visitor<i32> as serde::de::Visitor>::expecting
 FNF:77
 FNH:9
 BRF:0
 BRH:0
-DA:3,372
-DA:9,328
+DA:3,465
+DA:9,410
 DA:17,0
 DA:18,0
 DA:19,0
@@ -8730,61 +8892,47 @@ LF:51
 LH:17
 end_of_record
 SF:crates/conjure_core/src/context.rs
-FN:17,<conjure_core::context::Context>::new
-FN:36,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
-FN:42,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
-FN:59,<conjure_core::context::Context as core::default::Default>::default
-FN:71,<conjure_core::context::Context as core::cmp::PartialEq>::eq
-FN:33,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FN:71,<conjure_core::context::Context as core::cmp::PartialEq>::eq
-FN:36,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
-FN:33,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FN:71,<conjure_core::context::Context as core::cmp::PartialEq>::eq
-FN:36,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
-FN:17,<conjure_core::context::Context>::new
-FN:59,<conjure_core::context::Context as core::default::Default>::default
-FN:42,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
-FN:42,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
-FN:33,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FN:59,<conjure_core::context::Context as core::default::Default>::default
-FN:17,<conjure_core::context::Context>::new
-FNDA:0,<conjure_core::context::Context>::new
-FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
-FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
-FNDA:1,<conjure_core::context::Context as core::default::Default>::default
+FN:13,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FN:35,<conjure_core::context::Context>::new
+FN:69,<conjure_core::context::Context as core::fmt::Debug>::fmt
+FN:35,<conjure_core::context::Context>::new
+FN:72,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
+FN:13,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FN:53,<conjure_core::context::Context>::new_ptr
+FN:72,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
+FN:35,<conjure_core::context::Context>::new
+FN:73,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
+FN:72,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
+FN:53,<conjure_core::context::Context>::new_ptr
+FN:69,<conjure_core::context::Context as core::fmt::Debug>::fmt
+FN:73,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
+FN:73,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
+FN:53,<conjure_core::context::Context>::new_ptr
+FN:69,<conjure_core::context::Context as core::fmt::Debug>::fmt
+FN:13,<conjure_core::context::Context as core::cmp::PartialEq>::eq
 FNDA:0,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::context::Context>::new
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FNDA:0,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::context::Context>::new
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
-FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FNDA:1,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::context::Context as core::cmp::PartialEq>::eq
+FNDA:0,<conjure_core::context::Context>::new_ptr
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
 FNDA:0,<conjure_core::context::Context>::new
-FNDA:0,<conjure_core::context::Context as core::default::Default>::default
+FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
+FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#0}
+FNDA:0,<conjure_core::context::Context>::new_ptr
+FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt::{closure#1}
+FNDA:0,<conjure_core::context::Context>::new_ptr
 FNDA:0,<conjure_core::context::Context as core::fmt::Debug>::fmt
-FNDA:0,<conjure_core::context::Context as core::default::Default>::default
-FNDA:0,<conjure_core::context::Context>::new
+FNDA:0,<conjure_core::context::Context as core::cmp::PartialEq>::eq
 FNF:18
-FNH:2
+FNH:0
 BRF:0
 BRH:0
-DA:17,0
-DA:18,0
-DA:19,0
-DA:20,0
-DA:21,0
-DA:22,0
-DA:23,0
-DA:24,0
-DA:25,0
-DA:26,0
-DA:27,0
-DA:28,0
-DA:29,0
-DA:33,0
-DA:34,0
+DA:13,0
 DA:35,0
 DA:36,0
 DA:37,0
@@ -8800,110 +8948,109 @@ DA:46,0
 DA:47,0
 DA:48,0
 DA:49,0
-DA:50,0
-DA:51,0
-DA:52,0
 DA:53,0
 DA:54,0
 DA:55,0
-DA:59,7170
-DA:60,7170
-DA:61,7170
-DA:62,7170
-DA:63,7170
-DA:64,7170
-DA:65,7170
-DA:66,7170
-DA:71,270
-DA:72,270
-DA:73,270
-DA:74,270
-DA:75,270
-DA:76,270
-DA:77,270
-DA:78,270
-DA:79,270
-DA:80,270
-DA:81,270
-DA:82,270
-DA:83,270
-DA:84,270
-DA:85,270
-DA:86,270
-DA:87,270
-LF:61
-LH:25
+DA:56,0
+DA:57,0
+DA:58,0
+DA:59,0
+DA:60,0
+DA:61,0
+DA:62,0
+DA:63,0
+DA:64,0
+DA:65,0
+DA:69,0
+DA:70,0
+DA:71,0
+DA:72,0
+DA:73,0
+DA:74,0
+DA:75,0
+DA:76,0
+DA:77,0
+DA:78,0
+DA:79,0
+DA:80,0
+DA:81,0
+DA:82,0
+DA:83,0
+DA:84,0
+DA:85,0
+LF:46
+LH:0
 end_of_record
 SF:crates/conjure_core/src/ast/symbol_table.rs
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FN:15,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FN:15,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FN:15,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
 FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FN:15,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FN:8,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:1,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:1,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
-FNDA:0,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:1,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<&mut serde_json::de::Deserializer<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
 FNDA:0,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
-FNDA:1,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
-FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::VariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Field as serde::de::Deserialize>::deserialize::<_>
+FNDA:0,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
 FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_u64::<_>
-FNDA:1,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<serde_json::error::Error>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_str::<_>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::visit_bytes::<_>
 FNDA:1,<conjure_core::ast::symbol_table::Name as core::fmt::Display>::fmt
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__Visitor as serde::de::Visitor>::visit_enum::<serde_json::de::UnitVariantAccess<serde_json::read::StrRead>>
+FNDA:0,<<conjure_core::ast::symbol_table::Name as serde::de::Deserialize>::deserialize::__FieldVisitor as serde::de::Visitor>::expecting
 FNF:32
 FNH:4
 BRF:0
 BRH:0
-DA:8,1384
+DA:8,1730
 DA:15,1425
 DA:16,1425
 DA:17,1050
@@ -8913,30 +9060,30 @@ LF:6
 LH:6
 end_of_record
 SF:crates/conjure_core/src/error.rs
-FN:8,<conjure_core::error::Error as core::error::Error>::source
+FN:8,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
+FN:8,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
+FN:8,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
 FN:8,<conjure_core::error::Error as core::fmt::Display>::fmt
 FN:8,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
 FN:8,<conjure_core::error::Error as core::error::Error>::source
 FN:8,<conjure_core::error::Error as core::error::Error>::source
 FN:8,<conjure_core::error::Error as core::fmt::Display>::fmt
+FN:8,<conjure_core::error::Error as core::fmt::Display>::fmt
 FN:8,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
-FN:8,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
-FN:8,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
 FN:8,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
-FN:8,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
-FN:8,<conjure_core::error::Error as core::fmt::Display>::fmt
-FNDA:0,<conjure_core::error::Error as core::error::Error>::source
+FN:8,<conjure_core::error::Error as core::error::Error>::source
+FNDA:0,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
+FNDA:0,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
+FNDA:0,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
 FNDA:0,<conjure_core::error::Error as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
 FNDA:0,<conjure_core::error::Error as core::error::Error>::source
 FNDA:0,<conjure_core::error::Error as core::error::Error>::source
 FNDA:0,<conjure_core::error::Error as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::error::Error as core::fmt::Display>::fmt
 FNDA:0,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
-FNDA:0,<conjure_core::error::Error as core::convert::From<serde_json::error::Error>>::from
-FNDA:0,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
 FNDA:0,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
-FNDA:0,<conjure_core::error::Error as core::convert::From<anyhow::Error>>::from
-FNDA:0,<conjure_core::error::Error as core::fmt::Display>::fmt
+FNDA:0,<conjure_core::error::Error as core::error::Error>::source
 FNF:12
 FNH:0
 BRF:0
@@ -9210,94 +9357,94 @@ DA:241,1
 DA:242,1
 DA:243,1
 DA:244,1
-LF:188
-LH:188
-end_of_record
-SF:conjure_oxide/tests/rewrite_tests.rs
-FN:167,rewrite_tests::rule_sum_mixed
-FN:587,rewrite_tests::remove_constants_from_and_not_changed
-FN:604,rewrite_tests::rule_distribute_not_over_and
-FN:648,rewrite_tests::rule_distribute_not_over_or
-FN:1058,rewrite_tests::eval_const_eq_bool
+LF:188
+LH:188
+end_of_record
+SF:conjure_oxide/tests/rewrite_tests.rs
+FN:109,rewrite_tests::simplify_expression
+FN:926,rewrite_tests::is_simple
 FN:238,rewrite_tests::reduce_solve_xyz
-FN:383,rewrite_tests::rule_unwrap_nested_or
+FN:360,rewrite_tests::rule_remove_double_negation
+FN:546,rewrite_tests::rule_remove_constants_from_and
+FN:648,rewrite_tests::rule_distribute_not_over_or
 FN:692,rewrite_tests::rule_distribute_not_over_and_not_changed
-FN:1021,rewrite_tests::eval_const_ref
-FN:356,rewrite_tests::reduce_solve_xyz::{closure#0}
-FN:18,rewrite_tests::rules_present
-FN:962,rewrite_tests::apply_all_rules
+FN:138,rewrite_tests::rule_sum_constants
 FN:709,rewrite_tests::rule_distribute_not_over_or_not_changed
-FN:938,rewrite_tests::is_simple_iteration
-FN:24,rewrite_tests::sum_of_constants
-FN:197,rewrite_tests::rule_sum_geq
-FN:522,rewrite_tests::rule_remove_constants_from_or
-FN:827,rewrite_tests::rewrite_solve_xyz
 FN:1028,rewrite_tests::eval_const_nested_ref
-FN:546,rewrite_tests::rule_remove_constants_from_and
-FN:109,rewrite_tests::simplify_expression
-FN:138,rewrite_tests::rule_sum_constants
-FN:489,rewrite_tests::remove_trivial_and_or
-FN:360,rewrite_tests::rule_remove_double_negation
-FN:914,rewrite_tests::rewrite_solve_xyz::{closure#0}
+FN:71,rewrite_tests::recursive_sum_of_constants
 FN:1047,rewrite_tests::eval_const_eq_int
 FN:1127,rewrite_tests::eval_const_or
-FN:570,rewrite_tests::remove_constants_from_or_not_changed
+FN:24,rewrite_tests::sum_of_constants
+FN:489,rewrite_tests::remove_trivial_and_or
 FN:1008,rewrite_tests::eval_const_and
-FN:726,rewrite_tests::rule_distribute_or_over_and
-FN:926,rewrite_tests::is_simple
-FN:71,rewrite_tests::recursive_sum_of_constants
+FN:570,rewrite_tests::remove_constants_from_or_not_changed
+FN:1021,rewrite_tests::eval_const_ref
+FN:984,rewrite_tests::choose_rewrite
+FN:938,rewrite_tests::is_simple_iteration
+FN:419,rewrite_tests::rule_unwrap_nested_and
+FN:18,rewrite_tests::rules_present
+FN:1069,rewrite_tests::eval_const_eq_mixed
+FN:962,rewrite_tests::apply_all_rules
+FN:1058,rewrite_tests::eval_const_eq_bool
+FN:994,rewrite_tests::eval_const_int
+FN:827,rewrite_tests::rewrite_solve_xyz
 FN:472,rewrite_tests::unwrap_nested_and_not_changed
+FN:383,rewrite_tests::rule_unwrap_nested_or
+FN:1080,rewrite_tests::eval_const_sum_mixed
 FN:1093,rewrite_tests::eval_const_sum_xyz
-FN:455,rewrite_tests::unwrap_nested_or_not_changed
 FN:52,rewrite_tests::evaluate_sum_of_constants
-FN:984,rewrite_tests::choose_rewrite
-FN:1069,rewrite_tests::eval_const_eq_mixed
+FN:197,rewrite_tests::rule_sum_geq
+FN:726,rewrite_tests::rule_distribute_or_over_and
+FN:455,rewrite_tests::unwrap_nested_or_not_changed
+FN:522,rewrite_tests::rule_remove_constants_from_or
+FN:604,rewrite_tests::rule_distribute_not_over_and
+FN:167,rewrite_tests::rule_sum_mixed
+FN:587,rewrite_tests::remove_constants_from_and_not_changed
+FN:914,rewrite_tests::rewrite_solve_xyz::{closure#0}
 FN:1001,rewrite_tests::eval_const_bool
-FN:1080,rewrite_tests::eval_const_sum_mixed
-FN:994,rewrite_tests::eval_const_int
-FN:419,rewrite_tests::rule_unwrap_nested_and
-FNDA:1,rewrite_tests::rule_sum_mixed
-FNDA:1,rewrite_tests::remove_constants_from_and_not_changed
-FNDA:1,rewrite_tests::rule_distribute_not_over_and
-FNDA:1,rewrite_tests::rule_distribute_not_over_or
-FNDA:1,rewrite_tests::eval_const_eq_bool
+FN:356,rewrite_tests::reduce_solve_xyz::{closure#0}
+FNDA:1,rewrite_tests::simplify_expression
+FNDA:1,rewrite_tests::is_simple
 FNDA:1,rewrite_tests::reduce_solve_xyz
-FNDA:1,rewrite_tests::rule_unwrap_nested_or
+FNDA:1,rewrite_tests::rule_remove_double_negation
+FNDA:1,rewrite_tests::rule_remove_constants_from_and
+FNDA:1,rewrite_tests::rule_distribute_not_over_or
 FNDA:1,rewrite_tests::rule_distribute_not_over_and_not_changed
-FNDA:1,rewrite_tests::eval_const_ref
-FNDA:1,rewrite_tests::reduce_solve_xyz::{closure#0}
-FNDA:1,rewrite_tests::rules_present
-FNDA:1,rewrite_tests::apply_all_rules
+FNDA:1,rewrite_tests::rule_sum_constants
 FNDA:1,rewrite_tests::rule_distribute_not_over_or_not_changed
-FNDA:1,rewrite_tests::is_simple_iteration
-FNDA:1,rewrite_tests::sum_of_constants
-FNDA:1,rewrite_tests::rule_sum_geq
-FNDA:1,rewrite_tests::rule_remove_constants_from_or
-FNDA:1,rewrite_tests::rewrite_solve_xyz
 FNDA:1,rewrite_tests::eval_const_nested_ref
-FNDA:1,rewrite_tests::rule_remove_constants_from_and
-FNDA:1,rewrite_tests::simplify_expression
-FNDA:1,rewrite_tests::rule_sum_constants
-FNDA:1,rewrite_tests::remove_trivial_and_or
-FNDA:1,rewrite_tests::rule_remove_double_negation
-FNDA:1,rewrite_tests::rewrite_solve_xyz::{closure#0}
+FNDA:1,rewrite_tests::recursive_sum_of_constants
 FNDA:1,rewrite_tests::eval_const_eq_int
 FNDA:1,rewrite_tests::eval_const_or
-FNDA:1,rewrite_tests::remove_constants_from_or_not_changed
+FNDA:1,rewrite_tests::sum_of_constants
+FNDA:1,rewrite_tests::remove_trivial_and_or
 FNDA:1,rewrite_tests::eval_const_and
-FNDA:1,rewrite_tests::rule_distribute_or_over_and
-FNDA:1,rewrite_tests::is_simple
-FNDA:1,rewrite_tests::recursive_sum_of_constants
+FNDA:1,rewrite_tests::remove_constants_from_or_not_changed
+FNDA:1,rewrite_tests::eval_const_ref
+FNDA:1,rewrite_tests::choose_rewrite
+FNDA:1,rewrite_tests::is_simple_iteration
+FNDA:1,rewrite_tests::rule_unwrap_nested_and
+FNDA:1,rewrite_tests::rules_present
+FNDA:1,rewrite_tests::eval_const_eq_mixed
+FNDA:1,rewrite_tests::apply_all_rules
+FNDA:1,rewrite_tests::eval_const_eq_bool
+FNDA:1,rewrite_tests::eval_const_int
+FNDA:1,rewrite_tests::rewrite_solve_xyz
 FNDA:1,rewrite_tests::unwrap_nested_and_not_changed
+FNDA:1,rewrite_tests::rule_unwrap_nested_or
+FNDA:1,rewrite_tests::eval_const_sum_mixed
 FNDA:1,rewrite_tests::eval_const_sum_xyz
-FNDA:1,rewrite_tests::unwrap_nested_or_not_changed
 FNDA:1,rewrite_tests::evaluate_sum_of_constants
-FNDA:1,rewrite_tests::choose_rewrite
-FNDA:1,rewrite_tests::eval_const_eq_mixed
+FNDA:1,rewrite_tests::rule_sum_geq
+FNDA:1,rewrite_tests::rule_distribute_or_over_and
+FNDA:1,rewrite_tests::unwrap_nested_or_not_changed
+FNDA:1,rewrite_tests::rule_remove_constants_from_or
+FNDA:1,rewrite_tests::rule_distribute_not_over_and
+FNDA:1,rewrite_tests::rule_sum_mixed
+FNDA:1,rewrite_tests::remove_constants_from_and_not_changed
+FNDA:1,rewrite_tests::rewrite_solve_xyz::{closure#0}
 FNDA:1,rewrite_tests::eval_const_bool
-FNDA:1,rewrite_tests::eval_const_sum_mixed
-FNDA:1,rewrite_tests::eval_const_int
-FNDA:1,rewrite_tests::rule_unwrap_nested_and
+FNDA:1,rewrite_tests::reduce_solve_xyz::{closure#0}
 FNF:42
 FNH:42
 BRF:0
@@ -10246,14 +10393,11 @@ SF:crates/uniplate/src/uniplate.rs
 FN:140,<_ as uniplate::uniplate::Uniplate>::one_holed_context::{closure#0}
 FN:48,<_ as uniplate::uniplate::Uniplate>::with_children
 FN:54,<rust_out::AST as uniplate::uniplate::Uniplate>::transform
-FN:48,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
-FN:31,<_ as uniplate::uniplate::Uniplate>::universe
 FN:40,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
-FN:68,<_ as uniplate::uniplate::Uniplate>::rewrite
+FN:31,<_ as uniplate::uniplate::Uniplate>::universe
 FN:40,<macro_tests::TestEnum as uniplate::uniplate::Uniplate>::children
-FN:40,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
+FN:68,<_ as uniplate::uniplate::Uniplate>::rewrite
 FN:103,<_ as uniplate::uniplate::Uniplate>::fold::<_>
-FN:48,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
 FN:40,<_ as uniplate::uniplate::Uniplate>::children
 FN:106,<_ as uniplate::uniplate::Uniplate>::fold::<_>::{closure#0}
 FN:40,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
@@ -10261,26 +10405,29 @@ FN:54,<_ as uniplate::uniplate::Uniplate>::transform
 FN:3,<uniplate::uniplate::UniplateError as core::fmt::Display>::fmt
 FN:132,<_ as uniplate::uniplate::Uniplate>::one_holed_context
 FN:40,<rust_out::main::_doctest_main_crates_uniplate_derive_src_lib_rs_109_0::MyEnum as uniplate::uniplate::Uniplate>::children
+FN:48,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
+FN:48,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
 FN:83,<_ as uniplate::uniplate::Uniplate>::descend
+FN:40,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::one_holed_context::{closure#0}
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::with_children
 FNDA:1,<rust_out::AST as uniplate::uniplate::Uniplate>::transform
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::universe
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
-FNDA:0,<_ as uniplate::uniplate::Uniplate>::rewrite
 FNDA:1,<macro_tests::TestEnum as uniplate::uniplate::Uniplate>::children
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
+FNDA:0,<_ as uniplate::uniplate::Uniplate>::rewrite
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::fold::<_>
-FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::fold::<_>::{closure#0}
-FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::transform
 FNDA:0,<uniplate::uniplate::UniplateError as core::fmt::Display>::fmt
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::one_holed_context
 FNDA:1,<rust_out::main::_doctest_main_crates_uniplate_derive_src_lib_rs_109_0::MyEnum as uniplate::uniplate::Uniplate>::children
+FNDA:1,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::with_children
 FNDA:0,<_ as uniplate::uniplate::Uniplate>::descend
+FNDA:0,<conjure_core::ast::expressions::Expression as uniplate::uniplate::Uniplate>::children
 FNF:19
 FNH:5
 BRF:0
@@ -10425,115 +10572,113 @@ LF:47
 LH:44
 end_of_record
 SF:crates/conjure_core/src/parse/parse_model.rs
-FN:82,conjure_core::parse::parse_model::parse_int_domain
-FN:113,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
-FN:82,conjure_core::parse::parse_model::parse_int_domain
-FN:113,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
-FN:145,conjure_core::parse::parse_model::parse_expression
-FN:218,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FN:113,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
-FN:212,conjure_core::parse::parse_model::parse_expression::{closure#0}
-FN:127,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
-FN:294,conjure_core::parse::parse_model::parse_constant
-FN:52,conjure_core::parse::parse_model::parse_variable
-FN:145,conjure_core::parse::parse_model::parse_expression
-FN:272,conjure_core::parse::parse_model::parse_vec_op
-FN:224,conjure_core::parse::parse_model::parse_expression::{closure#5}
-FN:241,conjure_core::parse::parse_model::parse_bin_op
-FN:241,conjure_core::parse::parse_model::parse_bin_op
-FN:212,conjure_core::parse::parse_model::parse_expression::{closure#0}
-FN:52,conjure_core::parse::parse_model::parse_variable
-FN:224,conjure_core::parse::parse_model::parse_expression::{closure#5}
-FN:272,conjure_core::parse::parse_model::parse_vec_op
-FN:127,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
-FN:214,conjure_core::parse::parse_model::parse_expression::{closure#2}
-FN:52,conjure_core::parse::parse_model::parse_variable
-FN:261,conjure_core::parse::parse_model::parse_unary_op
-FN:218,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FN:145,conjure_core::parse::parse_model::parse_expression
-FN:213,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FN:221,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FN:272,conjure_core::parse::parse_model::parse_vec_op
-FN:11,conjure_core::parse::parse_model::model_from_json
-FN:261,conjure_core::parse::parse_model::parse_unary_op
-FN:224,conjure_core::parse::parse_model::parse_expression::{closure#5}
-FN:294,conjure_core::parse::parse_model::parse_constant
-FN:11,conjure_core::parse::parse_model::model_from_json
-FN:294,conjure_core::parse::parse_model::parse_constant
-FN:261,conjure_core::parse::parse_model::parse_unary_op
-FN:218,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FN:221,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FN:11,conjure_core::parse::parse_model::model_from_json
-FN:214,conjure_core::parse::parse_model::parse_expression::{closure#2}
-FN:241,conjure_core::parse::parse_model::parse_bin_op
-FN:213,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FN:213,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FN:221,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FN:214,conjure_core::parse::parse_model::parse_expression::{closure#2}
-FN:212,conjure_core::parse::parse_model::parse_expression::{closure#0}
-FN:127,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
-FN:82,conjure_core::parse::parse_model::parse_int_domain
-FNDA:0,conjure_core::parse::parse_model::parse_int_domain
+FN:274,conjure_core::parse::parse_model::parse_vec_op
+FN:243,conjure_core::parse::parse_model::parse_bin_op
+FN:220,conjure_core::parse::parse_model::parse_expression::{closure#3}
+FN:115,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FN:216,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FN:215,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FN:215,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FN:13,conjure_core::parse::parse_model::model_from_json
+FN:296,conjure_core::parse::parse_model::parse_constant
+FN:215,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FN:214,conjure_core::parse::parse_model::parse_expression::{closure#0}
+FN:13,conjure_core::parse::parse_model::model_from_json
+FN:84,conjure_core::parse::parse_model::parse_int_domain
+FN:129,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
+FN:147,conjure_core::parse::parse_model::parse_expression
+FN:129,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
+FN:220,conjure_core::parse::parse_model::parse_expression::{closure#3}
+FN:147,conjure_core::parse::parse_model::parse_expression
+FN:223,conjure_core::parse::parse_model::parse_expression::{closure#4}
+FN:263,conjure_core::parse::parse_model::parse_unary_op
+FN:84,conjure_core::parse::parse_model::parse_int_domain
+FN:243,conjure_core::parse::parse_model::parse_bin_op
+FN:223,conjure_core::parse::parse_model::parse_expression::{closure#4}
+FN:84,conjure_core::parse::parse_model::parse_int_domain
+FN:226,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FN:226,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FN:214,conjure_core::parse::parse_model::parse_expression::{closure#0}
+FN:115,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FN:243,conjure_core::parse::parse_model::parse_bin_op
+FN:274,conjure_core::parse::parse_model::parse_vec_op
+FN:216,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FN:263,conjure_core::parse::parse_model::parse_unary_op
+FN:54,conjure_core::parse::parse_model::parse_variable
+FN:274,conjure_core::parse::parse_model::parse_vec_op
+FN:115,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FN:223,conjure_core::parse::parse_model::parse_expression::{closure#4}
+FN:263,conjure_core::parse::parse_model::parse_unary_op
+FN:296,conjure_core::parse::parse_model::parse_constant
+FN:226,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FN:129,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
+FN:13,conjure_core::parse::parse_model::model_from_json
+FN:220,conjure_core::parse::parse_model::parse_expression::{closure#3}
+FN:54,conjure_core::parse::parse_model::parse_variable
+FN:216,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FN:147,conjure_core::parse::parse_model::parse_expression
+FN:214,conjure_core::parse::parse_model::parse_expression::{closure#0}
+FN:296,conjure_core::parse::parse_model::parse_constant
+FN:54,conjure_core::parse::parse_model::parse_variable
+FNDA:1,conjure_core::parse::parse_model::parse_vec_op
+FNDA:0,conjure_core::parse::parse_model::parse_bin_op
+FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#3}
 FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FNDA:0,conjure_core::parse::parse_model::model_from_json
+FNDA:0,conjure_core::parse::parse_model::parse_constant
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#1}
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#0}
+FNDA:0,conjure_core::parse::parse_model::model_from_json
 FNDA:0,conjure_core::parse::parse_model::parse_int_domain
-FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
 FNDA:1,conjure_core::parse::parse_model::parse_expression
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#0}
 FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
-FNDA:1,conjure_core::parse::parse_model::parse_constant
-FNDA:1,conjure_core::parse::parse_model::parse_variable
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#3}
 FNDA:0,conjure_core::parse::parse_model::parse_expression
-FNDA:0,conjure_core::parse::parse_model::parse_vec_op
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#4}
+FNDA:0,conjure_core::parse::parse_model::parse_unary_op
+FNDA:1,conjure_core::parse::parse_model::parse_int_domain
 FNDA:0,conjure_core::parse::parse_model::parse_bin_op
-FNDA:1,conjure_core::parse::parse_model::parse_bin_op
-FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#0}
-FNDA:0,conjure_core::parse::parse_model::parse_variable
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#4}
+FNDA:0,conjure_core::parse::parse_model::parse_int_domain
+FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#5}
 FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#0}
+FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FNDA:1,conjure_core::parse::parse_model::parse_bin_op
 FNDA:0,conjure_core::parse::parse_model::parse_vec_op
-FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
 FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FNDA:0,conjure_core::parse::parse_model::parse_unary_op
 FNDA:0,conjure_core::parse::parse_model::parse_variable
+FNDA:0,conjure_core::parse::parse_model::parse_vec_op
+FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#0}
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#4}
 FNDA:0,conjure_core::parse::parse_model::parse_unary_op
-FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FNDA:0,conjure_core::parse::parse_model::parse_expression
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FNDA:1,conjure_core::parse::parse_model::parse_vec_op
+FNDA:1,conjure_core::parse::parse_model::parse_constant
+FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#5}
+FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
 FNDA:1,conjure_core::parse::parse_model::model_from_json
-FNDA:0,conjure_core::parse::parse_model::parse_unary_op
-FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#5}
-FNDA:0,conjure_core::parse::parse_model::parse_constant
-FNDA:0,conjure_core::parse::parse_model::model_from_json
-FNDA:0,conjure_core::parse::parse_model::parse_constant
-FNDA:0,conjure_core::parse::parse_model::parse_unary_op
 FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#3}
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FNDA:0,conjure_core::parse::parse_model::model_from_json
+FNDA:0,conjure_core::parse::parse_model::parse_variable
 FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#2}
-FNDA:0,conjure_core::parse::parse_model::parse_bin_op
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FNDA:1,conjure_core::parse::parse_model::parse_expression::{closure#1}
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#4}
-FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#2}
+FNDA:0,conjure_core::parse::parse_model::parse_expression
 FNDA:0,conjure_core::parse::parse_model::parse_expression::{closure#0}
-FNDA:0,conjure_core::parse::parse_model::parse_int_domain::{closure#1}
-FNDA:1,conjure_core::parse::parse_model::parse_int_domain
+FNDA:0,conjure_core::parse::parse_model::parse_constant
+FNDA:1,conjure_core::parse::parse_model::parse_variable
 FNF:48
 FNH:13
 BRF:0
 BRH:0
-DA:11,180
-DA:12,180
 DA:13,180
 DA:14,180
 DA:15,180
 DA:16,180
-DA:18,735
-DA:19,555
-DA:20,555
+DA:17,180
+DA:18,180
+DA:20,735
 DA:21,555
 DA:22,555
 DA:23,555
@@ -10542,20 +10687,20 @@ DA:25,555
 DA:26,555
 DA:27,555
 DA:28,555
-DA:29,375
-DA:30,375
-DA:32,180
-DA:33,180
+DA:29,555
+DA:30,555
+DA:31,375
+DA:32,375
 DA:34,180
-DA:36,0
-DA:40,180
-DA:41,180
+DA:35,180
+DA:36,180
+DA:38,0
 DA:42,180
-DA:45,0
-DA:49,180
-DA:50,180
-DA:52,375
-DA:53,375
+DA:43,180
+DA:44,180
+DA:47,0
+DA:51,180
+DA:52,180
 DA:54,375
 DA:55,375
 DA:56,375
@@ -10576,23 +10721,23 @@ DA:70,375
 DA:71,375
 DA:72,375
 DA:73,375
-DA:74,105
-DA:75,0
-DA:76,0
+DA:74,375
+DA:75,375
+DA:76,105
 DA:77,0
 DA:78,0
-DA:79,375
-DA:80,375
-DA:82,270
-DA:83,270
+DA:79,0
+DA:80,0
+DA:81,375
+DA:82,375
 DA:84,270
 DA:85,270
 DA:86,270
 DA:87,270
 DA:88,270
-DA:89,540
+DA:89,270
 DA:90,270
-DA:91,270
+DA:91,540
 DA:92,270
 DA:93,270
 DA:94,270
@@ -10608,19 +10753,19 @@ DA:103,270
 DA:104,270
 DA:105,270
 DA:106,270
-DA:107,540
-DA:108,540
+DA:107,270
+DA:108,270
 DA:109,540
 DA:110,540
 DA:111,540
 DA:112,540
 DA:113,540
-DA:114,0
+DA:114,540
 DA:115,540
-DA:116,540
-DA:118,270
-DA:120,0
-DA:121,0
+DA:116,0
+DA:117,540
+DA:118,540
+DA:120,270
 DA:122,0
 DA:123,0
 DA:124,0
@@ -10628,13 +10773,13 @@ DA:125,0
 DA:126,0
 DA:127,0
 DA:128,0
-DA:131,0
-DA:132,0
+DA:129,0
+DA:130,0
 DA:133,0
-DA:137,270
-DA:138,270
-DA:145,840
-DA:146,840
+DA:134,0
+DA:135,0
+DA:139,270
+DA:140,270
 DA:147,840
 DA:148,840
 DA:149,840
@@ -10700,57 +10845,57 @@ DA:208,840
 DA:209,840
 DA:210,840
 DA:211,840
-DA:212,1455
+DA:212,840
 DA:213,840
-DA:214,840
-DA:216,120
-DA:217,840
-DA:218,1455
-DA:219,180
-DA:221,150
-DA:222,0
-DA:224,375
-DA:225,150
-DA:227,0
-DA:229,510
-DA:230,390
-DA:231,390
+DA:214,1515
+DA:215,840
+DA:216,840
+DA:218,120
+DA:219,840
+DA:220,1515
+DA:221,180
+DA:223,150
+DA:224,0
+DA:226,420
+DA:227,150
+DA:229,0
+DA:231,510
 DA:232,390
 DA:233,390
 DA:234,390
-DA:236,120
-DA:237,0
-DA:239,840
-DA:241,180
-DA:242,180
+DA:235,390
+DA:236,390
+DA:238,120
+DA:239,0
+DA:241,840
 DA:243,180
 DA:244,180
-DA:247,180
+DA:245,180
+DA:246,180
 DA:249,180
 DA:251,180
-DA:252,180
 DA:253,180
 DA:254,180
 DA:255,180
-DA:257,0
-DA:259,180
-DA:261,0
-DA:262,0
+DA:256,180
+DA:257,180
+DA:259,0
+DA:261,180
 DA:263,0
 DA:264,0
 DA:265,0
 DA:266,0
+DA:267,0
 DA:268,0
-DA:269,0
 DA:270,0
-DA:272,150
-DA:273,150
+DA:271,0
+DA:272,0
 DA:274,150
 DA:275,150
 DA:276,150
 DA:277,150
+DA:278,150
 DA:279,150
-DA:280,150
 DA:281,150
 DA:282,150
 DA:283,150
@@ -10758,22 +10903,24 @@ DA:284,150
 DA:285,150
 DA:286,150
 DA:287,150
-DA:288,0
-DA:290,150
+DA:288,150
+DA:289,150
+DA:290,0
 DA:292,150
-DA:294,120
-DA:295,120
+DA:294,150
 DA:296,120
 DA:297,120
 DA:298,120
-DA:300,0
-DA:301,0
+DA:299,120
+DA:300,120
 DA:302,0
 DA:303,0
 DA:304,0
-DA:308,120
-DA:310,0
-DA:312,120
+DA:305,0
+DA:306,0
+DA:310,120
+DA:312,0
+DA:314,120
 LF:249
 LH:210
 end_of_record