diff --git a/Cargo.lock b/Cargo.lock
index 719b8fe3b..01823de20 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -15,20 +15,21 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -41,9 +42,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -55,36 +56,36 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -118,7 +119,7 @@ dependencies = [
  "argh_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -141,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
 
 [[package]]
 name = "bit-set"
@@ -168,9 +169,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "block-buffer"
@@ -242,18 +243,15 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"
@@ -263,9 +261,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -273,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -285,21 +283,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
@@ -309,39 +307,39 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a535eb1cf5a6003197dc569320c40c1cb2d2f97ef5d5348eebf067f20957381"
+checksum = "5b3775cc6cc00c90d29eebea55feedb2b0168e23f5415bab7859c4004d7323d1"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b5066db32cec1492573827183af2142d2d88fe85a83cfc9e73f0f63d3788d4"
+checksum = "637f3184ba5bfa48d425bad1d2e4faf5fcf619f5e0ca107edc6dc02f589d4d74"
 dependencies = [
  "bumpalo",
  "cranelift-bforest",
@@ -351,7 +349,7 @@ dependencies = [
  "cranelift-entity",
  "cranelift-isle",
  "gimli",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "log",
  "regalloc2",
  "smallvec",
@@ -360,39 +358,39 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64942e5774308e835fbad4dd25f253105412c90324631910e1ec27963147bddb"
+checksum = "e4b35b8240462341d94d31aab807cad704683988708261aecae3d57db48b7212"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39c33db9a86dd6d8d04166a10c53deb477aeea3500eaaefca682e4eda9bb986"
+checksum = "8f3cd1555aa9df1d6d8375732de41b4cb0d787006948d55b6d004d521e9efeb0"
 
 [[package]]
 name = "cranelift-control"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7fc4937613aea3156a0538800a17bf56f345a5da2e79ae3df58488c93d867f"
+checksum = "14b31a562a10e98ab148fa146801e20665c5f9eda4fce9b2c5a3836575887d74"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85575e79a153ce1ddbfb7fe1813519b4bfe1eb200cc9c8353b45ad123ae4d36"
+checksum = "af1e0467700a3f4fccf5feddbaebdf8b0eb82535b06a9600c4bc5df40872e75d"
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc31d6c0ab2249fe0c21e988256b42f5f401ab2673b4fc40076c82a698bdfb9"
+checksum = "6cb918ee2c23939262efd1b99d76a21212ac7bd35129582133e21a22a6ff0467"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -402,15 +400,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc14f37e3314c0e4c53779c2f46753bf242efff76ee9473757a1fff3b495ad37"
+checksum = "966e4cfb23cf6d7f1d285d53a912baaffc5f06bcd9c9b0a2d8c66a184fae534b"
 
 [[package]]
 name = "cranelift-jit"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdd1942f3233176a68c285380dbc84ff0440246a1bce308611c0a385b56ab18"
+checksum = "66823211608f4966518d23f57571d8771c55430b626a8ab377479b24a4535f40"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -423,14 +421,14 @@ dependencies = [
  "region",
  "target-lexicon",
  "wasmtime-jit-icache-coherence",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "cranelift-module"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121b2b5a16912554a1b9aace75b9b21eca49f28e33cbfbad4786dd9bc5361a5c"
+checksum = "cec3c5879608f8073782974e2c6dda461eb4038c754e1ab02904eb94a0ee0e9f"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -439,9 +437,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea5375f76ab31f9800a23fb2b440810286a6f669a3eb467cdd7ff255ea64268"
+checksum = "bea803aadfc4aabdfae7c3870f1b1f6dd4332f4091859e9758ef5fca6bf8cc87"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -450,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-object"
-version = "0.106.0"
+version = "0.106.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34e04419ab41661e973d90a73aa7b12771455394dae7a69b101a9b7e7589db7"
+checksum = "db2734474e6b011263cf0ea0ca36378a29e8a9795f8a71b46b3fbb1f7657173c"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -493,7 +491,9 @@ name = "dag_in_context"
 version = "0.1.0"
 dependencies = [
  "bril-rs",
+ "dot-structures",
  "egglog",
+ "graphviz-rust 0.8.0",
  "main_error",
  "strum",
  "strum_macros",
@@ -509,12 +509,6 @@ dependencies = [
  "powerfmt",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -571,11 +565,13 @@ dependencies = [
  "brilirs",
  "clap",
  "dag_in_context",
+ "dot-structures",
  "egglog",
  "egraph-serialize",
  "fixedbitset",
  "glob",
- "hashbrown 0.14.1",
+ "graphviz-rust 0.8.0",
+ "hashbrown 0.14.3",
  "indexmap",
  "insta",
  "lalrpop-util",
@@ -597,7 +593,7 @@ dependencies = [
  "egraph-serialize",
  "env_logger",
  "generic_symbolic_expressions",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "indexmap",
  "instant",
  "lalrpop",
@@ -622,7 +618,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a41150f383849cfc16ae6230f592112b3c0a2c0e3ec43eb0b09db037bfcce703"
 dependencies = [
- "graphviz-rust",
+ "graphviz-rust 0.6.6",
  "indexmap",
  "once_cell",
  "ordered-float",
@@ -632,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "ena"
@@ -668,14 +664,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -692,23 +688,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys",
 ]
 
 [[package]]
@@ -719,9 +704,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
 
 [[package]]
 name = "fixedbitset"
@@ -755,9 +740,9 @@ source = "git+https://github.com/oflatt/symbolic-expressions?rev=655b6a4c06b4b3d
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -797,13 +782,29 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "graphviz-rust"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3adbad2800805b14170067aee88336e12838823086b6a4f70ca8dfb5d971f3"
+dependencies = [
+ "dot-generator",
+ "dot-structures",
+ "into-attr",
+ "into-attr-derive",
+ "pest",
+ "pest_derive",
+ "rand",
+ "tempfile",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -812,16 +813,16 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -831,11 +832,17 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "humantime"
@@ -845,27 +852,26 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "serde",
 ]
 
 [[package]]
 name = "insta"
-version = "1.33.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686"
+checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"
 dependencies = [
  "console",
  "lazy_static",
  "linked-hash-map",
  "serde",
  "similar",
- "yaml-rust",
 ]
 
 [[package]]
@@ -901,51 +907,50 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
- "rustix",
- "windows-sys 0.48.0",
+ "libc",
+ "windows-sys",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "lalrpop"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
  "bit-set",
- "diff",
  "ena",
- "is-terminal",
  "itertools",
  "lalrpop-util",
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax",
  "string_cache",
  "term",
  "tiny-keccak",
  "unicode-xid",
+ "walkdir",
 ]
 
 [[package]]
@@ -965,9 +970,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -979,6 +984,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.5.0",
+ "libc",
+]
+
 [[package]]
 name = "libtest-mimic"
 version = "0.6.1"
@@ -998,15 +1013,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.8"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1014,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "mach"
@@ -1035,9 +1050,9 @@ checksum = "155db5e86c6e45ee456bf32fad5a290ee1f7151c2faca27ea27097568da67d1a"
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "mimalloc"
@@ -1050,9 +1065,9 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "num-bigint"
@@ -1073,11 +1088,10 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
@@ -1095,9 +1109,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -1128,22 +1142,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "crc32fast",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.3",
  "indexmap",
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "ordered-float"
-version = "3.9.1"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
  "rand",
@@ -1162,22 +1176,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
  "smallvec",
  "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "pest"
-version = "2.7.4"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4"
+checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
 dependencies = [
  "memchr",
  "thiserror",
@@ -1186,9 +1200,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.4"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8"
+checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1196,22 +1210,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.4"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
+checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.4"
+version = "2.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d"
+checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca"
 dependencies = [
  "once_cell",
  "pest",
@@ -1263,18 +1277,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -1313,30 +1327,21 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom",
- "redox_syscall 0.2.16",
+ "libredox",
  "thiserror",
 ]
 
@@ -1355,14 +1360,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1373,20 +1378,14 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "region"
@@ -1408,15 +1407,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.15"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1427,9 +1426,18 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "scopeguard"
@@ -1439,29 +1447,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1482,9 +1490,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.2.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 
 [[package]]
 name = "simplelog"
@@ -1511,9 +1519,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "stable_deref_trait"
@@ -1536,9 +1544,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
@@ -1552,11 +1560,11 @@ version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1565,7 +1573,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "828f672b631c220bf6ea8a1d3b82c7d0fc998e5ba8373383d8604bc1e2a6245a"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
  "hashbrown 0.12.3",
 ]
 
@@ -1582,9 +1590,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1599,15 +1607,14 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall 0.3.5",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1623,31 +1630,31 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -1737,6 +1744,16 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -1745,13 +1762,13 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "19.0.0"
+version = "19.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2796e4b4989db62899d2117e1e0258b839d088c044591b14e3a0396e7b3ae53a"
+checksum = "59c48eb4223d6556ffbf3decb146d0da124f1fd043f41c98b705252cb6a5c186"
 dependencies = [
  "cfg-if",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1785,24 +1802,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -1812,21 +1811,6 @@ dependencies = [
  "windows-targets 0.52.4",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -1857,12 +1841,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.4",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -1875,12 +1853,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -1893,12 +1865,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -1911,12 +1877,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -1929,12 +1889,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -1947,12 +1901,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -1965,12 +1913,6 @@ version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -1984,10 +1926,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
-name = "yaml-rust"
-version = "0.4.5"
+name = "zerocopy"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
- "linked-hash-map",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.57",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 677c41af3..12c715555 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,8 @@ bril-rs = { git = "https://github.com/sampsyo/bril", rev = "b20cc2d" }
 brilift = { git = "https://github.com/sampsyo/bril", rev = "b20cc2d" }
 ordered-float = { version = "3.7" }
 serde_json = "1.0.103"
+dot-structures = "0.1.1"
+graphviz-rust = "0.8.0"
 
 dag_in_context = { path = "dag_in_context" }
 
diff --git a/dag_in_context/Cargo.toml b/dag_in_context/Cargo.toml
index f115260db..a573ab4c1 100644
--- a/dag_in_context/Cargo.toml
+++ b/dag_in_context/Cargo.toml
@@ -12,3 +12,5 @@ strum_macros = "0.25"
 main_error = "0.1.2"
 thiserror = "1.0"
 bril-rs = { git = "https://github.com/sampsyo/bril", rev = "b20cc2d" }
+graphviz-rust = "0.8.0"
+dot-structures = "0.1.1"
diff --git a/dag_in_context/src/dag2svg.rs b/dag_in_context/src/dag2svg.rs
new file mode 100644
index 000000000..7201f0ad4
--- /dev/null
+++ b/dag_in_context/src/dag2svg.rs
@@ -0,0 +1,114 @@
+use std::{
+    collections::{HashMap, HashSet},
+    rc::Rc,
+};
+
+use dot_structures::{Edge, EdgeTy, Graph, Id, Node, NodeId, Stmt, Subgraph, Vertex};
+
+use crate::schema::{Expr, RcExpr, TreeProgram};
+
+struct DotConverter {
+    pub done: HashSet<*const Expr>,
+    pub get_name: HashMap<*const Expr, String>,
+    pub name_counter: usize,
+}
+
+impl DotConverter {
+    pub fn graphviz_id(&mut self, expr: &RcExpr) -> Id {
+        if let Some(name) = self.get_name.get(&Rc::as_ptr(expr)) {
+            Id::Plain(name.clone())
+        } else {
+            let name = format!("{}{}", expr.constructor().name(), self.name_counter);
+            self.name_counter += 1;
+            self.get_name.insert(Rc::as_ptr(expr), name.clone());
+            Id::Plain(name)
+        }
+    }
+
+    pub fn graphviz_nodeid(&mut self, expr: &RcExpr) -> NodeId {
+        NodeId(self.graphviz_id(expr), None)
+    }
+
+    pub fn graphviz_vertex(&mut self, expr: &RcExpr) -> Vertex {
+        Vertex::N(self.graphviz_nodeid(expr))
+    }
+}
+
+impl TreeProgram {
+    pub fn to_dot(&self) -> Graph {
+        let mut dot_converter = DotConverter {
+            done: HashSet::new(),
+            get_name: HashMap::new(),
+            name_counter: 0,
+        };
+
+        Graph::DiGraph {
+            id: Id::Plain("myprog".to_string()),
+            strict: true,
+            stmts: self.to_dot_with(&mut dot_converter),
+        }
+    }
+
+    fn to_dot_with(&self, dot_converter: &mut DotConverter) -> Vec<Stmt> {
+        let mut res = vec![];
+        res.extend(self.entry.to_dot_with(dot_converter));
+        for expr in &self.functions {
+            res.extend(expr.to_dot_with(dot_converter));
+        }
+        res
+    }
+}
+
+impl Expr {
+    pub fn to_dot(self: &RcExpr) -> Graph {
+        let mut dot_converter = DotConverter {
+            done: HashSet::new(),
+            get_name: HashMap::new(),
+            name_counter: 0,
+        };
+
+        Graph::DiGraph {
+            id: Id::Plain("myprog".to_string()),
+            strict: true,
+            stmts: self.to_dot_with(&mut dot_converter),
+        }
+    }
+
+    fn to_dot_with(self: &RcExpr, conv: &mut DotConverter) -> Vec<Stmt> {
+        let id = Rc::as_ptr(self);
+        if !conv.done.insert(id) {
+            return vec![];
+        }
+        match self.as_ref() {
+            Expr::DoWhile(inputs, body) => {
+                let mut stmts = inputs.to_dot_with(conv);
+                stmts.push(Stmt::Edge(Edge {
+                    ty: EdgeTy::Pair(conv.graphviz_vertex(self), conv.graphviz_vertex(inputs)),
+                    attributes: vec![],
+                }));
+                stmts.push(Stmt::Subgraph(Subgraph {
+                    stmts: body.to_dot_with(conv),
+                    id: conv.graphviz_id(self),
+                }));
+                stmts
+            }
+            _ => {
+                let children = self.children_same_scope();
+                let mut stmts = vec![Stmt::Node(Node {
+                    id: conv.graphviz_nodeid(self),
+                    attributes: vec![],
+                })];
+                for child in children {
+                    let child_stmts = child.to_dot_with(conv);
+                    stmts.extend(child_stmts);
+                    stmts.push(Stmt::Edge(Edge {
+                        ty: EdgeTy::Pair(conv.graphviz_vertex(self), conv.graphviz_vertex(&child)),
+                        attributes: vec![],
+                    }));
+                }
+
+                stmts
+            }
+        }
+    }
+}
diff --git a/dag_in_context/src/lib.rs b/dag_in_context/src/lib.rs
index 07aa56f0c..cdd9bb0df 100644
--- a/dag_in_context/src/lib.rs
+++ b/dag_in_context/src/lib.rs
@@ -22,6 +22,7 @@ pub mod typechecker;
 pub(crate) mod utility;
 use main_error::MainError;
 pub(crate) mod add_context;
+pub mod dag2svg;
 
 pub type Result = std::result::Result<(), MainError>;
 
diff --git a/src/rvsdg/snapshots/eggcc__rvsdg__tests__rvsdg_unstructured.snap b/src/rvsdg/snapshots/eggcc__rvsdg__tests__rvsdg_unstructured.snap
deleted file mode 100644
index 07dc8aa3b..000000000
--- a/src/rvsdg/snapshots/eggcc__rvsdg__tests__rvsdg_unstructured.snap
+++ /dev/null
@@ -1,1634 +0,0 @@
----
-source: src/rvsdg/tests.rs
-expression: rvsdg.to_svg()
----
-<svg
-	height="1900"
-	version="1.1"
-	width="2675"
-	xmlns="http://www.w3.org/2000/svg">
-	<g>
-		<rect
-			fill="white"
-			height="1900"
-			rx="10"
-			stroke="black"
-			stroke-width="2"
-			width="2675">
-		</rect>
-		<g>
-			<path
-				d="M 1337.5 0V 15Q 1337.5 25 1327.5 25H 597.5Q 587.5 25 587.5 35V 350"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 100 150V 165Q 100 175 110 175H 223.33333Q 233.33333 175 233.33333 185V 200"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 100 150V 165Q 100 175 110 175H 256.66666Q 266.66666 175 266.66666 185V 200"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 100 150V 165Q 100 175 110 175H 696.25Q 706.25 175 706.25 185V 350"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 250 300V 315Q 250 325 260 325H 458.75Q 468.75 325 468.75 335V 350"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 468.75 700V 707.5Q 468.75 717.5 478.75 717.5H 1315Q 1325 717.5 1325 727.5V 750"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 587.5 700V 715Q 587.5 725 597.5 725H 1740Q 1750 725 1750 735V 750"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 706.25 700V 722.5Q 706.25 732.5 716.25 732.5H 2165Q 2175 732.5 2175 742.5V 750"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 1580 1850V 1870Q 1580 1880 1590 1880H 1773.3334Q 1783.3334 1880 1783.3334 1890V 1900"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-			<path
-				d="M 1920 1850V 1860Q 1920 1870 1910 1870H 901.6667Q 891.6667 1870 891.6667 1880V 1900"
-				fill="transparent"
-				stroke="black"
-				stroke-linecap="round"
-				stroke-width="2">
-			</path>
-		</g>
-		<g>
-			<g
-				transform="translate(50, 50)">
-				<g>
-					<rect
-						fill="#FFFF80"
-						height="100"
-						rx="10"
-						stroke="black"
-						stroke-width="2"
-						width="100">
-					</rect>
-					<text
-						fill="black"
-						font-size="50"
-						text-anchor="middle"
-						x="50"
-						y="62.5">
-						4
-					</text>
-				</g>
-				<circle
-					cx="50"
-					cy="100"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-			</g>
-			<g
-				transform="translate(200, 200)">
-				<g>
-					<rect
-						fill="#FFFF80"
-						height="100"
-						rx="10"
-						stroke="black"
-						stroke-width="2"
-						width="100">
-					</rect>
-					<text
-						fill="black"
-						font-size="50"
-						text-anchor="middle"
-						x="50"
-						y="62.5">
-						lt
-					</text>
-				</g>
-				<circle
-					cx="33.333332"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="66.666664"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="50"
-					cy="100"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-			</g>
-			<g
-				transform="translate(350, 350)">
-				<rect
-					fill="#80FF80"
-					height="350"
-					rx="10"
-					stroke="black"
-					stroke-width="2"
-					width="475">
-				</rect>
-				<text
-					fill="black"
-					font-size="50"
-					x="25"
-					y="50">
-					match
-				</text>
-				<g>
-					<g
-						transform="translate(25, 125)">
-						<rect
-							fill="white"
-							height="200"
-							rx="10"
-							stroke="black"
-							stroke-width="2"
-							width="200">
-						</rect>
-						<g>
-							<path
-								d="M 66.666664 0V 157.5Q 66.666664 167.5 58.333332 167.5H 58.333332Q 50 167.5 50 177.5V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-							<path
-								d="M 133.33333 0V 165Q 133.33333 175 123.33333 175H 110Q 100 175 100 185V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-							<path
-								d="M 100 150V 172.5Q 100 182.5 110 182.5H 140Q 150 182.5 150 192.5V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-						</g>
-						<g>
-							<g
-								transform="translate(50, 50)">
-								<g>
-									<rect
-										fill="#FFFF80"
-										height="100"
-										rx="10"
-										stroke="black"
-										stroke-width="2"
-										width="100">
-									</rect>
-									<text
-										fill="black"
-										font-size="50"
-										text-anchor="middle"
-										x="50"
-										y="62.5">
-										false
-									</text>
-								</g>
-								<circle
-									cx="50"
-									cy="100"
-									fill="white"
-									r="4"
-									stroke="black"
-									stroke-width="2">
-								</circle>
-							</g>
-						</g>
-						<g>
-							<circle
-								cx="66.666664"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="133.33333"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-						</g>
-						<g>
-							<circle
-								cx="50"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="100"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="150"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-						</g>
-					</g>
-					<text
-						fill="black"
-						font-size="50"
-						text-anchor="middle"
-						x="125"
-						y="100">
-						true
-					</text>
-				</g>
-				<g>
-					<g
-						transform="translate(250, 125)">
-						<rect
-							fill="white"
-							height="200"
-							rx="10"
-							stroke="black"
-							stroke-width="2"
-							width="200">
-						</rect>
-						<g>
-							<path
-								d="M 66.666664 0V 157.5Q 66.666664 167.5 58.333332 167.5H 58.333332Q 50 167.5 50 177.5V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-							<path
-								d="M 133.33333 0V 165Q 133.33333 175 123.33333 175H 110Q 100 175 100 185V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-							<path
-								d="M 100 150V 172.5Q 100 182.5 110 182.5H 140Q 150 182.5 150 192.5V 200"
-								fill="transparent"
-								stroke="black"
-								stroke-linecap="round"
-								stroke-width="2">
-							</path>
-						</g>
-						<g>
-							<g
-								transform="translate(50, 50)">
-								<g>
-									<rect
-										fill="#FFFF80"
-										height="100"
-										rx="10"
-										stroke="black"
-										stroke-width="2"
-										width="100">
-									</rect>
-									<text
-										fill="black"
-										font-size="50"
-										text-anchor="middle"
-										x="50"
-										y="62.5">
-										true
-									</text>
-								</g>
-								<circle
-									cx="50"
-									cy="100"
-									fill="white"
-									r="4"
-									stroke="black"
-									stroke-width="2">
-								</circle>
-							</g>
-						</g>
-						<g>
-							<circle
-								cx="66.666664"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="133.33333"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-						</g>
-						<g>
-							<circle
-								cx="50"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="100"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="150"
-								cy="200"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-						</g>
-					</g>
-					<text
-						fill="black"
-						font-size="50"
-						text-anchor="middle"
-						x="350"
-						y="100">
-						false
-					</text>
-				</g>
-				<circle
-					cx="118.75"
-					cy="0"
-					fill="black"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="237.5"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="356.25"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="118.75"
-					cy="350"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="237.5"
-					cy="350"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="356.25"
-					cy="350"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-			</g>
-			<g
-				transform="translate(875, 750)">
-				<rect
-					fill="#FF8080"
-					height="1100"
-					rx="10"
-					stroke="black"
-					stroke-width="2"
-					width="1750">
-				</rect>
-				<text
-					fill="black"
-					font-size="50"
-					x="25"
-					y="50">
-					loop
-				</text>
-				<g
-					transform="translate(25, 75)">
-					<rect
-						fill="white"
-						height="1000"
-						rx="10"
-						stroke="black"
-						stroke-width="2"
-						width="1700">
-					</rect>
-					<g>
-						<path
-							d="M 425 0V 7.5Q 425 17.5 435 17.5H 680Q 690 17.5 690 27.5V 50"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 850 0V 15Q 850 25 860 25H 1000Q 1010 25 1010 35V 50"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 1275 0V 22.5Q 1275 32.5 1265 32.5H 380Q 370 32.5 370 42.5V 50"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 1275 0V 22.5Q 1275 32.5 1285 32.5H 1320Q 1330 32.5 1330 42.5V 50"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 370 950V 962Q 370 972 380 972H 670Q 680 972 680 982V 1000"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 690 950V 968Q 690 978 700 978H 1010Q 1020 978 1020 988V 1000"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 1010 950V 956Q 1010 966 1000 966H 350Q 340 966 340 976V 1000"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-						<path
-							d="M 1330 950V 974Q 1330 984 1340 984H 1350Q 1360 984 1360 994V 1000"
-							fill="transparent"
-							stroke="black"
-							stroke-linecap="round"
-							stroke-width="2">
-						</path>
-					</g>
-					<g>
-						<g
-							transform="translate(50, 50)">
-							<rect
-								fill="#80FF80"
-								height="900"
-								rx="10"
-								stroke="black"
-								stroke-width="2"
-								width="1600">
-							</rect>
-							<text
-								fill="black"
-								font-size="50"
-								x="25"
-								y="50">
-								match
-							</text>
-							<g>
-								<g
-									transform="translate(25, 125)">
-									<rect
-										fill="white"
-										height="200"
-										rx="10"
-										stroke="black"
-										stroke-width="2"
-										width="350">
-									</rect>
-									<g>
-										<path
-											d="M 87.5 0V 156Q 87.5 166 78.75 166H 78.75Q 70 166 70 176V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 175 0V 162Q 175 172 165 172H 150Q 140 172 140 182V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 100 150V 174Q 100 184 110 184H 270Q 280 184 280 194V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 250 150V 168Q 250 178 240 178H 220Q 210 178 210 188V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-									</g>
-									<g>
-										<g
-											transform="translate(50, 50)">
-											<g>
-												<rect
-													fill="#FFFF80"
-													height="100"
-													rx="10"
-													stroke="black"
-													stroke-width="2"
-													width="100">
-												</rect>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="50"
-													y="62.5">
-													false
-												</text>
-											</g>
-											<circle
-												cx="50"
-												cy="100"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-										<g
-											transform="translate(200, 50)">
-											<g>
-												<rect
-													fill="#FFFF80"
-													height="100"
-													rx="10"
-													stroke="black"
-													stroke-width="2"
-													width="100">
-												</rect>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="50"
-													y="62.5">
-													true
-												</text>
-											</g>
-											<circle
-												cx="50"
-												cy="100"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-									</g>
-									<g>
-										<circle
-											cx="87.5"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="175"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="262.5"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-									</g>
-									<g>
-										<circle
-											cx="70"
-											cy="200"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="140"
-											cy="200"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="210"
-											cy="200"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="280"
-											cy="200"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-									</g>
-								</g>
-								<text
-									fill="black"
-									font-size="50"
-									text-anchor="middle"
-									x="200"
-									y="100">
-									true
-								</text>
-							</g>
-							<g>
-								<g
-									transform="translate(400, 125)">
-									<rect
-										fill="white"
-										height="750"
-										rx="10"
-										stroke="black"
-										stroke-width="2"
-										width="1175">
-									</rect>
-									<g>
-										<path
-											d="M 293.75 0V 7.5Q 293.75 17.5 303.75 17.5H 740Q 750 17.5 750 27.5V 350"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 587.5 0V 15Q 587.5 25 577.5 25H 243.33333Q 233.33333 25 233.33333 35V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 587.5 0V 15Q 587.5 25 577.5 25H 393.33334Q 383.33334 25 383.33334 35V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 881.25 0V 22.5Q 881.25 32.5 891.25 32.5H 990Q 1000 32.5 1000 42.5V 350"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 100 150V 165Q 100 175 110 175H 256.66666Q 266.66666 175 266.66666 185V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 100 150V 165Q 100 175 110 175H 406.66666Q 416.66666 175 416.66666 185V 200"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 250 300V 320Q 250 330 260 330H 615Q 625 330 625 340V 350"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 400 300V 310Q 400 320 410 320H 865Q 875 320 875 330V 350"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 625 700V 706Q 625 716 615 716H 245Q 235 716 235 726V 750"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 750 700V 712Q 750 722 740 722H 480Q 470 722 470 732V 750"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 875 700V 718Q 875 728 865 728H 715Q 705 728 705 738V 750"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-										<path
-											d="M 1000 700V 724Q 1000 734 990 734H 950Q 940 734 940 744V 750"
-											fill="transparent"
-											stroke="black"
-											stroke-linecap="round"
-											stroke-width="2">
-										</path>
-									</g>
-									<g>
-										<g
-											transform="translate(50, 50)">
-											<g>
-												<rect
-													fill="#FFFF80"
-													height="100"
-													rx="10"
-													stroke="black"
-													stroke-width="2"
-													width="100">
-												</rect>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="50"
-													y="62.5">
-													1
-												</text>
-											</g>
-											<circle
-												cx="50"
-												cy="100"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-										<g
-											transform="translate(200, 200)">
-											<g>
-												<rect
-													fill="#FFFF80"
-													height="100"
-													rx="10"
-													stroke="black"
-													stroke-width="2"
-													width="100">
-												</rect>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="50"
-													y="62.5">
-													lt
-												</text>
-											</g>
-											<circle
-												cx="33.333332"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="66.666664"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="50"
-												cy="100"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-										<g
-											transform="translate(350, 200)">
-											<g>
-												<rect
-													fill="#FFFF80"
-													height="100"
-													rx="10"
-													stroke="black"
-													stroke-width="2"
-													width="100">
-												</rect>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="50"
-													y="62.5">
-													add
-												</text>
-											</g>
-											<circle
-												cx="33.333332"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="66.666664"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="50"
-												cy="100"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-										<g
-											transform="translate(500, 350)">
-											<rect
-												fill="#80FF80"
-												height="350"
-												rx="10"
-												stroke="black"
-												stroke-width="2"
-												width="625">
-											</rect>
-											<text
-												fill="black"
-												font-size="50"
-												x="25"
-												y="50">
-												match
-											</text>
-											<g>
-												<g
-													transform="translate(25, 125)">
-													<rect
-														fill="white"
-														height="200"
-														rx="10"
-														stroke="black"
-														stroke-width="2"
-														width="350">
-													</rect>
-													<g>
-														<path
-															d="M 87.5 0V 156Q 87.5 166 78.75 166H 78.75Q 70 166 70 176V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 175 0V 162Q 175 172 165 172H 150Q 140 172 140 182V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 100 150V 174Q 100 184 110 184H 270Q 280 184 280 194V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 250 150V 168Q 250 178 240 178H 220Q 210 178 210 188V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-													</g>
-													<g>
-														<g
-															transform="translate(50, 50)">
-															<g>
-																<rect
-																	fill="#FFFF80"
-																	height="100"
-																	rx="10"
-																	stroke="black"
-																	stroke-width="2"
-																	width="100">
-																</rect>
-																<text
-																	fill="black"
-																	font-size="50"
-																	text-anchor="middle"
-																	x="50"
-																	y="62.5">
-																	true
-																</text>
-															</g>
-															<circle
-																cx="50"
-																cy="100"
-																fill="white"
-																r="4"
-																stroke="black"
-																stroke-width="2">
-															</circle>
-														</g>
-														<g
-															transform="translate(200, 50)">
-															<g>
-																<rect
-																	fill="#FFFF80"
-																	height="100"
-																	rx="10"
-																	stroke="black"
-																	stroke-width="2"
-																	width="100">
-																</rect>
-																<text
-																	fill="black"
-																	font-size="50"
-																	text-anchor="middle"
-																	x="50"
-																	y="62.5">
-																	true
-																</text>
-															</g>
-															<circle
-																cx="50"
-																cy="100"
-																fill="white"
-																r="4"
-																stroke="black"
-																stroke-width="2">
-															</circle>
-														</g>
-													</g>
-													<g>
-														<circle
-															cx="87.5"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="175"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="262.5"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-													</g>
-													<g>
-														<circle
-															cx="70"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="140"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="210"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="280"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-													</g>
-												</g>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="200"
-													y="100">
-													true
-												</text>
-											</g>
-											<g>
-												<g
-													transform="translate(400, 125)">
-													<rect
-														fill="white"
-														height="200"
-														rx="10"
-														stroke="black"
-														stroke-width="2"
-														width="200">
-													</rect>
-													<g>
-														<path
-															d="M 50 0V 156Q 50 166 45 166H 45Q 40 166 40 176V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 100 0V 162Q 100 172 90 172H 90Q 80 172 80 182V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 150 0V 174Q 150 184 155 184H 155Q 160 184 160 194V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-														<path
-															d="M 100 150V 168Q 100 178 110 178H 110Q 120 178 120 188V 200"
-															fill="transparent"
-															stroke="black"
-															stroke-linecap="round"
-															stroke-width="2">
-														</path>
-													</g>
-													<g>
-														<g
-															transform="translate(50, 50)">
-															<g>
-																<rect
-																	fill="#FFFF80"
-																	height="100"
-																	rx="10"
-																	stroke="black"
-																	stroke-width="2"
-																	width="100">
-																</rect>
-																<text
-																	fill="black"
-																	font-size="50"
-																	text-anchor="middle"
-																	x="50"
-																	y="62.5">
-																	false
-																</text>
-															</g>
-															<circle
-																cx="50"
-																cy="100"
-																fill="white"
-																r="4"
-																stroke="black"
-																stroke-width="2">
-															</circle>
-														</g>
-													</g>
-													<g>
-														<circle
-															cx="50"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="100"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="150"
-															cy="0"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-													</g>
-													<g>
-														<circle
-															cx="40"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="80"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="120"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-														<circle
-															cx="160"
-															cy="200"
-															fill="white"
-															r="4"
-															stroke="black"
-															stroke-width="2">
-														</circle>
-													</g>
-												</g>
-												<text
-													fill="black"
-													font-size="50"
-													text-anchor="middle"
-													x="500"
-													y="100">
-													false
-												</text>
-											</g>
-											<circle
-												cx="125"
-												cy="0"
-												fill="black"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="250"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="375"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="500"
-												cy="0"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="125"
-												cy="350"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="250"
-												cy="350"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="375"
-												cy="350"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-											<circle
-												cx="500"
-												cy="350"
-												fill="white"
-												r="4"
-												stroke="black"
-												stroke-width="2">
-											</circle>
-										</g>
-									</g>
-									<g>
-										<circle
-											cx="293.75"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="587.5"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="881.25"
-											cy="0"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-									</g>
-									<g>
-										<circle
-											cx="235"
-											cy="750"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="470"
-											cy="750"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="705"
-											cy="750"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-										<circle
-											cx="940"
-											cy="750"
-											fill="white"
-											r="4"
-											stroke="black"
-											stroke-width="2">
-										</circle>
-									</g>
-								</g>
-								<text
-									fill="black"
-									font-size="50"
-									text-anchor="middle"
-									x="987.5"
-									y="100">
-									false
-								</text>
-							</g>
-							<circle
-								cx="320"
-								cy="0"
-								fill="black"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="640"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="960"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="1280"
-								cy="0"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="320"
-								cy="900"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="640"
-								cy="900"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="960"
-								cy="900"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-							<circle
-								cx="1280"
-								cy="900"
-								fill="white"
-								r="4"
-								stroke="black"
-								stroke-width="2">
-							</circle>
-						</g>
-					</g>
-					<g>
-						<circle
-							cx="425"
-							cy="0"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-						<circle
-							cx="850"
-							cy="0"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-						<circle
-							cx="1275"
-							cy="0"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-					</g>
-					<g>
-						<circle
-							cx="340"
-							cy="1000"
-							fill="black"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-						<circle
-							cx="680"
-							cy="1000"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-						<circle
-							cx="1020"
-							cy="1000"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-						<circle
-							cx="1360"
-							cy="1000"
-							fill="white"
-							r="4"
-							stroke="black"
-							stroke-width="2">
-						</circle>
-					</g>
-				</g>
-				<circle
-					cx="450"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="875"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="1300"
-					cy="0"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="705"
-					cy="1100"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="1045"
-					cy="1100"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-				<circle
-					cx="1385"
-					cy="1100"
-					fill="white"
-					r="4"
-					stroke="black"
-					stroke-width="2">
-				</circle>
-			</g>
-		</g>
-		<g>
-			<circle
-				cx="1337.5"
-				cy="0"
-				fill="white"
-				r="4"
-				stroke="black"
-				stroke-width="2">
-			</circle>
-		</g>
-		<g>
-			<circle
-				cx="891.6667"
-				cy="1900"
-				fill="white"
-				r="4"
-				stroke="black"
-				stroke-width="2">
-			</circle>
-			<circle
-				cx="1783.3334"
-				cy="1900"
-				fill="white"
-				r="4"
-				stroke="black"
-				stroke-width="2">
-			</circle>
-		</g>
-	</g>
-</svg>
-
diff --git a/src/rvsdg/tests.rs b/src/rvsdg/tests.rs
index e2d87e4df..cc90f67e1 100644
--- a/src/rvsdg/tests.rs
+++ b/src/rvsdg/tests.rs
@@ -1,5 +1,4 @@
 use bril_rs::{ConstOps, EffectOps, Literal, Type, ValueOps};
-use insta::assert_snapshot;
 
 use crate::{
     cfg::program_to_cfg,
@@ -415,7 +414,6 @@ fn rvsdg_unstructured() {
     let prog = parse_from_string(PROGRAM);
     let cfg = program_to_cfg(&prog);
     let rvsdg = &cfg_to_rvsdg(&cfg).unwrap().functions[0];
-    assert_snapshot!(rvsdg.to_svg());
 
     // It's hard to write a useful test that's more than just a "change
     // detector" here. In this case, the function is not computing anything
diff --git a/src/util.rs b/src/util.rs
index d6a0945ac..db9cb2cf7 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -5,6 +5,9 @@ use clap::ValueEnum;
 use dag_in_context::build_program;
 use dag_in_context::from_egglog::FromEgglog;
 use dag_in_context::schema::TreeProgram;
+use graphviz_rust::cmd::Format;
+use graphviz_rust::exec;
+use graphviz_rust::printer::PrinterContext;
 use std::fmt::Debug;
 use std::{
     ffi::OsStr,
@@ -102,6 +105,19 @@ pub fn visualize(test: TestProgram, output_dir: PathBuf) -> io::Result<()> {
     Ok(())
 }
 
+pub fn tree_to_svg(prog: &TreeProgram) -> String {
+    let dot_code = prog.to_dot();
+    String::from_utf8(
+        exec(
+            dot_code,
+            &mut PrinterContext::default(),
+            vec![Format::Svg.into()],
+        )
+        .unwrap(),
+    )
+    .unwrap()
+}
+
 /// Invokes some program with the given arguments, piping the given input to the program.
 /// Returns an error if the program returns a non-zero exit code.
 /// Code adapted from https://github.com/egraphs-good/egg/blob/e7845c5ae34267256b544c8e6b5bc36d91d096d2/src/dot.rs#L127
@@ -466,8 +482,8 @@ impl Run {
                 let tree = rvsdg.to_dag_encoding();
                 (
                     vec![Visualization {
-                        result: tree.pretty(),
-                        file_extension: ".egg".to_string(),
+                        result: tree_to_svg(&tree),
+                        file_extension: ".svg".to_string(),
                         name: "".to_string(),
                     }],
                     Some(Interpretable::TreeProgram(tree)),
@@ -479,8 +495,8 @@ impl Run {
                 let optimized = dag_in_context::optimize(&tree).map_err(EggCCError::EggLog)?;
                 (
                     vec![Visualization {
-                        result: optimized.pretty(),
-                        file_extension: ".egg".to_string(),
+                        result: tree_to_svg(&tree),
+                        file_extension: ".svg".to_string(),
                         name: "".to_string(),
                     }],
                     Some(Interpretable::TreeProgram(optimized)),
diff --git a/tests/repro-if-conversion-region.bril b/tests/repro-if-conversion-region.bril
new file mode 100644
index 000000000..d0f039e71
--- /dev/null
+++ b/tests/repro-if-conversion-region.bril
@@ -0,0 +1,30 @@
+@main {
+  size: int = const 10;
+  mem1: ptr<int> = alloc size;
+  one: int = const 1;
+  two: int = const 2;
+  three: int = const 3;
+  mem2: ptr<int> = ptradd mem1 one;
+  store mem2 two;
+  cond: bool = const true;
+  br cond .outerthen .outerelse;
+.outerthen:
+  br cond .thenbranch .elsebranch;
+# else shares same effect as elsebranch
+.outerelse:
+  store mem2 three;
+  jmp .end;
+.thenbranch:
+  store mem1 one;
+  jmp .end;
+.elsebranch:
+  store mem2 three;
+  jmp .end;
+.end:
+  atmem1: int = load mem1;
+  atmem2: int = load mem2;
+  print atmem1;
+  print atmem2;
+  free mem1;
+  ret;
+}